Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

https://gitlab.com/jottyfan/camporganizer2/-/issues/39

Browse Source
This commit is contained in:
Jottyfan
2023-03-26 21:18:57 +02:00
parent edb0430456
commit 93a1289629
19 changed files with 208 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/resources/templates/admin/camp_edit.html
View File

@ -62,10 +62,32 @@
</div>
<div class="row mb-2">
<label for="inputCountries" class="col-sm-2 col-form-label">Ferien in</label>
<div class="col-sm-10"><!-- TODO: input helper for finding Bundesland by typing -->
<span class="error" th:each="error : ${#fields.errors('countries')}">[[${error}]]<br /></span> <textarea id="inputCountries" type="text" th:field="*{countries}"
th:class="${'form-control ' + (#fields.hasErrors('countries') ? 'inputerror' : '')}"></textarea>
<div class="col-sm-10">
<span class="error" th:each="error : ${#fields.errors('countriesList')}">[[${error}]]<br /></span>
<select id="inputCountries" th:field="*{countriesList}" th:class="${'form-select ' + (#fields.hasErrors('countriesList') ? 'inputerror' : '')}" multiple="multiple">
<option value="Baden-Württemberg">Baden-Württemberg</option>
<option value="Bayern">Bayern</option>
<option value="Berlin">Berlin</option>
<option value="Brandenburg">Brandenburg</option>
<option value="Bremen">Bremen</option>
<option value="Hamburg">Hamburg</option>
<option value="Hessen">Hessen</option>
<option value="Mecklenburg-Vorpommern">Mecklenburg-Vorpommern</option>
<option value="Niedersachsen">Niedersachsen</option>
<option value="Nordrhein-Westfalen">Nordrhein-Westfalen</option>
<option value="Rheinland-Pfalz">Rheinland-Pfalz</option>
<option value="Saarland">Saarland</option>
<option value="Sachsen">Sachsen</option>
<option value="Sachsen-Anhalt">Sachsen-Anhalt</option>
<option value="Schleswig-Holstein">Schleswig-Holstein</option>
<option value="Thüringen">Thüringen</option>
</select>
</div>
<script type="text/javascript">
$(document).ready(function(){
$("#inputCountries").select2();
});
</script>
</div>
<div class="row mb-2">
<label for="inputDoc" class="col-sm-2 col-form-label">Bestätigung</label>
@ -97,7 +119,13 @@
</script>
</div>
</div>
<!-- TODO: lock sales - boolean - Kassenschluss -->
<div class="row mb-2">
<label for="inputLockSales" class="col-sm-2 col-form-label">Kassenschluss</label>
<div class="col-sm-10">
<input id="lockSales" type="checkbox" name="lockSales" th:checked="*{lockSales}" />
<label for="lockSales">Abrechnung abgeschlossen</label>
</div>
</div>
<div class="row mb-2">
<div class="col-sm-2"></div>
<div class="col-sm-10">

1
src/main/resources/templates/admin/document.html
View File

@ -23,6 +23,7 @@
<span th:if="${r.literal == 'teacher'}" class="roleflag">Mitarbeiter</span>
<span th:if="${r.literal == 'director'}" class="roleflag">Leiter</span>
<span th:if="${r.literal == 'feeder'}" class="roleflag">Küche</span>
<span th:if="${r.literal == 'observer'}" class="roleflag">Mitarbeiterkind</span>
</th:block></td>
<td><a th:href="@{/document/{id}(id=${d.pk})}"><i class="fas fa-download"></i></a></td>
<td><span th:text="${d.filetype.literal}" th:if="${d.filetype}"></span></td>

3
src/main/resources/templates/admin/document_edit.html
View File

@ -34,7 +34,8 @@
<option value="student">Teilnehmer</option>
<option value="teacher">Mitarbeiter</option>
<option value="director">Leiter</option>
<option value="feeder">Küche</option>
<option value="feeder">Küchenteam</option>
<option value="observer">Mitarbeiterkind</option>
</select>
</div>
</div>

8
src/main/resources/templates/business/booker.html
View File

@ -40,12 +40,16 @@
<td th:text="${booker.accept == null ? '' : (booker.accept ? 'Ja' : 'abgelehnt')}"></td>
</tr>
<tr>
<th>Preis</th>
<th>Freizeitpreis</th>
<td th:text="${booker.price}" />
</tr>
<tr>
<th>Kontostand</th>
<td><span th:text="${#numbers.formatDecimal(booker.paid, 1, 2) + ' €'}" th:if="${booker.paid != null}"></span>
<td><span th:text="${#numbers.formatDecimal(booker.paid, 1, 2) + ' €'}" th:if="${booker.paid != null}"></span></td>
</tr>
<tr style="display: none"><!-- insert field not yet implemented -->
<th>zu zahlen</th>
<td><span th:text="${#numbers.formatDecimal(booker.requiredPrice, 1, 2) + ' €'}" th:if="${booker.requiredPrice != null}"></span></td>
</tr>
</tbody>
</table>

1
src/main/resources/templates/confirmation/person.html
View File

@ -91,6 +91,7 @@
<option value="teacher">Mitarbeiter</option>
<option value="director">Leiter</option>
<option value="feeder">Küchenteam</option>
<option value="observer">Mitarbeiterkind</option>
</select>
</div>
</div>

2
src/main/resources/templates/dashboard.html
View File

@ -83,7 +83,7 @@
<div class="row mb-2">
<div class="col-sm-2">Rolle:</div>
<span class="col-sm-10"> <span th:if="${b.isTeacher()}">Mitarbeiter</span> <span th:if="${b.isStudent()}">Teilnehmer</span> <span th:if="${b.isDirector()}">Leiter</span> <span
th:if="${b.isFeeder()}">Küchenteam</span>
th:if="${b.isFeeder()}">Küchenteam</span> <span th:if="${b.isObserver()}">Mitarbeiterkind</span>
</span>
</div>
<div class="row mb-2">

1
src/main/resources/templates/registration/registration.html
View File

@ -74,6 +74,7 @@
<option value="teacher">Mitarbeiter</option>
<option value="feeder">Küchenteam</option>
<option value="director">Leiter</option>
<option value="observer">Mitarbeiterkind</option>
</select>
</div>
</div>

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

@ -108,9 +108,9 @@
<li><a th:href="@{/admin/mail}" class="dropdown-item menufont">Testmail</a></li>
<li><a th:href="@{/admin/document}" class="dropdown-item menufont">Dokumente</a></li>
<li><a th:href="@{/admin/location}" class="dropdown-item menufont">Freizeitheime</a></li>
<!-- TODO: implementation not yet finished
<!-- TODO: implementation not yet finished -->
<li><a th:href="@{/admin/camp}" class="dropdown-item menufont">Freizeiten</a>
-->
<!-- -->
</ul>
</div>
</li>