From f58075dbc559de10af37c24e0bb0b4bb44e6ab11 Mon Sep 17 00:00:00 2001
From: Josias Polchau <jp@hbt.de>
Date: Tue, 16 Jul 2024 15:17:52 +0200
Subject: [PATCH] #380 extend Time buttons tooltips & round to 15 minutes

---
 .../webapp/dailyreport/showDailyReport.jsp    | 36 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/dailyreport/showDailyReport.jsp b/src/main/webapp/dailyreport/showDailyReport.jsp
index 0ea361fff..de7d03e60 100644
--- a/src/main/webapp/dailyreport/showDailyReport.jsp
+++ b/src/main/webapp/dailyreport/showDailyReport.jsp
@@ -116,7 +116,37 @@
 				form.submit();
 			}
 
-			function saveBreak(form) {
+			function roundMinutes(minutes) {
+				return Math.round(minutes/15)*15;
+			}
+
+			function getExtendTime(currentValue, time) {
+				var quittingTime= '<c:out value="${quittingtime}"></c:out>';
+				var quittingTimeArray=quittingTime.split(":");
+				var diff=[ time.getHours() - Number(quittingTimeArray[0]),
+					       time.getMinutes()-Number(quittingTimeArray[1])];
+				var res= [ Number(currentValue[0])+diff[0],
+						roundMinutes(Number(currentValue[1])+diff[1])];
+
+				if (res[1]<0) res= [res[0]-1, 60-res[1]];
+				if (res[1]>=60) res= [res[0]+1, res[1]-60];
+				if (res[0]<0){
+					confirm("<bean:message key="main.timereport.extendTime.error.text" />");
+					return currentValue;
+				}
+				return res;
+			}
+
+			function saveBreak(form, time) {
+				if(time != null) {
+					var newValue=getExtendTime([form.selectedBreakHour.value, form.selectedBreakMinute.value], time)
+					if(newValue[0]>5){
+						newValue=[5,55];
+						confirm("<bean:message key="main.timereport.extendTime.error.text" />");
+					}
+					form.selectedBreakHour.value =newValue[0];
+					form.selectedBreakMinute.value = newValue[1];
+				}
 				form.action = "/do/ShowDailyReport?task=saveBreak";
 				form.submit();
 			}
@@ -456,6 +486,7 @@
 									</html:select>
 
 									<a href="#" onclick="saveBegin(findForm(this))" title="save start of work"><i class="bi bi-floppy"></i></a>
+									<a href="#" onclick="saveBegin(findForm(this),new Date())" title="set start of work to now"><i class="bi bi-watch"></i></a>
 								</nobr>
 							</td>
 						</tr>
@@ -476,6 +507,7 @@
 									</html:select>
 
 									<a href="#" onclick="saveBreak(findForm(this))" title="save break"><i class="bi bi-floppy"></i></a>
+									<a href="#" onclick="saveBreak(findForm(this),new Date())" title="extend break"><i class="bi bi-skip-end"></i></a>
 								</td>
 							</tr>
 							<tr>
@@ -787,6 +819,8 @@
 
 							<!-- Bearbeiten -->
 							<td class="noBborderStyle report-options" align="center">
+
+								<button type="button"  onclick="confirmSave(findForm(this), ${timereport.id}, new Date()); return false" title="Verlängern" style="border: 0; background-color: transparent"><i class="bi bi-skip-end"></i></button>
 								<button type="button"  onclick="confirmSave(findForm(this), ${timereport.id}); return false" title="Speichern" style="border: 0; background-color: transparent"><i class="bi bi-floppy"></i></button>
 
 								<button type="button"  onclick="createFavorite(findForm(this), ${timereport.id}); return false"