church/BiCO
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

lesson

Browse Source
This commit is contained in:
Jottyfan
2023-11-28 22:44:00 +01:00
parent 48525b7e20
commit 690f28f4fe
15 changed files with 300 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/resources/templates/lesson/item.html Normal file
View File

@ -0,0 +1,41 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" layout:decorate="~{template}" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:sec="http://www.thymeleaf.org/extras/spring-security">
<body>
<th:block layout:fragment="content">
<div class="borderdist">
<div class="container">
<div class="row g-2">
<div class="col-sm-12">
<h2>Dozent-Reservierung</h2>
</div>
</div>
<form th:action="@{/lesson/{id}(id=${bean.pkLesson})}" method="post" th:object="${bean}">
<div class="row g-3">
<div class="col-sm-3">Tag</div>
<div class="col-sm-9">
<span th:text="${#temporals.format(slotDay, 'dd.MM.yyyy')}"></span>
</div>
<div class="col-sm-3">Dozent</div>
<div class="col-sm-9">
<select th:field="*{fkPerson}" class="form-select">
<option value="">--- bitte wählen ---</option>
<option th:each="p : ${persons}" th:value="${p.pkPerson}" th:text="${p.forename + ' ' + p.surname}"></option>
</select>
</div>
<div class="col-sm-3">Anmerkungen</div>
<div class="col-sm-9">
<textarea th:field="*{notes}" class="form-control"></textarea>
</div>
<div class="col-sm-3"></div>
<div class="col-sm-9">
<button type="submit" class="btn btn-outline-success">Speichern</button>&nbsp;
<a th:href="@{/}" class="btn btn-outline-secondary">Abbrechen</a>&nbsp;
<a th:href="@{/lesson/{id}/remove(id=${bean.pkLesson})}" class="btn btn-outline-danger">Löschen</a>
</div>
</div>
</form>
</div>
</div>
</th:block>
</body>
</html>

19
src/main/resources/templates/sheet.html
View File

@ -7,29 +7,26 @@
<thead>
<tr>
<th>Tag</th>
<th>Kürzel</th>
<th>Wer</th>
<th>Thema</th>
<th>Notiz</th>
<th></th>
</tr>
</thead>
<tbody>
<tr th:each="s : ${list}">
<td><span th:text="${#temporals.format(s.slotDay, 'yyyy-MM-dd')}" th:if="${s.pkLesson}"></span> <a th:href="@{/slot/{id}(id=${s.pkSlot})}"
th:text="${#temporals.format(s.slotDay, 'yyyy-MM-dd')}" class="btn btn-outline-secondary" th:unless="${s.pkLesson}"></a></td>
<td><a th:href="@{/person?slotId={id}(id=${s.pkSlot})}" class="btn btn-outline-secondary"> <span th:text="${s.abbreviation}" th:if="${s.abbreviation}"></span> <i
<td><span th:text="${#temporals.format(s.slotDay, 'yyyy-MM-dd')}"></span></td>
<td><a th:href="@{/lesson?slotId={id}(id=${s.pkSlot})}" class="btn btn-outline-secondary"> <span th:text="${s.abbreviation}" th:if="${s.abbreviation}"></span> <i
class="bi bi-pencil" th:if="${s.abbreviation == null || s.abbreviation.isBlank()}"></i>
</a></td>
<td th:text="${s.theme}"></td>
<td><a th:href="@{/slot/{id}(id=${s.pkSlot})}" class="btn btn-outline-secondary"> <span th:text="${s.slotNotes}"></span> <i class="bi bi-pencil"
th:if="${s.slotNotes == null || s.slotNotes.isBlank()}"></i>
</a></td>
<td>
<td><div th:text="${s.theme}"></div>
<div th:text="${s.subtheme}"></div></td>
<td><span th:text="${s.slotNotes}" class="rightpadding64"></span><a th:href="@{/slot/{id}(id=${s.pkSlot})}" class="btn btn-outline-secondary rightaligned"><i
class="bi bi-pencil"></i></a></td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="5"><a th:href="@{/slot}" class="btn btn-outline-success">einen neues Datum anlegen</a></td>
<td colspan="4"><a th:href="@{/slot}" class="btn btn-outline-success">einen neues Datum anlegen</a></td>
</tr>
</tfoot>
</table>

15
src/main/resources/templates/slot/item.html
View File

@ -4,6 +4,11 @@
<th:block layout:fragment="content">
<div class="borderdist">
<div class="container">
<div class="row g-2">
<div class="col-sm-12">
<h2>Terminfestlegung</h2>
</div>
</div>
<form th:action="@{/slot/save}" th:object="${bean}" method="post">
<input type="hidden" th:field="*{pkSlot}" />
<div class="row g-2">
@ -19,7 +24,15 @@
<div class="col-sm-2"></div>
<div class="col-sm-10">
<button type="submit" class="btn btn-outline-primary">Speichern</button>
<a th:href="@{/slot/{id}/delete(id=${bean.pkSlot})}" class="btn btn-outline-danger" th:if="${bean.pkSlot}">Löschen</a>
<th:block th:unless="${hasLesson}">
<a th:href="@{/slot/{id}/delete(id=${bean.pkSlot})}" class="btn btn-outline-danger" th:if="${bean.pkSlot}">Löschen</a>
</th:block>
</div>
<div class="col-sm-2" th:if="${hasLesson}">Hinweis</div>
<div class="col-sm-10" th:if="${hasLesson}">
<div class="alert alert-primary">Termine, die bereits für einen Dozenten reserviert wurden, können nicht gelöscht werden.
<a th:href="@{/lesson?slotId={id}(id=${bean.pkSlot})}" class="btn btn-outline-secondary">Reservierung bearbeiten</a>
</div>
</div>
</div>
</form>

4
src/main/resources/templates/template.html
View File

@ -15,14 +15,14 @@
<script th:src="@{/js/stylehelp.js}"></script>
</head>
<body>
<nav class="navbar sticky-top navbar-expand-lg headerlayout">
<nav class="navbar sticky-top navbar-expand-lg headerlayout headerback">
<button class="navbar-toggler" style="margin-right: 40px" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
aria-expanded="false">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent" style="margin-right: 20px">
<ul class="navbar-nav mb-2 mb-lg-0">
<li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/}">Startseite</a></li>
<li class="nav-item"><a class="btn btn-outline-secondary" th:href="@{/}" style="margin-left: 12px">Startseite</a></li>
</ul>
<ul layout:fragment="header"></ul>
<ul class="nav navbar-nav ms-auto">