Onkel-Werner-Freizeiten/CampOrganizer2
1
1
Fork 0
Code Issues 7 Pull Requests Packages Projects Releases Wiki Activity

fixed bug in navigation

Browse Source
This commit is contained in:
Jottyfan
2025-07-25 22:25:48 +02:00
parent 30c2bd5fc0
commit 13773f54de
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java
View File

@@ -33,11 +33,12 @@ public class BookingsController extends CommonController {
@GetMapping("/business/bookings/{year}")
@RolesAllowed({"business_booking"})
public String getBookings(Model model, @Nullable @PathVariable("year") Integer year) {
public String getBookings(Model model, @Nullable @PathVariable("year") Integer year, @RequestParam(name = "search", defaultValue = "") String search) {
model.addAttribute("bookers", bookingsService.getBookers(getCurrentUser(), year));
model.addAttribute("addBean", new AddPaymentBean());
model.addAttribute("year", LocalDate.now().getYear());
model.addAttribute("year", year == null ? LocalDate.now().getYear() : year);
model.addAttribute("years", bookingsService.getAllCampYears());
model.addAttribute("search", search);
return "business/bookings";
}
@@ -47,12 +48,12 @@ public class BookingsController extends CommonController {
BookerBean bean = bookingsService.getBooker(id, getCurrentUser());
model.addAttribute("booker", bean);
model.addAttribute("addBean", new AddPaymentBean());
return bean == null ? getBookings(model, LocalDate.now().getYear()) : "business/booker";
return bean == null ? getBookings(model, LocalDate.now().getYear(), null) : "business/booker";
}
@PostMapping("/business/bookings/payment/{id}")
@RolesAllowed({"business_booking"})
public String addPayment(Model model, @ModelAttribute("bean") AddPaymentBean bean, @PathVariable("id") Integer id) {
public String addPayment(Model model, @ModelAttribute("bean") AddPaymentBean bean, @PathVariable(name = "id") Integer id) {
Double payment = bean.getPayment();
bookingsService.addPayment(id, payment);
return getBooking(model, id);
@@ -60,11 +61,11 @@ public class BookingsController extends CommonController {
@PostMapping("/business/bookings/listpayment/{id}/{year}")
@RolesAllowed({"business_booking"})
public String addListPayment(Model model, @ModelAttribute("bean") AddPaymentBean bean, @PathVariable("id") Integer id, @PathVariable("year") Integer year, @RequestParam(defaultValue = "") String search) {
public String addListPayment(Model model, @ModelAttribute("bean") AddPaymentBean bean, @PathVariable(name = "id") Integer id, @PathVariable(name = "year") Integer year, @RequestParam(name = "search", defaultValue = "") String search) {
Double payment = bean.getPayment();
bookingsService.addPayment(id, payment);
LOGGER.debug("search is {}", search);
model.addAttribute("search", search);
return getBookings(model, year);
return "redirect:/business/bookings/" + year + "?search=" + search;
}
}