From 13773f54de1d73c5e61252ea652b505adeabf09d Mon Sep 17 00:00:00 2001
From: Jottyfan <jottyfan@mail.de>
Date: Fri, 25 Jul 2025 22:25:48 +0200
Subject: [PATCH] fixed bug in navigation

---
 build.gradle                                        |  6 +++++-
 .../business/bookings/BookingsController.java       | 13 +++++++------
 src/main/resources/templates/business/bookings.html |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index da15fd5..2481f89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
 }
 
 group = 'de.jottyfan.camporganizer'
-version = '0.9.8'
+version = '0.9.9'
 
 description = """CampOrganizer2"""
 
@@ -27,6 +27,10 @@ repositories {
   }
 }
 
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs.add("-parameters")
+}
+
 war {
   doFirst {
     manifest {
diff --git a/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java b/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java
index 961ad5b..7bd6b3f 100644
--- a/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java
+++ b/src/main/java/de/jottyfan/camporganizer/module/business/bookings/BookingsController.java
@@ -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;
 	}
 }
diff --git a/src/main/resources/templates/business/bookings.html b/src/main/resources/templates/business/bookings.html
index 0d040d4..1c4da29 100644
--- a/src/main/resources/templates/business/bookings.html
+++ b/src/main/resources/templates/business/bookings.html
@@ -37,7 +37,7 @@
 									<td class="middled" th:text="${b.camp}"></td>
 									<td class="middled" th:text="${b.role}"></td>
 									<td class="middled">
-										<form action="#" th:action="@{'/business/bookings/listpayment/{id}/{year}(id=${b.pk},year=${year})'}" th:object="${addBean}" method="post">
+										<form action="#" th:action="@{/business/bookings/listpayment/{id}/{year}(id=${b.pk},year=${year})}" th:object="${addBean}" method="post">
 											<input th:id="'searchfield' + ${b.pk}" type="hidden" th:name="search" />
 											<div class="container">
 												<div class="row">