diff --git a/src/main/java/com/gcc/commissionerreview/controller/VphApiController.java b/src/main/java/com/gcc/commissionerreview/controller/VphApiController.java index b9fc75d..cb57d03 100644 --- a/src/main/java/com/gcc/commissionerreview/controller/VphApiController.java +++ b/src/main/java/com/gcc/commissionerreview/controller/VphApiController.java @@ -54,6 +54,11 @@ public class VphApiController { return vphservice.getHallBookings(); } + @GetMapping("/hall-bookings-dashboardreport") + public List> hallBookingsDashboardwithstatus() { + return vphservice.getHallBookingswithstatus(); + } + @GetMapping("/visitor-details-by-date") public List> getVisitorDetailsByDate( @RequestParam String visitDate) { diff --git a/src/main/java/com/gcc/commissionerreview/service/VphService.java b/src/main/java/com/gcc/commissionerreview/service/VphService.java index 4c37fd5..3b4b22b 100644 --- a/src/main/java/com/gcc/commissionerreview/service/VphService.java +++ b/src/main/java/com/gcc/commissionerreview/service/VphService.java @@ -92,7 +92,27 @@ public class VphService { SELECT hd.hall_name, us.name userName, DATE_FORMAT(bd.booking_date,'%d-%m-%Y') bookingDate, - DATE_FORMAT(bd.end_date,'%d-%m-%Y') eventDate + DATE_FORMAT(bd.end_date,'%d-%m-%Y') eventDate, + bd.booking_status as bookingstatus + FROM booking_details bd + LEFT JOIN hall_details hd ON bd.hall_details_hall_id=hd.hall_id + LEFT JOIN users us ON bd.users_user_id=us.user_id + WHERE bd.booking_status IN ('WAITING_FOR_NOC','APPROVED') + AND DATE(bd.booking_date) BETWEEN '2026-01-01' AND CURDATE() + ORDER BY bd.booking_date + """; + + return jdbcTemplate.queryForList(sql); + } + + public List> getHallBookingswithstatus() { + + String sql = """ + SELECT hd.hall_name, + us.name userName, + DATE_FORMAT(bd.booking_date,'%d-%m-%Y') bookingDate, + DATE_FORMAT(bd.end_date,'%d-%m-%Y') eventDate, + bd.booking_status as bookingstatus FROM booking_details bd LEFT JOIN hall_details hd ON bd.hall_details_hall_id=hd.hall_id LEFT JOIN users us ON bd.users_user_id=us.user_id diff --git a/src/main/resources/templates/modules/vphreport.html b/src/main/resources/templates/modules/vphreport.html index 41b1715..ef85bb0 100644 --- a/src/main/resources/templates/modules/vphreport.html +++ b/src/main/resources/templates/modules/vphreport.html @@ -351,6 +351,7 @@ Hall Name User Name Booking Date + Booking Status Event Date @@ -807,6 +808,7 @@ ${r.hall_name} ${r.userName} ${r.bookingDate} + ${r.bookingstatus} ${r.eventDate} `); diff --git a/src/main/resources/templates/modules/vphreportdashboard.html b/src/main/resources/templates/modules/vphreportdashboard.html index 0f5dde7..9dc75dc 100644 --- a/src/main/resources/templates/modules/vphreportdashboard.html +++ b/src/main/resources/templates/modules/vphreportdashboard.html @@ -305,6 +305,7 @@ Hall Name User Name Booking Date + Booking Status Event Date @@ -1396,7 +1397,7 @@ $("#hallTable tbody").empty(); $.ajax({ - url: "/commissionerreview/api/hall-bookings", + url: "/commissionerreview/api/hall-bookings-dashboardreport", method: "GET", success: function (data) { $.each(data, function (i, r) { @@ -1405,6 +1406,7 @@ ${r.hall_name} ${r.userName} ${r.bookingDate} + ${r.bookingstatus} ${r.eventDate} `);