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

Update /allOrders/{day} to work with status-filter

Browse source 
This works on #115

Co-authored-by: Theo Reichert <theo.reichert@mailbox.tu-dresden.de>
This commit is contained in:
Mathis Kral 2023-12-17 12:04:33 +01:00 committed by Theo Reichert
parent da24ca79a1
commit 2ccc9fcdfb
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/catering/order/OrderController.java
View file

@ -83,17 +83,20 @@ public class OrderController {
@GetMapping("/allOrders/{day}") @GetMapping("/allOrders/{day}")
@PreAuthorize("hasRole('ADMIN')") @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. // Obtains an instance of LocalDate from a text string such as 2007-12-03.
LocalDate date = LocalDate.parse(day); LocalDate date = LocalDate.parse(day);
List<CustomOrder> myOrders = customOrderRepository.findOrdersByInterval(date.atStartOfDay(), List<CustomOrder> myOrders = customOrderRepository.findOrdersByInterval(date.atStartOfDay(),
date.atStartOfDay().plusHours(23).withMinute(59).withSecond(59)) date.atStartOfDay().plusHours(23).withMinute(59).withSecond(59))
.stream().toList(); .stream().filter(order -> order.getOrderStatus().equals(form.getOrderStatus().orElse(order.getOrderStatus()))).toList();
model.addAttribute("orders", myOrders); model.addAttribute("orders", myOrders);
model.addAttribute("total", myOrders.size()); 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"; return "orders";
} }

8
src/main/resources/templates/orders.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"
@ -9,8 +9,8 @@ SPDX-FileCopyrightText: 2023 swt23w23
layout:decorate="~{layout.html(title='Bestellungen')}"> layout:decorate="~{layout.html(title='Bestellungen')}">
<body> <body>
<div layout:fragment="content"> <div layout:fragment="content">
<div> <!--th:unless"${cart.empty}"--> <div>
<form sec:authorize="hasRole('ADMIN')" method="get" th:action="@{/allOrders}" th:object="${form}" class="mb-3"> <form sec:authorize="hasRole('ADMIN')" method="get" th:action="@{'/allOrders' + ${day != null ? '/' + day : '' }}" th:object="${form}" class="mb-3">
<label class="form-label">Bestellungsstatus</label> <label class="form-label">Bestellungsstatus</label>
<select class="form-select mb-2" for="orderStatus" th:field="*{orderStatus}" th:errorclass="is-invalid"> <select class="form-select mb-2" for="orderStatus" th:field="*{orderStatus}" th:errorclass="is-invalid">
<option selected name="orderStatus" th:value="${null}" th:text="any"></option> <option selected name="orderStatus" th:value="${null}" th:text="any"></option>
@ -23,7 +23,7 @@ SPDX-FileCopyrightText: 2023 swt23w23
/> />
</select> </select>
<div th:if="${#fields.hasErrors('orderStatus')}" class="invalid-feedback">Ungültiger Buchungsstatus.</div> <div th:if="${#fields.hasErrors('orderStatus')}" class="invalid-feedback">Ungültiger Buchungsstatus.</div>
<button class="btn btn-primary" type="submit" th:text="${'suchen'}"></button> <button class="btn btn-primary" type="submit">suchen</button>
</form> </form>
<table class="table"> <table class="table">
<tr> <tr>