From 2ccc9fcdfbd5e45c993a291c74e90346a78411c8 Mon Sep 17 00:00:00 2001 From: Mathis Kral Date: Sun, 17 Dec 2023 12:04:33 +0100 Subject: [PATCH] Update /allOrders/{day} to work with status-filter This works on #115 Co-authored-by: Theo Reichert --- src/main/java/catering/order/OrderController.java | 11 +++++++---- src/main/resources/templates/orders.html | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/catering/order/OrderController.java b/src/main/java/catering/order/OrderController.java index 077570b..5883a63 100644 --- a/src/main/java/catering/order/OrderController.java +++ b/src/main/java/catering/order/OrderController.java @@ -83,17 +83,20 @@ public class OrderController { @GetMapping("/allOrders/{day}") @PreAuthorize("hasRole('ADMIN')") - public String ordersForAdmin(@PathVariable String day, Model model) { + public String ordersForAdmin(@PathVariable String day, Model model, @Valid @ModelAttribute("form") OrderQueryForm form) { // Obtains an instance of LocalDate from a text string such as 2007-12-03. LocalDate date = LocalDate.parse(day); List myOrders = customOrderRepository.findOrdersByInterval(date.atStartOfDay(), - date.atStartOfDay().plusHours(23).withMinute(59).withSecond(59)) - .stream().toList(); + date.atStartOfDay().plusHours(23).withMinute(59).withSecond(59)) + .stream().filter(order -> order.getOrderStatus().equals(form.getOrderStatus().orElse(order.getOrderStatus()))).toList(); model.addAttribute("orders", myOrders); model.addAttribute("total", myOrders.size()); - model.addAttribute("form", new OrderQueryForm()); + model.addAttribute("cancelled", OrderStatus.CANCELED); + model.addAttribute("completed", OrderStatus.COMPLETED); + model.addAttribute("form", form); + model.addAttribute("day", day); return "orders"; } diff --git a/src/main/resources/templates/orders.html b/src/main/resources/templates/orders.html index 732912e..d2ef078 100644 --- a/src/main/resources/templates/orders.html +++ b/src/main/resources/templates/orders.html @@ -1,6 +1,6 @@ SPDX-License-Identifier: AGPL-3.0-or-later -SPDX-FileCopyrightText: 2023 swt23w23 +SPDX-FileCopyrightText: 2023-2024 swt23w23
-
-
+
+
Ungültiger Buchungsstatus.
- +