From 668d758ed03ceac51fb21b02b96871a9010a13fc Mon Sep 17 00:00:00 2001
From: Mathis Kral <mathis_tiberius.kral@mailbox.tu-dresden.de>
Date: Mon, 15 Jan 2024 14:05:25 +0100
Subject: [PATCH] Add uniform price formatting

This works on #144
---
 src/main/resources/templates/catalog.html        |  4 ++--
 src/main/resources/templates/catalog_editor.html |  8 ++++----
 src/main/resources/templates/event.html          | 10 +++++-----
 src/main/resources/templates/invoice.html        | 12 ++++++------
 src/main/resources/templates/orders.html         |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/main/resources/templates/catalog.html b/src/main/resources/templates/catalog.html
index 7c3df84..b6111c7 100644
--- a/src/main/resources/templates/catalog.html
+++ b/src/main/resources/templates/catalog.html
@@ -1,6 +1,6 @@
 <!--/*-->
 SPDX-License-Identifier: AGPL-3.0-or-later
-SPDX-FileCopyrightText: 2023 swt23w23
+SPDX-FileCopyrightText: 2023-2024 swt23w23
 <!--*/-->
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org"
@@ -32,7 +32,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
 								<li th:text="${product.getKey().toString()} + ': ' + ${product.getValue().toString()}"/>
 							</ul>
 						</td>
-						<td th:text="${catalogEntry.getTotalCost()} + ' €'">
+						<td th:text="${catalogEntry.getTotalCost()}">
 						<td sec:authorize="hasRole('ADMIN')">
 							<form method="post" th:action="@{/catalog/remove}">
 								<input type="hidden" name="catalogEntryID" th:value="${catalogEntry.getId()}">
diff --git a/src/main/resources/templates/catalog_editor.html b/src/main/resources/templates/catalog_editor.html
index 1904ce7..f9dcbe8 100644
--- a/src/main/resources/templates/catalog_editor.html
+++ b/src/main/resources/templates/catalog_editor.html
@@ -1,6 +1,6 @@
 <!--/*-->
 SPDX-License-Identifier: AGPL-3.0-or-later
-SPDX-FileCopyrightText: 2023 swt23w23
+SPDX-FileCopyrightText: 2023-2024 swt23w23
 <!--*/-->
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org"
@@ -22,7 +22,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
 					</select>
 					<button class="btn btn-secondary" type="submit">Event auswählen</button>
 				</form>
-				Eventbasispreis: 500€
+				Eventbasispreis: EUR 500
 
 				<h2>Mindestzeitraum</h2>
 				<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()}">
 						<td th:text="${item.getName()}">
 						<td th:text="${productMap.get(item)}">
-						<td th:text="${item.getPrice()}">€
+						<td th:text="${item.getPrice()}">
 						<td>
 							<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()}">
@@ -76,7 +76,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
 				<h3>Momentane Auswahl</h3>
 				Eventtyp: <span th:text="${formCatalogEntry.getEventType()}"></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}">
 					<input type="hidden" name="eventType" th:value="${formCatalogEntry.getEventType()}">
 					<input type="hidden" name="products" th:value="${productSet}">
diff --git a/src/main/resources/templates/event.html b/src/main/resources/templates/event.html
index 6cf028c..d965fff 100644
--- a/src/main/resources/templates/event.html
+++ b/src/main/resources/templates/event.html
@@ -1,6 +1,6 @@
 <!--/*-->
 SPDX-License-Identifier: AGPL-3.0-or-later
-SPDX-FileCopyrightText: 2023 swt23w23
+SPDX-FileCopyrightText: 2023-2024 swt23w23
 <!--*/-->
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org"
@@ -42,7 +42,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
 				<tr th:each="item : ${cartConsumables}">
 					<td th:text="${item.getProductName()}"></td>
 					<td th:text="${item.getQuantity()}"></td>
-					<td th:text="${item.getPrice().getNumber().doubleValue()} +'€'"></td>
+					<td th:text="${item.getPrice()}"></td>
 					<td>
 						<form method="post" th:action="@{/event/removeProduct}">
 							<input type="hidden" th:value="${item.getId()}" name="itemId"/>
@@ -53,7 +53,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
 				<tr th:each="item : ${cartRentables}">
 					<td th:text="${item.getProductName()}"></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>
 						<form method="post" th:action="@{/event/removeProduct}">
 							<input type="hidden" th:value="${item.getId()}" name="itemId"/>
@@ -68,7 +68,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
 				<tr th:each="employee : ${event.getStaff()}">
 					<td th:text="${employee.getName()}"></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>
 						<form method="post" th:action="@{/event/removeEmployee}">
 							<input type="hidden" th:value="${employee.getId()}" name="sid"/>
@@ -78,7 +78,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
 				</tr>
 			</table>
 
-			<span th:text="'Gesamt: ' + ${totalPrice.getNumber() + '€'}"></span>
+			<span th:text="'Gesamt: ' + ${totalPrice}"></span>
 
 			<form class="py-4" method="post" th:action="@{/event/checkout}">
 				<button class="btn btn-primary" type="submit">Kostenpflichtig bestellen</button>
diff --git a/src/main/resources/templates/invoice.html b/src/main/resources/templates/invoice.html
index 0827638..7cc4c34 100644
--- a/src/main/resources/templates/invoice.html
+++ b/src/main/resources/templates/invoice.html
@@ -1,6 +1,6 @@
 <!--/*-->
 SPDX-License-Identifier: AGPL-3.0-or-later
-SPDX-FileCopyrightText: 2023 swt23w23
+SPDX-FileCopyrightText: 2023-2024 swt23w23
 <!--*/-->
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org"
@@ -31,21 +31,21 @@ SPDX-FileCopyrightText: 2023 swt23w23
 			<tbody class="table-group-divider">
 				<tr th:each="orderLine : ${order.getOrderLines()}">
 					<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.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 th:each="chargeLine : ${order.getChargeLines()}">
 					<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 th:text="${chargeLine.getPrice().getNumber().doubleValueExact() + ' €'}"></td>
+					<td th:text="${chargeLine.getPrice()}"></td>
 				</tr>
 			</tbody>
 		</table>
 		<div class="text-end">
 			<h3>Gesamtpreis</h3>
-			<p th:text="${order.getTotal().getNumber().doubleValue() + ' €'}"></p>
+			<p th:text="${order.getTotal()}"></p>
 		</div>
 		<button class="btn btn-primary d-print-none" onclick="print()">Drucken</button>
 	</div>
diff --git a/src/main/resources/templates/orders.html b/src/main/resources/templates/orders.html
index d2ef078..42e3bf2 100644
--- a/src/main/resources/templates/orders.html
+++ b/src/main/resources/templates/orders.html
@@ -47,8 +47,8 @@ SPDX-FileCopyrightText: 2023-2024 swt23w23
 									<li>
 										<b th:text="${orderLine.getProductName()}"/><br>
 										<th:block th:text="'Menge: ' + ${orderLine.getQuantity()}"/><br>
-										<th:block th:text="'Pauschale: ' + ${orderLine.getPrice().getNumber().doubleValue()} + '€'"/><br>
-										<th:block th:text="'Mietkosten: ' + ${order.getChargeLines(orderLine).getTotal().getNumber()} + '€'"/>
+										<th:block th:text="'Pauschale: ' + ${orderLine.getPrice()}"/><br>
+										<th:block th:text="'Mietkosten: ' + ${order.getChargeLines(orderLine).getTotal()}"/>
 									</li>
 								</ul>
 								<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: green" th:if="${order.getOrderStatus()} == ${completed}" th:text="ABGESCHLOSSEN"/>
 						</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}">
 							<form method="post" th:action="@{/allOrders/remove}">
 								<input type="hidden" name="orderID" value="0" th:value="${order.getId()}"/>
