From 4820232b31b616148209a06721821c6e21c891af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Henke?= <joerg.henke@uni-greifswald.de>
Date: Tue, 9 Jan 2024 16:44:05 +0100
Subject: [PATCH] summary time calculation enhanced

---
 build.gradle                                                 | 2 +-
 .../de/jottyfan/timetrack/modules/done/DoneController.java   | 5 +++++
 src/main/resources/templates/done/list.html                  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 435e501..a7025b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 
 group = 'de.jottyfan'
-version = '1.4.7'
+version = '1.4.8'
 
 description = """timetrack"""
 
diff --git a/src/main/java/de/jottyfan/timetrack/modules/done/DoneController.java b/src/main/java/de/jottyfan/timetrack/modules/done/DoneController.java
index 8395103..e31134c 100644
--- a/src/main/java/de/jottyfan/timetrack/modules/done/DoneController.java
+++ b/src/main/java/de/jottyfan/timetrack/modules/done/DoneController.java
@@ -56,6 +56,11 @@ public class DoneController extends CommonController {
 		SummaryBean sumBean = new SummaryBean(list, day, maxWorkTime);
 		SummaryBean weekBean = new SummaryBean(week, day, maxWorkTime);
 		model.addAttribute("doneList", list);
+		Duration sumtimeDuration = Duration.ofMinutes(0);
+		for (DoneBean bean : list) {
+			sumtimeDuration = sumtimeDuration.plus(bean.getTimeDiffDuration());
+		}
+		model.addAttribute("sumtime", String.format("%02d:%02d", sumtimeDuration.toHours(), sumtimeDuration.toMinutes() % 60));
 		model.addAttribute("sum", sumBean);
 		model.addAttribute("daysum", doneService.getDaysum(day, username));
 		model.addAttribute("overtimeBean", doneService.getOvertimeBean(username));
diff --git a/src/main/resources/templates/done/list.html b/src/main/resources/templates/done/list.html
index 39104b6..84e0813 100644
--- a/src/main/resources/templates/done/list.html
+++ b/src/main/resources/templates/done/list.html
@@ -128,7 +128,7 @@
 						<tr th:if="${daysum}">
 							<td>Start: <span class="emphgreen" th:text="${#temporals.format(daysum.daytimeFrom, 'HH:mm')}" th:if="${daysum.daytimeFrom}"></span></td>
 							<td>Ende: <span class="emphgreen" th:text="${#temporals.format(daysum.daytimeUntil, 'HH:mm')}" th:if="${daysum.daytimeUntil}"></span></td>
-							<td>Arbeitszeit total: <span class="emphblue" th:text="${#temporals.format(daysum.dayworktime, 'HH:mm')}" th:if="${daysum.dayworktime}"></span></td>
+							<td>abrechenbar: <span class="emphblue" th:text="${#temporals.format(daysum.dayworktime, 'HH:mm')}" th:if="${daysum.dayworktime}"></span>/<span th:text="${sumtime}"></span></td>
 							<td>Pausezeit total: <span class="emphorange" th:text="${#temporals.format(daysum.breaks, 'HH:mm')}" th:if="${daysum.breaks}"></span></td>
 							<td>Überstunden heute: <span class="emphred" th:text="${daysum.printDayOvertime()}"></span></td>
 							<td colspan="2">Überstunden total: <span class="emphpink" th:text="${daysum.printTotalOvertime()}"></span></td>