From: Bastian Dehn <hhaalo@arcor.de>
Date: Mon, 10 Jun 2024 17:45:27 +0000 (+0200)
Subject: formatting output
X-Git-Tag: 1.0.0^2~23
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=c85cda79d4c7a67d688a603cc6b9da275ea643c1;p=feierabend.git

formatting output
---

diff --git a/src/main.c b/src/main.c
index 27c4d67..61a1e53 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,14 +13,15 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 
-	time_t begin = 0;
-	struct tm begin_tm;
 	time_t now = 0;
 	struct tm now_tm;
-	char weekday[11];
+	time_t begin = 0;
+	struct tm begin_tm;
 	time_t work_end = 0;
-	char timestr[7];
+	struct tm work_end_tm;
 	time_t worktime = 0;
+	char weekday[11];
+	char timestr[7];
 
 	time(&begin);
 	localtime_r(&begin, &begin_tm);
@@ -31,7 +32,8 @@ int main(int argc, char* argv[])
 	time(&now);
 	localtime_r(&now, &now_tm);
 	get_weekday(now_tm.tm_wday, weekday);
-	printf("Aktuelle Zeit: %s %02d.%02d.%04d %02d:%02d %s\n",
+	printf("%- 25s%s %02d.%02d.%04d %02d:%02d %s\n",
+		"Aktuelle Zeit:",
 		weekday,
 		now_tm.tm_mday,
 		now_tm.tm_mon + 1,
@@ -40,7 +42,8 @@ int main(int argc, char* argv[])
 		now_tm.tm_min,
 		now_tm.tm_zone);
 
-	printf("Arbeitsbeginn: %s %02d.%02d.%04d %02d:%02d %s\n",
+	printf("%- 25s%s %02d.%02d.%04d %02d:%02d %s\n",
+		"Arbeitsbeginn:",
 		weekday,
 		begin_tm.tm_mday,
 		begin_tm.tm_mon + 1,
@@ -50,16 +53,32 @@ int main(int argc, char* argv[])
 		begin_tm.tm_zone);
 
 	work_end = get_eight_hour_end_worktime(begin);
-	get_time_str(work_end, timestr);
-	printf("Sollarbeitzeit bis 8 Std: %s\n", timestr);
+	localtime_r(&work_end, &work_end_tm);
+	printf("%- 25s%s %02d.%02d.%04d %02d:%02d %s\n",
+		"Arbeitsende 8 Std:",
+		weekday,
+		work_end_tm.tm_mday,
+		work_end_tm.tm_mon + 1,
+		work_end_tm.tm_year + 1900,
+		work_end_tm.tm_hour,
+		work_end_tm.tm_min,
+		work_end_tm.tm_zone);
 
 	work_end = get_ten_hour_end_worktime(begin);
-	get_time_str(work_end, timestr);
-	printf("Naximale Arbeitzeit von 10 Std: %s\n", timestr);
+	localtime_r(&work_end, &work_end_tm);
+	printf("%- 25s%s %02d.%02d.%04d %02d:%02d %s\n",
+		"Arbeitsende 10 Std:",
+		weekday,
+		work_end_tm.tm_mday,
+		work_end_tm.tm_mon + 1,
+		work_end_tm.tm_year + 1900,
+		work_end_tm.tm_hour,
+		work_end_tm.tm_min,
+		work_end_tm.tm_zone);
 
 	worktime = get_current_worktime(begin, now) - ONE_HOUR;
 	get_time_str(worktime, timestr);
-	printf("Aktuelle Arbeitzeit: %s\n", timestr);
+	printf("%- 25s%s\n", "Aktuelle Arbeitzeit:", timestr);
 
 	return 0;
 }
\ No newline at end of file