basic overtime calculation corrections; needs slots
This commit is contained in:
		| @@ -99,13 +99,13 @@ | ||||
| 						</tr> | ||||
| 					</tbody> | ||||
| 					<tfoot> | ||||
| 						<tr> | ||||
| 							<td>Zusammenfassung</td> | ||||
| 							<td>Start: <span class="emphgreen" th:text="${sum.start}"></span></td> | ||||
| 							<td>Ende: <span class="emphgreen" th:text="${sum.end}"></span></td> | ||||
| 							<td>Arbeitszeit total: <span class="emphblue" th:text="${sum.total}"></span></td> | ||||
| 							<td>Pausezeit total: <span class="emphorange" th:text="${sum.pause}"></span></td> | ||||
| 							<td colspan="2">Überstunden: <span class="emphred" th:text="${sum.overdue}"></span></td> | ||||
| 						<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>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.dayOvertime}"></span></td> | ||||
| 							<td colspan="2">Überstunden total: <span class="emphred" th:text="${#temporals.format(daysum.totalOvertime, 'HH:mm')}" th:if="${daysum.totalOvertime}"></span></td> | ||||
| 						</tr> | ||||
| 						<tr> | ||||
| 							<td></td> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user