From 3b333683747cb16a08d4ac164414bb45d8fda3be Mon Sep 17 00:00:00 2001 From: Jottyfan Date: Sun, 9 Oct 2022 09:55:12 +0200 Subject: [PATCH] small changes --- build.gradle | 2 +- .../business/bookings/BookingsController.java | 3 ++- .../resources/templates/business/bookings.html | 14 ++++++++------ src/main/resources/templates/business/camp.html | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 6d68f68..0c8f044 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'war' apply plugin: 'application' group = 'de.jottyfan.camporganizer' -version = '0.0.1' +version = '0.0.2' sourceCompatibility = 17 mainClassName = "de.jottyfan.camporganizer.Main" 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 a34d1c4..0a720ec 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 @@ -38,6 +38,7 @@ public class BookingsController { String username = indexService.getCurrentUser(request); model.addAttribute("currentUser", username); model.addAttribute("bookers", bookingsService.getBookers(username)); + model.addAttribute("addBean", new AddPaymentBean()); return "business/bookings"; } @@ -57,6 +58,6 @@ public class BookingsController { public String addBooking(Model model, @ModelAttribute AddPaymentBean bean, @PathVariable Integer id) { Double payment = bean.getPayment(); bookingsService.addPayment(id, payment); - return getBooking(model, id); + return getBookings(model); } } diff --git a/src/main/resources/templates/business/bookings.html b/src/main/resources/templates/business/bookings.html index 130fed4..6f3b434 100644 --- a/src/main/resources/templates/business/bookings.html +++ b/src/main/resources/templates/business/bookings.html @@ -7,9 +7,9 @@
- - - +
@@ -31,12 +31,14 @@ - + - + +
+ +
diff --git a/src/main/resources/templates/business/camp.html b/src/main/resources/templates/business/camp.html index 43a0522..dd7f782 100644 --- a/src/main/resources/templates/business/camp.html +++ b/src/main/resources/templates/business/camp.html @@ -76,7 +76,7 @@ - +