mirror of
https://github.com/st-tu-dresden-praktikum/swt23w23
synced 2024-07-19 21:04:36 +02:00
Add employee query to order controller
This was simply forgotten before cross-testing.
This commit is contained in:
parent
8ab01fd65f
commit
f961071265
|
@ -6,6 +6,7 @@ import catering.catalog.CateringCatalog;
|
||||||
import catering.catalog.Consumable;
|
import catering.catalog.Consumable;
|
||||||
import catering.catalog.Rentable;
|
import catering.catalog.Rentable;
|
||||||
import catering.staff.Employee;
|
import catering.staff.Employee;
|
||||||
|
import catering.staff.JobType;
|
||||||
import catering.staff.StaffManagement;
|
import catering.staff.StaffManagement;
|
||||||
import org.salespointframework.catalog.Product;
|
import org.salespointframework.catalog.Product;
|
||||||
import org.salespointframework.inventory.UniqueInventory;
|
import org.salespointframework.inventory.UniqueInventory;
|
||||||
|
@ -28,6 +29,7 @@ import java.time.temporal.ChronoUnit;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
|
|
||||||
@Controller
|
@Controller
|
||||||
|
@ -125,7 +127,9 @@ public class OrderController {
|
||||||
inventory,
|
inventory,
|
||||||
customOrderRepository))));
|
customOrderRepository))));
|
||||||
|
|
||||||
model.addAttribute("allStaff", staffManagement.findAll().stream().toList());
|
model.addAttribute("allStaff", Stream.concat(
|
||||||
|
staffManagement.getAvailableStaffByJob(JobType.COOK, cart.getStart(), cart.getFinish()).stream(),
|
||||||
|
staffManagement.getAvailableStaffByJob(JobType.SERVICE, cart.getStart(), cart.getFinish()).stream()).toList());
|
||||||
|
|
||||||
model.addAttribute("duration", cart.getDurationInHours());
|
model.addAttribute("duration", cart.getDurationInHours());
|
||||||
|
|
||||||
|
|
|
@ -139,14 +139,12 @@ SPDX-FileCopyrightText: 2023 swt23w23
|
||||||
<th>Name</th>
|
<th>Name</th>
|
||||||
<th>Typ</th>
|
<th>Typ</th>
|
||||||
<th>Stundensatz</th>
|
<th>Stundensatz</th>
|
||||||
<th>Verfügbar</th>
|
|
||||||
<td></td>
|
<td></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr th:each="employee : ${allStaff}">
|
<tr th:each="employee : ${allStaff}">
|
||||||
<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="${employee.getWage()}"></td>
|
<td th:text="${employee.getWage()}"></td>
|
||||||
<td style="color: green" th:text="Verfügbar"></td>
|
|
||||||
<td>
|
<td>
|
||||||
<form th:action="@{/event/addEmployee}" method="post">
|
<form th:action="@{/event/addEmployee}" method="post">
|
||||||
<input type="hidden" name="sid" th:value="${employee.getId()}"/>
|
<input type="hidden" name="sid" th:value="${employee.getId()}"/>
|
||||||
|
|
Loading…
Reference in a new issue