add formatted output with soll time

diff --git a/src/main.c b/src/main.c
index 84964b781b66e0177b41bf2dad27105afd24c90f..ff3c44aca2220e035ac20b059f9209e1fc2ecd8a 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -69,8 +69,6 @@ int main(int argc, char* argv[])
                fabend->begin_tm->tm_hour,
                fabend->begin_tm->tm_min);
 
-       printf("\n");
-
        time(fabend->now);
        fabend->now_tm = localtime(fabend->now);
        if (argc == 5) {
@@ -92,8 +90,9 @@ int main(int argc, char* argv[])
 
        *fabend->worktime = get_eight_hour_end_worktime(*fabend->begin);
        fabend->work_end_tm = localtime(fabend->worktime);
-       printf("%-26s%s %02d.%02d.%04d %02d:%02d\n",
-               "Arbeitsende 8 Std:",
+       printf("Arbeitsende %02d:%02d Std:    %s %02d.%02d.%04d %02d:%02d\n",
+               SOLL_HOUR,
+               SOLL_MINUTES,
                fabend->weekday,
                fabend->work_end_tm->tm_mday,
                fabend->work_end_tm->tm_mon + 1,
@@ -103,8 +102,7 @@ int main(int argc, char* argv[])
 
        *fabend->worktime = get_ten_hour_end_worktime(*fabend->begin);
        fabend->work_end_tm = localtime(fabend->worktime);
-       printf("%-26s%s %02d.%02d.%04d %02d:%02d\n",
-               "Arbeitsende 10 Std:",
+       printf("Arbeitsende 10:00 Std:    %s %02d.%02d.%04d %02d:%02d\n",
                fabend->weekday,
                fabend->work_end_tm->tm_mday,
                fabend->work_end_tm->tm_mon + 1,
@@ -131,7 +129,10 @@ int main(int argc, char* argv[])
 
        *fabend->worktime = get_current_worktime_diff_to_end_eight_hour(*fabend->begin, *fabend->now);
        get_time_str(*fabend->worktime, fabend->timestr);
-       printf("Arbeitzeit bis %02d:%02d Std: %s\n", SOLL_HOUR, SOLL_MINUTES, fabend->timestr);
+       printf("Arbeitzeit bis %02d:%02d Std: %s\n",
+               SOLL_HOUR,
+               SOLL_MINUTES,
+               fabend->timestr);
 
        *fabend->worktime = get_current_worktime_diff_to_end_ten_hour(*fabend->begin, *fabend->now);
        get_time_str(*fabend->worktime, fabend->timestr);