work/timetrack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

preparation for slot dimediff reason

Browse Source
This commit is contained in:
Jörg Henke
2024-01-05 14:58:40 +01:00
parent c1b8283dd0
commit 5117fd0e71
7 changed files with 191 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/static/css/style.css
View File

@ -449,6 +449,14 @@ body {
color: white;
}
.slot_reason {
color: #26a269;
}
[data-bs-theme=dark] .slot_reason {
color: lime;
}
.flex-row-weekday {
display: flex;
flex-flow: row wrap;

23
src/main/resources/templates/done/list.html
View File

@ -265,8 +265,27 @@
</a><a th:href="@{/done/slot/add?day={d}(d=${s.day})}" class="slot_badge_middle" th:unless="${s.id}">
<i class="fas fa-plus"></i>
</a>
<span class="slot_badge_right boldy" th:text="${s.printTime()}" th:if="${s.id}"></span>
<span class="slot_badge_right" th:unless="${s.id}">&nbsp;--:--&nbsp;</span>
<span class="slot_badge_middle slot_reason" th:if="${s.reason}" th:text="${s.reason}"></span><span class="slot_badge_right boldy" th:text="${s.printTime()}" th:if="${s.id}"></span><span
class="slot_badge_right" th:unless="${s.id}">&nbsp;--:--&nbsp;</span>
</div>
</div>
<div class="row alert alert-info">
<div class="col-sm-12">
<span style="text-decoration: underline">Legende</span>
</div>
<div class="col">
Üb: Überstunden, Mehrarbeit<br />
Ur: Urlaub, Sonderurlaub, Kur<br />
gF: gesetzlicher Feiertag<br />
</div>
<div class="col">
Kr: Arbeits- und Dienstunfähigkeit<br />
Gl: Freistellung aus Gleitzeitguthaben<br />
Ar: Arbeits- und Dienstbefreiung<br />
</div>
<div class="col">
mK: "mit Kind krank"<br />
Di: Dienstreise, Dienstgänge<br />
</div>
</div>
</div>

62
src/main/resources/templates/done/slot/item.html
View File

@ -1,6 +1,5 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
xmlns:sec="http://www.thymeleaf.org/extras/spring-security" layout:decorate="~{layout/main.html}">
<html xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:sec="http://www.thymeleaf.org/extras/spring-security" layout:decorate="~{layout/main.html}">
<head>
<title>Slot aktualisieren</title>
</head>
@ -12,16 +11,57 @@
</ul>
<main layout:fragment="content">
<div class="container formpane">
<div class="row" th:if="${bean}">
<div class="col-sm-3">ID</div>
<div class="col-sm-9" th:text="${bean.id}"></div>
<div class="col-sm-3">Tag</div>
<div class="col-sm-9" th:text="${#temporals.format(bean.day, 'EEEE, dd.MM.yyyy')}"></div>
<div class="col-sm-3">vereinbarte Arbeitszeit</div>
<div class="col-sm-9" th:text="${bean.printTime()}"></div>
<form th:action="@{/done/slot/upsert}" method="post" th:object="${bean}">
<input type="hidden" th:field="*{id}" />
<div class="row g-2" th:if="${bean}">
<div class="col-sm-3">Tag</div>
<div class="col-sm-9">
<input type="date" th:field="*{day}" class="form-control" />
</div>
<div class="col-sm-3">vereinbarte Arbeitszeit in Minuten</div>
<div class="col-sm-9">
<input type="number" th:field="*{minutes}" class="form-control">
</div>
<div class="col-sm-3">Abweichungsgrund</div>
<div class="col-sm-9">
<select th:field="*{reason}" class="form-select">
<option value="">-</option>
<option value="Ar">Arbeits- und Dienstbefreiung</option>
<option value="Di">Dienstreise, Dienstgänge</option>
<option value="gF">gesetzlicher Feiertag</option>
<option value="Gl">Freistellung aus Gleitzeitguthaben</option>
<option value="Kr">Arbeits- und Dienstunfähigkeit</option>
<option value="mK">"mit Kind krank"</option>
<option value="Ur">Urlaub, Sonderurlaub, Kur</option>
<option value="Üb">Überstunden, Mehrarbeit</option>
</select>
</div>
<div class="col-sm-3"></div>
<div class="col-sm-9">
<button type="submit" class="btn btn-outline-primary">Übernehmen</button>
</div>
</div>
</form>
</div>
<div class="container formpane" th:if="${bean.id}">
<button type="button" class="btn btn-outline-danger" data-bs-toggle="modal" data-bs-target="#deleteModal">Slot löschen</button>
<div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h1 class="modal-title fs-5" id="deleteModalLabel">Slot löschen</h1>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Schließen"></button>
</div>
<div class="modal-body text-danger">
Wollen Sie die angegebene Arbeitszeit von <span th:text="${bean.printTime()}"></span> vom Tag <span th:text="${#temporals.format(bean.day, 'dd.MM.yyyy')}"></span> wirklich löschen?
</div>
<div class="modal-footer">
<a th:href="@{/done/slot/{id}/delete(id=${bean.id})}" class="btn btn-outline-danger">Ja</a>
<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Nein</button>
</div>
</div>
</div>
</div>
TODO: Löschen<br />
TODO: Ersetzen durch Dienstbefreiung, Urlaub, Ausgleichstag/Überstunden, Krankheit oder sonstwas
</div>
</main>
</body>