Merge commit '01b8095e9459417e2cf5bd1079c796d4f01ec549' into work/reports-ui

# Conflicts:
#	src/main/resources/templates/attendance/history.html

src/main/resources/templates/attendance/history.html

@@ -39,17 +39,12 @@
         </thead>
         <tbody>
         <tr th:each="item : ${items}">
-            <td th:text="${#temporals.format(item.workDate, 'dd/MM/yyyy')}"></td>
-            <td th:text="${#temporals.format(item.checkInAt.atZone(item.policy.zoneId), 'HH:mm')}"></td>
-            <td th:text="${item.checkOutAt == null ? 'Missing' : #temporals.format(item.checkOutAt.atZone(item.policy.zoneId), 'HH:mm')}"></td>
-            <td th:text="|${item.policy.scheduledStart}–${item.policy.scheduledEnd} (${item.policy.zoneId})|"></td>
+            <td th:text="${item.workDateDisplay}"></td>
+            <td th:text="${item.checkInTimeDisplay}"></td>
+            <td th:text="${item.checkOutTimeDisplay}"></td>
+            <td th:text="|${item.scheduledStartDisplay}–${item.scheduledEndDisplay} (${item.policy.zoneId})|"></td>
             <td th:text="|${item.policy.checkInGraceMinutes} min / ${item.policy.checkoutGraceMinutes} min|"></td>
-            <td>
-                <span th:if="${!item.violations.late and !item.violations.earlyDeparture and !item.violations.missingCheckout}">On time</span>
-                <span th:if="${item.violations.late}">Late</span>
-                <span th:if="${item.violations.earlyDeparture}" th:text="${item.violations.late ? ', Early departure' : 'Early departure'}">Early departure</span>
-                <span th:if="${item.violations.missingCheckout}" th:text="${item.violations.late or item.violations.earlyDeparture ? ', Missing checkout' : 'Missing checkout'}">Missing checkout</span>
-            </td>
+            <td th:text="${item.resultDisplay}"></td>
         </tr>
         </tbody>
     </table></div>