mirrors/swt23w23
1
0
Fork 0
mirror of https://github.com/st-tu-dresden-praktikum/swt23w23 synced 2024-07-19 21:04:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add uniform price formatting

Browse source 
This works on #144
This commit is contained in:
Mathis Kral 2024-01-15 14:05:25 +01:00 committed by Mathis
parent 0425efeab0
commit 668d758ed0
5 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/resources/templates/catalog.html
View file

@ -1,6 +1,6 @@
<!--/*--> <!--/*-->
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
SPDX-FileCopyrightText: 2023 swt23w23 SPDX-FileCopyrightText: 2023-2024 swt23w23
<!--*/--> <!--*/-->
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
@ -32,7 +32,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
<li th:text="${product.getKey().toString()} + ': ' + ${product.getValue().toString()}"/> <li th:text="${product.getKey().toString()} + ': ' + ${product.getValue().toString()}"/>
</ul> </ul>
</td> </td>
<td th:text="${catalogEntry.getTotalCost()} + ' €'"> <td th:text="${catalogEntry.getTotalCost()}">
<td sec:authorize="hasRole('ADMIN')"> <td sec:authorize="hasRole('ADMIN')">
<form method="post" th:action="@{/catalog/remove}"> <form method="post" th:action="@{/catalog/remove}">
<input type="hidden" name="catalogEntryID" th:value="${catalogEntry.getId()}"> <input type="hidden" name="catalogEntryID" th:value="${catalogEntry.getId()}">

8
src/main/resources/templates/catalog_editor.html
View file

@ -1,6 +1,6 @@
<!--/*--> <!--/*-->
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
SPDX-FileCopyrightText: 2023 swt23w23 SPDX-FileCopyrightText: 2023-2024 swt23w23
<!--*/--> <!--*/-->
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
@ -22,7 +22,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
</select> </select>
<button class="btn btn-secondary" type="submit">Event auswählen</button> <button class="btn btn-secondary" type="submit">Event auswählen</button>
</form> </form>
Eventbasispreis: 500€ Eventbasispreis: EUR 500
<h2>Mindestzeitraum</h2> <h2>Mindestzeitraum</h2>
<form th:object="${formCatalogEntry}" method="post" th:action="@{/catalog_editor/addTime}"> <form th:object="${formCatalogEntry}" method="post" th:action="@{/catalog_editor/addTime}">
@ -42,7 +42,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
<tr th:each="item : ${productMap.keySet()}"> <tr th:each="item : ${productMap.keySet()}">
<td th:text="${item.getName()}"> <td th:text="${item.getName()}">
<td th:text="${productMap.get(item)}"> <td th:text="${productMap.get(item)}">
<td th:text="${item.getPrice()}">€ <td th:text="${item.getPrice()}">
<td> <td>
<form method="post" th:action="@{/catalog_editor/removeProduct}"> <form method="post" th:action="@{/catalog_editor/removeProduct}">
<input class="form-control w-auto d-inline-block" type="hidden" name="id" th:value="${item.getId()}"> <input class="form-control w-auto d-inline-block" type="hidden" name="id" th:value="${item.getId()}">
@ -76,7 +76,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
<h3>Momentane Auswahl</h3> <h3>Momentane Auswahl</h3>
Eventtyp: <span th:text="${formCatalogEntry.getEventType()}"></span><br> Eventtyp: <span th:text="${formCatalogEntry.getEventType()}"></span><br>
Mindestzeitraum: <span th:text="${formCatalogEntry.getMinimumTimePeriod()} + ' h'"></span><br> Mindestzeitraum: <span th:text="${formCatalogEntry.getMinimumTimePeriod()} + ' h'"></span><br>
<span th:text="'Gesamtpreis: ' + ${formCatalogEntry.getTotalCost()} + ' €'">Gesamtpreis</span> <span th:text="'Gesamtpreis: ' + ${formCatalogEntry.getTotalCost()}">Gesamtpreis</span>
<form method="post" th:action="@{/catalog_editor/addCatalogEntry}" th:object="${formCatalogEntry}"> <form method="post" th:action="@{/catalog_editor/addCatalogEntry}" th:object="${formCatalogEntry}">
<input type="hidden" name="eventType" th:value="${formCatalogEntry.getEventType()}"> <input type="hidden" name="eventType" th:value="${formCatalogEntry.getEventType()}">
<input type="hidden" name="products" th:value="${productSet}"> <input type="hidden" name="products" th:value="${productSet}">

10
src/main/resources/templates/event.html
View file

@ -1,6 +1,6 @@
<!--/*--> <!--/*-->
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
SPDX-FileCopyrightText: 2023 swt23w23 SPDX-FileCopyrightText: 2023-2024 swt23w23
<!--*/--> <!--*/-->
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
@ -42,7 +42,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
<tr th:each="item : ${cartConsumables}"> <tr th:each="item : ${cartConsumables}">
<td th:text="${item.getProductName()}"></td> <td th:text="${item.getProductName()}"></td>
<td th:text="${item.getQuantity()}"></td> <td th:text="${item.getQuantity()}"></td>
<td th:text="${item.getPrice().getNumber().doubleValue()} +'€'"></td> <td th:text="${item.getPrice()}"></td>
<td> <td>
<form method="post" th:action="@{/event/removeProduct}"> <form method="post" th:action="@{/event/removeProduct}">
<input type="hidden" th:value="${item.getId()}" name="itemId"/> <input type="hidden" th:value="${item.getId()}" name="itemId"/>
@ -53,7 +53,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
<tr th:each="item : ${cartRentables}"> <tr th:each="item : ${cartRentables}">
<td th:text="${item.getProductName()}"></td> <td th:text="${item.getProductName()}"></td>
<td th:text="${item.getQuantity()}"></td> <td th:text="${item.getQuantity()}"></td>
<td th:text="${item.getProduct().getPriceForTime(duration).multiply(item.getQuantity().getAmount())} +'€'"></td> <td th:text="${item.getProduct().getPriceForTime(duration).multiply(item.getQuantity().getAmount())}"></td>
<td> <td>
<form method="post" th:action="@{/event/removeProduct}"> <form method="post" th:action="@{/event/removeProduct}">
<input type="hidden" th:value="${item.getId()}" name="itemId"/> <input type="hidden" th:value="${item.getId()}" name="itemId"/>
@ -68,7 +68,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
<tr th:each="employee : ${event.getStaff()}"> <tr th:each="employee : ${event.getStaff()}">
<td th:text="${employee.getName()}"></td> <td th:text="${employee.getName()}"></td>
<td th:text="${employee.getJob()}"></td> <td th:text="${employee.getJob()}"></td>
<td th:text="${event.getDurationInHours() * employee.getWage()} + '€'"></td> <td th:text="'EUR ' + ${event.getDurationInHours() * employee.getWage()}"></td>
<td> <td>
<form method="post" th:action="@{/event/removeEmployee}"> <form method="post" th:action="@{/event/removeEmployee}">
<input type="hidden" th:value="${employee.getId()}" name="sid"/> <input type="hidden" th:value="${employee.getId()}" name="sid"/>
@ -78,7 +78,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
</tr> </tr>
</table> </table>
<span th:text="'Gesamt: ' + ${totalPrice.getNumber() + '€'}"></span> <span th:text="'Gesamt: ' + ${totalPrice}"></span>
<form class="py-4" method="post" th:action="@{/event/checkout}"> <form class="py-4" method="post" th:action="@{/event/checkout}">
<button class="btn btn-primary" type="submit">Kostenpflichtig bestellen</button> <button class="btn btn-primary" type="submit">Kostenpflichtig bestellen</button>

12
src/main/resources/templates/invoice.html
View file

@ -1,6 +1,6 @@
<!--/*--> <!--/*-->
SPDX-License-Identifier: AGPL-3.0-or-later SPDX-License-Identifier: AGPL-3.0-or-later
SPDX-FileCopyrightText: 2023 swt23w23 SPDX-FileCopyrightText: 2023-2024 swt23w23
<!--*/--> <!--*/-->
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org" <html xmlns:th="http://www.thymeleaf.org"
@ -31,21 +31,21 @@ SPDX-FileCopyrightText: 2023 swt23w23
<tbody class="table-group-divider"> <tbody class="table-group-divider">
<tr th:each="orderLine : ${order.getOrderLines()}"> <tr th:each="orderLine : ${order.getOrderLines()}">
<td th:text="${orderLine.getProductName()}"></td> <td th:text="${orderLine.getProductName()}"></td>
<td th:text="${orderLine.getPrice().getNumber().doubleValueExact() + ' €'}"></td> <td th:text="${orderLine.getPrice()}"></td>
<td th:text="${orderLine.getQuantity()}"></td> <td th:text="${orderLine.getQuantity()}"></td>
<td th:text="${orderLine.getPrice().multiply(orderLine.getQuantity().getAmount()).getNumber().doubleValueExact() + order.getChargeLines(orderLine).getTotal().getNumber().doubleValueExact() + ' €'}"></td> <td th:text="${orderLine.getPrice().multiply(orderLine.getQuantity().getAmount()).add(order.getChargeLines(orderLine).getTotal())}"></td>
</tr> </tr>
<tr th:each="chargeLine : ${order.getChargeLines()}"> <tr th:each="chargeLine : ${order.getChargeLines()}">
<td th:text="${staffCharges.get(chargeLine).getName()}"></td> <td th:text="${staffCharges.get(chargeLine).getName()}"></td>
<td th:text="${chargeLine.getPrice().getNumber().doubleValueExact() + ' €'}"></td> <td th:text="${chargeLine.getPrice()}"></td>
<td>1</td> <td>1</td>
<td th:text="${chargeLine.getPrice().getNumber().doubleValueExact() + ' €'}"></td> <td th:text="${chargeLine.getPrice()}"></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="text-end"> <div class="text-end">
<h3>Gesamtpreis</h3> <h3>Gesamtpreis</h3>
<p th:text="${order.getTotal().getNumber().doubleValue() + ' €'}"></p> <p th:text="${order.getTotal()}"></p>
</div> </div>
<button class="btn btn-primary d-print-none" onclick="print()">Drucken</button> <button class="btn btn-primary d-print-none" onclick="print()">Drucken</button>
</div> </div>

6
src/main/resources/templates/orders.html
View file

@ -47,8 +47,8 @@ SPDX-FileCopyrightText: 2023-2024 swt23w23
<li> <li>
<b th:text="${orderLine.getProductName()}"/><br> <b th:text="${orderLine.getProductName()}"/><br>
<th:block th:text="'Menge: ' + ${orderLine.getQuantity()}"/><br> <th:block th:text="'Menge: ' + ${orderLine.getQuantity()}"/><br>
<th:block th:text="'Pauschale: ' + ${orderLine.getPrice().getNumber().doubleValue()} + '€'"/><br> <th:block th:text="'Pauschale: ' + ${orderLine.getPrice()}"/><br>
<th:block th:text="'Mietkosten: ' + ${order.getChargeLines(orderLine).getTotal().getNumber()} + '€'"/> <th:block th:text="'Mietkosten: ' + ${order.getChargeLines(orderLine).getTotal()}"/>
</li> </li>
</ul> </ul>
<ul th:each="employee : ${order.getStaff()}"> <ul th:each="employee : ${order.getStaff()}">
@ -68,7 +68,7 @@ SPDX-FileCopyrightText: 2023-2024 swt23w23
<p style="color: red" th:if="${order.getOrderStatus()} == ${cancelled}" th:text="STORNIERT"/> <p style="color: red" th:if="${order.getOrderStatus()} == ${cancelled}" th:text="STORNIERT"/>
<p style="color: green" th:if="${order.getOrderStatus()} == ${completed}" th:text="ABGESCHLOSSEN"/> <p style="color: green" th:if="${order.getOrderStatus()} == ${completed}" th:text="ABGESCHLOSSEN"/>
</td> <!--von Admin bearbeitbar--> </td> <!--von Admin bearbeitbar-->
<td th:text="${order.getTotal().getNumber().doubleValue()} + '€'"/> <td th:text="${order.getTotal()}"/>
<td sec:authorize="hasRole('ADMIN')" th:if="${order.getOrderStatus()} != ${cancelled}"> <td sec:authorize="hasRole('ADMIN')" th:if="${order.getOrderStatus()} != ${cancelled}">
<form method="post" th:action="@{/allOrders/remove}"> <form method="post" th:action="@{/allOrders/remove}">
<input type="hidden" name="orderID" value="0" th:value="${order.getId()}"/> <input type="hidden" name="orderID" value="0" th:value="${order.getId()}"/>