From 6a701cf277e6cfe945cdcc8f3fc6b065b8449a5d Mon Sep 17 00:00:00 2001 From: kanimozhi <136799210+KaNi-04@users.noreply.github.com> Date: Tue, 29 Jul 2025 15:35:11 +0530 Subject: [PATCH] Half Deposit Amount added and BookingServiceImpl changes --- .../controller/AdminAPIController.java | 2 + .../controller/Admincontroller.java | 19 +- .../controller/UserAPIController.java | 16 +- .../gcc/communityHall/entity/HallDetails.java | 14 +- .../repository/BookingDetailsRepository.java | 293 +- .../communityHall/service/BookingService.java | 6 + .../service/HallDetailService.java | 2 +- .../service/Impl/BookingServiceImpl.java | 65 +- .../service/Impl/HallDetailServiceImpl.java | 4 +- .../resources/application-prod.properties | 1 + .../templates/admin/halldetailslist.html | 3070 +++++++++-------- .../resources/templates/admin/reports.html | 177 +- .../resources/templates/user/dashboard.html | 8 +- .../templates/user/hallbookingform.html | 3 + .../templates/user/viewhallform.html | 5 +- 15 files changed, 2041 insertions(+), 1644 deletions(-) diff --git a/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java b/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java index 1a167acb..28f68d7c 100644 --- a/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java +++ b/src/main/java/com/gcc/communityHall/controller/AdminAPIController.java @@ -211,6 +211,7 @@ public class AdminAPIController { @RequestParam("hallInchargeMobno") long hallInchargeMobno, @RequestParam("hallInchargeName") String hallInchargeName, @RequestParam("depositAmount") float depositAmount, + @RequestParam("halfDepositAmount") float halfDepositAmount, @RequestParam("fullDayRent") float fullDayRent, @RequestParam("halfDayRent") float halfDayRent, @RequestParam("parkingCapacity") String parkingCapacity, @@ -237,6 +238,7 @@ public class AdminAPIController { hallDetails.setHallInchargeMobno(hallInchargeMobno); hallDetails.setHallInchargeName(hallInchargeName); hallDetails.setDepositAmount(depositAmount); + hallDetails.setHalfDepositAmount(halfDepositAmount); hallDetails.setFullDayRent(fullDayRent); hallDetails.setHalfDayRent(halfDayRent); hallDetails.setParkingCapacity(parkingCapacity); diff --git a/src/main/java/com/gcc/communityHall/controller/Admincontroller.java b/src/main/java/com/gcc/communityHall/controller/Admincontroller.java index a004d4a1..7a49e6d5 100644 --- a/src/main/java/com/gcc/communityHall/controller/Admincontroller.java +++ b/src/main/java/com/gcc/communityHall/controller/Admincontroller.java @@ -399,6 +399,7 @@ public class Admincontroller { public String saveHall( @RequestParam String hallName, @RequestParam float depositAmount, + @RequestParam float halfdepositAmt, @RequestParam float halfDayAmt, @RequestParam float fullDayAmt, @RequestParam float gst, @@ -422,7 +423,7 @@ public class Admincontroller { @RequestParam("hallImages") MultipartFile[] hallImages, HttpSession session) { String updatedId = (String) session.getAttribute("employeeId"); hallDetailService.saveHall(hallName, depositAmount, halfDayAmt, fullDayAmt, gst, hallArea, ebNumber, ebCostPerUnit, parkingCapacity, seatingCapacity, doorNo, - street, area, zone, division, landMark, city, pinCode, latitude, longitude, hallInchargeName, hallInchargeNo, updatedId, hallImages); + street, area, zone, division, landMark, city, pinCode, latitude, longitude, hallInchargeName, hallInchargeNo, updatedId, hallImages, halfdepositAmt); String adminname = (String) session.getAttribute("usertype"); Integer loginid = (Integer) session.getAttribute("id"); ApplicationLogs logs = new ApplicationLogs(); @@ -649,6 +650,22 @@ public class Admincontroller { model.addAttribute("reporttype", reporttype); } + if ("10".equals(request)) { + + List zoneWiseBookingList = bookingService.getZoneWiseBookingList(fromDate, toDate); + model.addAttribute("zoneWiseBookingList", zoneWiseBookingList); + + // Fetch all hall data (not dependent on zone dropdown yet) + List hallWiseBookingList = bookingService.getAllHallWiseBookingList(fromDate, toDate); + String hallWiseBookingJson = new ObjectMapper().writeValueAsString(hallWiseBookingList); + model.addAttribute("hallWiseBookingList", hallWiseBookingJson); + + // Fetch all counter data + List counterWiseBookingList = bookingService.getAllCounterWiseBookingList(fromDate, toDate); + String counterWiseBookingJson = new ObjectMapper().writeValueAsString(counterWiseBookingList); + model.addAttribute("counterWiseBookingList", counterWiseBookingJson); + } + model.addAttribute("filterby", filterby); model.addAttribute("users", userList); model.addAttribute("bookings", bookingList); diff --git a/src/main/java/com/gcc/communityHall/controller/UserAPIController.java b/src/main/java/com/gcc/communityHall/controller/UserAPIController.java index ddf4e138..744df340 100644 --- a/src/main/java/com/gcc/communityHall/controller/UserAPIController.java +++ b/src/main/java/com/gcc/communityHall/controller/UserAPIController.java @@ -1729,12 +1729,13 @@ public class UserAPIController { double fullDayAmount = hallDetails.getFullDayRent(); double halfDayAmount = hallDetails.getHalfDayRent(); double depositAmount = hallDetails.getDepositAmount(); + double halfDepositAmount = hallDetails.getHalfDepositAmount(); double gstRate = hallDetails.getGst(); Map response = new HashMap<>(); double amount = calculateAmount(numDays, startPeriod, endPeriod, fullDayAmount, halfDayAmount); - double totalDepositAmount = calculateDepositAmount(numDays, startPeriod, endPeriod, depositAmount); + double totalDepositAmount = calculateDepositAmount(numDays, startPeriod, endPeriod, depositAmount, halfDepositAmount); double totalAmount; double discountAmount = 0.0; response.put("reasonforBooking", reasonforBooking); @@ -1887,17 +1888,17 @@ public class UserAPIController { } } - public double calculateDepositAmount(double numDays, String startPeriod, String endPeriod, double depositAmount) { + public double calculateDepositAmount(double numDays, String startPeriod, String endPeriod, double depositAmount, double HalfDepositAmount) { double damount = 0; - + // FOR FULL DAY // If there is only one day if (numDays == 1) { if ("1".equals(startPeriod) && "2".equals(endPeriod)) { damount = depositAmount; } else if ("1".equals(startPeriod) && "1".equals(endPeriod)) { - damount = depositAmount; + damount = HalfDepositAmount; } else if ("2".equals(startPeriod) && "2".equals(endPeriod)) { - damount = depositAmount; + damount = HalfDepositAmount; } else { damount = numDays; } @@ -1906,16 +1907,15 @@ public class UserAPIController { if ("1".equals(startPeriod) && "2".equals(endPeriod)) { damount = depositAmount * numDays; } else if ("1".equals(startPeriod) && "1".equals(endPeriod)) { - damount = depositAmount * (numDays - 1) + depositAmount; + damount = depositAmount * (numDays - 1) + HalfDepositAmount; } else if ("2".equals(startPeriod) && "2".equals(endPeriod)) { - damount = depositAmount * (numDays - 1) + depositAmount; + damount = depositAmount * (numDays - 1) + HalfDepositAmount; } else if ("2".equals(startPeriod) && "1".equals(endPeriod)) { damount = depositAmount * (numDays - 2) + depositAmount; } else { damount = numDays; } } - return damount; } diff --git a/src/main/java/com/gcc/communityHall/entity/HallDetails.java b/src/main/java/com/gcc/communityHall/entity/HallDetails.java index 6f59ed63..92fb6730 100644 --- a/src/main/java/com/gcc/communityHall/entity/HallDetails.java +++ b/src/main/java/com/gcc/communityHall/entity/HallDetails.java @@ -56,6 +56,10 @@ public class HallDetails { @Column(name = "deposit_amount", nullable = false) private float depositAmount; + + @Column(name = "half_deposit_amount", nullable = false) + private float halfDepositAmount; + @Column(name="full_day_rent",nullable=false) private float fullDayRent; @Column(name="half_day_rent",nullable=false) @@ -363,6 +367,14 @@ public class HallDetails { public void setHallDetailsConcession(List hallDetailsConcession) { this.hallDetailsConcession = hallDetailsConcession; - } + } + + public float getHalfDepositAmount() { + return halfDepositAmount; + } + + public void setHalfDepositAmount(float halfDepositAmount) { + this.halfDepositAmount = halfDepositAmount; + } } diff --git a/src/main/java/com/gcc/communityHall/repository/BookingDetailsRepository.java b/src/main/java/com/gcc/communityHall/repository/BookingDetailsRepository.java index 567f8735..f63a69be 100644 --- a/src/main/java/com/gcc/communityHall/repository/BookingDetailsRepository.java +++ b/src/main/java/com/gcc/communityHall/repository/BookingDetailsRepository.java @@ -77,8 +77,8 @@ public interface BookingDetailsRepository extends JpaRepository findFutureEventsByHallId(Integer hallId); - @Query(value = "select count(users_user_id), us.user_status from booking_details bd inner join users us on us.user_id = bd.users_user_id \r\n" - + "where users_user_id=:userId and booking_status in ('APPROVED','COMPLETED','WAITING_FOR_NOC','WAITING_FOR_NOC_APPROVAL') and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) \r\n" + @Query(value = "select count(users_user_id), us.user_status from booking_details bd inner join users us on us.user_id = bd.users_user_id \r" + + "where users_user_id=:userId and booking_status in ('APPROVED','COMPLETED','WAITING_FOR_NOC','WAITING_FOR_NOC_APPROVAL') and DATE_SUB(CURDATE(), INTERVAL 1 YEAR) \r" + "and us.user_status not in ('PENDING')", nativeQuery = true) int checkUserBookinglimitation(int userId); @@ -143,29 +143,29 @@ public interface BookingDetailsRepository extends JpaRepository getBookingHallDetailsReport(@Param("fromDate") String fromDate, @Param("toDate") String toDate); - @Query(value = "SELECT \r\n" - + " COALESCE( SUM(\r\n" - + " CASE \r\n" - + " WHEN start_date = CURDATE() THEN 1\r\n" - + " ELSE 0\r\n" - + " END\r\n" - + " ),0) AS currente,\r\n" - + " COALESCE( SUM(\r\n" - + " CASE \r\n" - + " \r\n" - + " WHEN start_date < CURDATE() THEN 1\r\n" - + " ELSE 0\r\n" - + " END\r\n" - + " ), 0) AS past,\r\n" - + " COALESCE( SUM(\r\n" - + " CASE \r\n" - + " \r\n" - + " WHEN start_date > CURDATE() THEN 1\r\n" - + " ELSE 0\r\n" - + " END\r\n" - + " ),0) AS FUTURE\r\n" - + "FROM \r\n" - + " booking_details hall\r\n" + @Query(value = "SELECT \r" + + " COALESCE( SUM(\r" + + " CASE \r" + + " WHEN start_date = CURDATE() THEN 1\r" + + " ELSE 0\r" + + " END\r" + + " ),0) AS currente,\r" + + " COALESCE( SUM(\r" + + " CASE \r" + + " \r" + + " WHEN start_date < CURDATE() THEN 1\r" + + " ELSE 0\r" + + " END\r" + + " ), 0) AS past,\r" + + " COALESCE( SUM(\r" + + " CASE \r" + + " \r" + + " WHEN start_date > CURDATE() THEN 1\r" + + " ELSE 0\r" + + " END\r" + + " ),0) AS FUTURE\r" + + "FROM \r" + + " booking_details hall\r" + " where hall_details_hall_id= :hall_id and booking_status='APPROVED'", nativeQuery = true) List> pieChartCount(int hall_id); @@ -242,102 +242,102 @@ public interface BookingDetailsRepository extends JpaRepository> toatlBookingCount(String zone); - @Query(value = " SELECT SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'CANCELED' THEN 1 ELSE 0 END) AS CANCELED,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'PAYMENT_FAILURE' THEN 1 ELSE 0 END) AS PAYMENT_FAILURE,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'GCC_BLOCKED' THEN 1 ELSE 0 END) AS GCC_BLOCKED\r\n" + @Query(value = " SELECT SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'CANCELED' THEN 1 ELSE 0 END) AS CANCELED,\r" + + " SUM(CASE WHEN bd.booking_status = 'PAYMENT_FAILURE' THEN 1 ELSE 0 END) AS PAYMENT_FAILURE,\r" + + " SUM(CASE WHEN bd.booking_status = 'GCC_BLOCKED' THEN 1 ELSE 0 END) AS GCC_BLOCKED\r" + "FROM booking_details bd " + "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " + "WHERE hd.zone = :zone", nativeQuery = true) List> getCount(String zone); - @Query(value = "SELECT CONCAT(YEAR(bd.start_date), '-', LPAD(MONTH(bd.start_date), 2, '0')) AS months, SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count\r\n" - + "FROM booking_details bd JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id \r\n" - + "WHERE bd.start_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)\r\n" - + " AND bd.start_date <= DATE_ADD(CURDATE(), INTERVAL 6 MONTH) AND hd.zone = :zone \r\n" + @Query(value = "SELECT CONCAT(YEAR(bd.start_date), '-', LPAD(MONTH(bd.start_date), 2, '0')) AS months, SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count\r" + + "FROM booking_details bd JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id \r" + + "WHERE bd.start_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)\r" + + " AND bd.start_date <= DATE_ADD(CURDATE(), INTERVAL 6 MONTH) AND hd.zone = :zone \r" + " group by months order by months ASC", nativeQuery = true) List> getmounthcount(String zone); - @Query(value = "SELECT CONCAT(YEAR(bd.start_date), '-', LPAD(MONTH(bd.start_date), 2, '0')) AS months, SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count\r\n" - + "FROM booking_details bd JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id \r\n" - + "WHERE bd.start_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)\r\n" - + " AND bd.start_date <= DATE_ADD(CURDATE(), INTERVAL 6 MONTH) \r\n" - + "AND (:zone = 'all zones' OR hd.zone = :zone)\r\n " + @Query(value = "SELECT CONCAT(YEAR(bd.start_date), '-', LPAD(MONTH(bd.start_date), 2, '0')) AS months, SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count\r" + + "FROM booking_details bd JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id \r" + + "WHERE bd.start_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)\r" + + " AND bd.start_date <= DATE_ADD(CURDATE(), INTERVAL 6 MONTH) \r" + + "AND (:zone = 'all zones' OR hd.zone = :zone)\r " + " group by months order by months ASC", nativeQuery = true) List> getAllAdminmonthcount(@Param("zone") String zone); - @Query(value = " SELECT SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'CANCELED' THEN 1 ELSE 0 END) AS CANCELED,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'PAYMENT_FAILURE' THEN 1 ELSE 0 END) AS PAYMENT_FAILURE,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'GCC_BLOCKED' THEN 1 ELSE 0 END) AS GCC_BLOCKED\r\n" + @Query(value = " SELECT SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'PENDING' THEN 1 ELSE 0 END) AS pending_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'CANCELED' THEN 1 ELSE 0 END) AS CANCELED,\r" + + " SUM(CASE WHEN bd.booking_status = 'PAYMENT_FAILURE' THEN 1 ELSE 0 END) AS PAYMENT_FAILURE,\r" + + " SUM(CASE WHEN bd.booking_status = 'GCC_BLOCKED' THEN 1 ELSE 0 END) AS GCC_BLOCKED\r" + "FROM booking_details bd " + "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id " + "WHERE (:zone = 'all zones' OR hd.zone = :zone)", nativeQuery = true) List> getAdmincount(@Param("zone") String zone); - @Query(value = "SELECT CONCAT(YEAR(bd.start_date), '-', LPAD(MONTH(bd.start_date), 2, '0')) AS months, SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'COMPLETED' THEN 1 ELSE 0 END) AS completed_count\r\n" - + "FROM booking_details bd JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id \r\n" - + "WHERE bd.start_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)\r\n" - + " AND bd.start_date <= DATE_ADD(CURDATE(), INTERVAL 6 MONTH) AND hd.hall_id=:hall_id \r\n" + @Query(value = "SELECT CONCAT(YEAR(bd.start_date), '-', LPAD(MONTH(bd.start_date), 2, '0')) AS months, SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'COMPLETED' THEN 1 ELSE 0 END) AS completed_count\r" + + "FROM booking_details bd JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id \r" + + "WHERE bd.start_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)\r" + + " AND bd.start_date <= DATE_ADD(CURDATE(), INTERVAL 6 MONTH) AND hd.hall_id=:hall_id \r" + " group by months order by months ASC", nativeQuery = true) List> getCartakermounthcount(int hall_id); - @Query(value = " SELECT SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'COMPLETED' THEN 1 ELSE 0 END) AS completed_count,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'CANCELED' THEN 1 ELSE 0 END) AS CANCELED,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'PAYMENT_FAILURE' THEN 1 ELSE 0 END) AS PAYMENT_FAILURE,\r\n" - + " SUM(CASE WHEN bd.booking_status = 'GCC_BLOCKED' THEN 1 ELSE 0 END) AS GCC_BLOCKED\r\n" + @Query(value = " SELECT SUM(CASE WHEN booking_status = 'APPROVED' THEN 1 ELSE 0 END) AS approved_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'COMPLETED' THEN 1 ELSE 0 END) AS completed_count,\r" + + " SUM(CASE WHEN bd.booking_status = 'CANCELED' THEN 1 ELSE 0 END) AS CANCELED,\r" + + " SUM(CASE WHEN bd.booking_status = 'PAYMENT_FAILURE' THEN 1 ELSE 0 END) AS PAYMENT_FAILURE,\r" + + " SUM(CASE WHEN bd.booking_status = 'GCC_BLOCKED' THEN 1 ELSE 0 END) AS GCC_BLOCKED\r" + "FROM booking_details bd " + "JOIN hall_details hd ON bd.hall_details_hall_id = hd.hall_id where hd.hall_id=:hall_id", nativeQuery = true) List> getcartakecount(int hall_id); - @Query(value = "SELECT \r\n" - + " bd.*, \r\n" - + " CASE \r\n" - + " WHEN bd.start_date < CURDATE() THEN 'Past'\r\n" - + " WHEN bd.start_date = CURDATE() THEN 'Current'\r\n" - + " WHEN bd.booking_status = 'WAITING_FOR_NOC' THEN 'waitingfornoc'\r\n" - + " WHEN bd.booking_status = 'WAITING_FOR_NOC_APPROVAL' THEN 'waitingfornocapproval'\r\n" - + " WHEN bd.schedule_count = 0 AND bd.start_date > CURDATE() THEN 'Reschedule'\r\n" + @Query(value = "SELECT \r" + + " bd.*, \r" + + " CASE \r" + + " WHEN bd.start_date < CURDATE() THEN 'Past'\r" + + " WHEN bd.start_date = CURDATE() THEN 'Current'\r" + + " WHEN bd.booking_status = 'WAITING_FOR_NOC' THEN 'waitingfornoc'\r" + + " WHEN bd.booking_status = 'WAITING_FOR_NOC_APPROVAL' THEN 'waitingfornocapproval'\r" + + " WHEN bd.schedule_count = 0 AND bd.start_date > CURDATE() THEN 'Reschedule'\r" + " WHEN bd.reason IN ('State Govt Event','Central Govt Event','Commericial & Others') AND bd.booking_status='APPROVED' THEN 'noaction'" - + " ELSE 'Future' \r\n" - + " END AS event_category,\r\n" - + " users.*, \r\n" - + " hd.*, \r\n" - + " cd.*, \r\n" - + " pd.* \r\n" - + "FROM booking_details bd \r\n" - + "INNER JOIN users users ON bd.users_user_id = users.user_id \r\n" - + "INNER JOIN hall_details hd ON hd.hall_id = bd.hall_details_hall_id \r\n" - + "LEFT JOIN counter_details cd ON cd.counter_id = bd.counterdetails_counter_id\r\n" - + "LEFT JOIN payments pd ON bd.booking_id = pd.booking_details_booking_id \r\n" - + "WHERE bd.users_user_id = :userId and booking_status IN ('GCC_BLOCKED', 'APPROVED','CANCELED','REJECTED','COMPLETED','WAITING_FOR_NOC','WAITING_FOR_NOC_APPROVAL') \r\n" - + "ORDER BY bd.booking_id DESC\r\n", nativeQuery = true) + + " ELSE 'Future' \r" + + " END AS event_category,\r" + + " users.*, \r" + + " hd.*, \r" + + " cd.*, \r" + + " pd.* \r" + + "FROM booking_details bd \r" + + "INNER JOIN users users ON bd.users_user_id = users.user_id \r" + + "INNER JOIN hall_details hd ON hd.hall_id = bd.hall_details_hall_id \r" + + "LEFT JOIN counter_details cd ON cd.counter_id = bd.counterdetails_counter_id\r" + + "LEFT JOIN payments pd ON bd.booking_id = pd.booking_details_booking_id \r" + + "WHERE bd.users_user_id = :userId and booking_status IN ('GCC_BLOCKED', 'APPROVED','CANCELED','REJECTED','COMPLETED','WAITING_FOR_NOC','WAITING_FOR_NOC_APPROVAL') \r" + + "ORDER BY bd.booking_id DESC\r", nativeQuery = true) List> getAllBookingEventsByUserId(Integer userId); //counter @@ -775,23 +775,23 @@ public interface BookingDetailsRepository extends JpaRepository> getBookingDetailsByHallId(@Param("hallId") int hallId); @@ -921,23 +921,23 @@ public interface BookingDetailsRepository extends JpaRepository> getHallDetailsForOfficer(@Param("hallId") Integer hallIid); @@ -1507,4 +1507,53 @@ public interface BookingDetailsRepository extends JpaRepository 'PENDING' GROUP BY bd.counter_id, bd.booking_id ", nativeQuery = true) List getCounterWiseBookingDetails(String fromDate, String toDate); + + @Query(value = " SELECT hd.zone, " + + " COUNT(DISTINCT hd.hall_id) AS hall_count, " + + " COUNT(bd.booking_id) AS total_count, " + + " SUM(CASE " + + " WHEN bd.booking_type = 'ONLINE' AND bd.counter_id IS NULL THEN 1 " + + " ELSE 0 " + + " END) AS online_count, " + + " SUM(CASE " + + " WHEN bd.booking_type = 'ONLINE' AND bd.counter_id IS NOT NULL THEN 1 " + + " ELSE 0 " + + " END) AS counter_count " + + "FROM hall_details hd " + + "LEFT JOIN booking_details bd " + + " ON hd.hall_id = bd.hall_details_hall_id " + + " AND DATE(bd.booking_date) BETWEEN :fromDate AND :toDate " + + " AND bd.booking_status NOT IN ('PENDING','GCC_UNBLOCKED','REFUNDED','GCC_BLOCKED') " + + " AND bd.booking_type IS NOT NULL " + + "GROUP BY hd.zone " + + "ORDER BY hd.zone", nativeQuery = true) + List getZoneWiseBookingList(String fromDate, String toDate); + + + @Query(value = " select hd.hall_id, hd.hall_name, " + + "COUNT(bd.booking_id) AS total_count, " + + " SUM(CASE " + + " WHEN bd.booking_type = 'ONLINE' AND bd.counter_id IS NULL THEN 1 " + + " ELSE 0 " + + " END) AS online_count, " + + " SUM(CASE " + + " WHEN bd.booking_type = 'ONLINE' AND bd.counter_id IS NOT NULL THEN 1 " + + " ELSE 0 " + + " END) AS counter_count, hd.zone from hall_details hd " + + "left join booking_details bd on hd.hall_id = bd.hall_details_hall_id " + + "where DATE(bd.booking_date) BETWEEN :fromDate AND :toDate and " + + "bd.booking_status not in ('PENDING','GCC_UNBLOCKED','REFUNDED','GCC_BLOCKED') and bd.booking_type is not null " + + "group by hd.hall_name, hd.hall_id ", nativeQuery = true) + List getHallWiseBookingList(String fromDate, String toDate); + + @Query(value = " SELECT " + + " bd.counter_id, bd.hall_details_hall_id, " + + " COUNT(bd.booking_id) AS booking_count " + + "FROM booking_details bd " + + "WHERE DATE(bd.booking_date) BETWEEN :fromDate AND :toDate " + + " AND bd.booking_status NOT IN ('PENDING','GCC_UNBLOCKED','REFUNDED','GCC_BLOCKED') " + + " AND bd.booking_type IS NOT NULL " + + " AND bd.counter_id IS NOT NULL " + + "GROUP BY bd.counter_id, bd.hall_details_hall_id " , nativeQuery = true) + List getCounterWiseBookingList( String fromDate, String toDate); } diff --git a/src/main/java/com/gcc/communityHall/service/BookingService.java b/src/main/java/com/gcc/communityHall/service/BookingService.java index 0ff5a630..2986a821 100644 --- a/src/main/java/com/gcc/communityHall/service/BookingService.java +++ b/src/main/java/com/gcc/communityHall/service/BookingService.java @@ -212,4 +212,10 @@ public interface BookingService { List getBookingDetailsForAllHalls(String fromDate, String toDate, String CounterId, Integer hallid); List getCounterWiseBookingDetails(String fromDate, String toDate); + + List getZoneWiseBookingList(String fromDate, String toDate); + + List getAllHallWiseBookingList(String fromDate, String toDate); + + List getAllCounterWiseBookingList(String fromDate, String toDate); } diff --git a/src/main/java/com/gcc/communityHall/service/HallDetailService.java b/src/main/java/com/gcc/communityHall/service/HallDetailService.java index 08b571fa..e293d15e 100644 --- a/src/main/java/com/gcc/communityHall/service/HallDetailService.java +++ b/src/main/java/com/gcc/communityHall/service/HallDetailService.java @@ -30,7 +30,7 @@ public interface HallDetailService { String longitude, String hallInchargeName, long hallInchargeNo, String updatedId, - MultipartFile hallImages[] ); + MultipartFile hallImages[], float halfDepositAmt ); List getHallImages(int hallId); String updateHallDetail(HallDetails hallDetails, List images); diff --git a/src/main/java/com/gcc/communityHall/service/Impl/BookingServiceImpl.java b/src/main/java/com/gcc/communityHall/service/Impl/BookingServiceImpl.java index fd10fb6b..c5c785f8 100644 --- a/src/main/java/com/gcc/communityHall/service/Impl/BookingServiceImpl.java +++ b/src/main/java/com/gcc/communityHall/service/Impl/BookingServiceImpl.java @@ -662,6 +662,7 @@ public class BookingServiceImpl implements BookingService { String endDate = formData.get("endDate").toString(); String relation = formData.get("relation").toString(); double days = Double.parseDouble(formData.get("days").toString()); + int daysrange = Integer.parseInt(formData.get("daysrange").toString()); Optional discountOpt = discountRangeService.getDiscountByUserType(user.getUsertype()); DiscountRange discountrange = discountOpt.get(); @@ -674,9 +675,19 @@ public class BookingServiceImpl implements BookingService { String usertype = user.getUsertype().toString(); String reason = reasonMaster.getReason(); - //double depositeamount = hallDetails.getDepositAmount() * daysrange; - double depositeamount = hallDetails.getDepositAmount() * Math.ceil(days); + String startingSlot_txt = formData.get("startingSlot").toString(); + String endingSlot_txt = formData.get("endingSlot").toString(); + //double depositeamount = hallDetails.getDepositAmount() * daysrange; + double depositeamount = hallDetails.getDepositAmount() ; + System.out.println("depositeamount...."+depositeamount); + double halfDepositAmount = hallDetails.getHalfDepositAmount(); + System.out.println("halfDepositAmount...."+halfDepositAmount); + System.err.println("days.."+days); + System.err.println("daysrange.."+daysrange); + double Totaldepositeamount = calculateDepositAmount(daysrange, startingSlot_txt, endingSlot_txt, depositeamount, halfDepositAmount); + System.out.println("Totaldepositeamount.."+Totaldepositeamount); + depositeamount = Totaldepositeamount; // Calculate discount based on user type if (usertype.equals("COUNCILLOR") || usertype.equals("PENSIONER") || usertype.equals("GCC_EMPLOYEE") || usertype.equals("PUBLIC")) { discountAmount = (hallAmount * discount) / 100; @@ -952,6 +963,41 @@ public class BookingServiceImpl implements BookingService { return hallAmount; } + public double calculateDepositAmount(double numDays, String startPeriod, String endPeriod, double depositAmount, double HalfDepositAmount) { + double damount = 0; + // FOR FULL DAY + // If there is only one day + System.err.println("in calculate numDays..."+numDays); + System.err.println("in calculate depositAmount..."+depositAmount); + System.err.println("in calculate HalfDepositAmount..."+HalfDepositAmount); + if (numDays == 1) { + if ("1".equals(startPeriod) && "2".equals(endPeriod)) { + damount = depositAmount; + } else if ("1".equals(startPeriod) && "1".equals(endPeriod)) { + damount = HalfDepositAmount; + } else if ("2".equals(startPeriod) && "2".equals(endPeriod)) { + damount = HalfDepositAmount; + } else { + damount = numDays; + } + } else { + // For multiple days + if ("1".equals(startPeriod) && "2".equals(endPeriod)) { + damount = depositAmount * numDays; + } else if ("1".equals(startPeriod) && "1".equals(endPeriod)) { + damount = depositAmount * (numDays - 1) + HalfDepositAmount; + } else if ("2".equals(startPeriod) && "2".equals(endPeriod)) { + damount = depositAmount * (numDays - 1) + HalfDepositAmount; + } else if ("2".equals(startPeriod) && "1".equals(endPeriod)) { + damount = depositAmount * (numDays - 2) + depositAmount; + } else { + damount = numDays; + } + } + System.err.println("in calculate damount..."+damount); + return damount; + } + public String uploadNOCFile(MultipartFile file, int bookingId) { // Retrieve booking details, throw an exception if not found BookingDetails bookingDetails = bookingDetailsRepository.findById(bookingId) @@ -2478,4 +2524,19 @@ public class BookingServiceImpl implements BookingService { return bookingDetailsRepository.getCounterWiseBookingDetails(fromDate,toDate); } + @Override + public List getZoneWiseBookingList(String fromDate, String toDate){ + return bookingDetailsRepository.getZoneWiseBookingList(fromDate,toDate); + } + + @Override + public List getAllHallWiseBookingList(String fromDate, String toDate){ + return bookingDetailsRepository.getHallWiseBookingList(fromDate,toDate); + } + + @Override + public List getAllCounterWiseBookingList(String fromDate, String toDate){ + return bookingDetailsRepository.getCounterWiseBookingList( fromDate,toDate); + } + } diff --git a/src/main/java/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.java b/src/main/java/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.java index 0020b92b..07e87e5a 100644 --- a/src/main/java/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.java +++ b/src/main/java/com/gcc/communityHall/service/Impl/HallDetailServiceImpl.java @@ -70,7 +70,7 @@ public class HallDetailServiceImpl implements HallDetailService { String doorNo, String street, String area, String zone, String division, String landMark, String city, int pinCode, String latitude, String longitude, String hallInchargeName, - long hallInchargeNo,String updatedId, MultipartFile[] hallImages) { + long hallInchargeNo,String updatedId, MultipartFile[] hallImages, float halfDepositAmt) { HallDetails hall = new HallDetails(); hall.setHallName(hallName); hall.setDoorNo(doorNo); @@ -96,6 +96,7 @@ public class HallDetailServiceImpl implements HallDetailService { hall.setLankMark(landMark); hall.setUpdatedId(updatedId); hall.setCreateddate(LocalDate.now()); + hall.setHalfDepositAmount(halfDepositAmt); HallDetails hallDetails = hallDetailsRepository.save(hall); if(hallImages!=null && hallImages.length>0){ int i=0; @@ -196,6 +197,7 @@ public class HallDetailServiceImpl implements HallDetailService { existingHall.setLatitude(hallDetails.getLatitude()); existingHall.setLongitude(hallDetails.getLongitude()); existingHall.setDepositAmount(hallDetails.getDepositAmount()); + existingHall.setHalfDepositAmount(hallDetails.getHalfDepositAmount()); existingHall.setFullDayRent(hallDetails.getFullDayRent()); existingHall.setHalfDayRent(hallDetails.getHalfDayRent()); existingHall.setParkingCapacity(hallDetails.getParkingCapacity()); diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 48ce50f2..bece02c8 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -22,6 +22,7 @@ app.erpUrl=https://erp.chennaicorporation.gov.in/pgr/external/mobileservice? server.address=0.0.0.0 server.port=8062 + #fileHanding file.upload.directory=${user.dir}/communityHallDocuments file.hall.upload.directory=${user.dir}/communityHallDocuments/hallImages diff --git a/src/main/resources/templates/admin/halldetailslist.html b/src/main/resources/templates/admin/halldetailslist.html index 4559a201..561062e9 100644 --- a/src/main/resources/templates/admin/halldetailslist.html +++ b/src/main/resources/templates/admin/halldetailslist.html @@ -4,806 +4,864 @@ - -
- - - - - - - - - -
- - - -
- - - -
-
-
-

List of Halls

-
- -
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - + + + +
S.NoHallnameZoneDivisionStatusHall ImagesAction
0 - Active - Deactivated - - + +
+ + + + + + + + + +
+ + + +
+ + + +
+
+
+

List of Halls

+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + - - - -
S.NoHallnameZoneDivisionStatusHall ImagesAction
0 + Active + Deactivated + + View - - - - - - -
-
-
-
-
-
- -
- -
- -
- - - - - - - - - - - - - - - - - - - -
- - + + }); + } + + // Show the modal + $('#hallImageEditModal').modal('show'); + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + // Handle error here + } + }); + } + + + function updateHallImage(hallImageId) { + const fileInput = document.getElementById('newImage-' + hallImageId); + const file = fileInput.files[0]; + + if (!file) { + Swal.fire({ + icon: 'warning', + title: 'No Image Selected', + text: 'Please select an image to update.', + }); + return; + } + + const formData = new FormData(); + formData.append('hallImage', file); + + $.ajax({ + type: "PUT", + url: '/communityhall/admin/api/updateHallImage/' + hallImageId, + data: formData, + processData: false, + contentType: false, + success: function (response) { + //console.log(response); + // Optionally update the UI with the new image + $('#image-' + hallImageId + ' img').attr('src', response.newImageUrl); + + Swal.fire({ + icon: 'success', + title: 'Updated!', + text: 'Image updated successfully.', + timer: 2000, // Optional: Auto-close after 2 seconds + showConfirmButton: false + }) + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + Swal.fire({ + icon: 'error', + title: 'Update Failed', + text: 'There was an issue updating the image.', + timer: 2000, // Optional: Auto-close after 2 seconds + showConfirmButton: false + }); + } + }); + } + + + function saveHallImages() { + var formData = new FormData(); + var fileInputs = $('#hallImageEditForm').find('input[type="file"]'); + var hasValidFile = false; + + // Append hallId to formData + var hallId = $('#hallId').val(); + if (hallId) { + formData.append('hallId', hallId); + } else { + Swal.fire({ + icon: 'error', + title: 'Error', + text: 'Hall ID is missing.', + }); + return; + } + + // Iterate over all file inputs + fileInputs.each(function () { + if (this.files.length > 0) { + // Add non-empty files to FormData + for (var i = 0; i < this.files.length; i++) { + formData.append(this.name, this.files[i]); + } + hasValidFile = true; + } + }); + + if (!hasValidFile) { + Swal.fire({ + icon: 'warning', + title: 'No Images Selected', + text: 'Please upload at least one new image.', + }); + return; + } + + $.ajax({ + type: "POST", + url: '/communityhall/admin/api/savenewHallImages', + data: formData, + contentType: false, + processData: false, + success: function (response) { + // Handle success - reload or update the UI accordingly + $('#hallImageEditModal').modal('hide'); + Swal.fire({ + icon: 'success', + title: 'Success', + text: 'Hall images updated successfully!', + }).then(() => { + // Reload the page after the success message + window.location.reload(); + }); + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + Swal.fire({ + icon: 'error', + title: 'Error', + text: 'An error occurred while updating hall images.', + }); + } + }); + } + + + function deleteHallImage(hallImageId) { + Swal.fire({ + title: 'Are you sure?', + text: "You won't be able to revert this!", + icon: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + cancelButtonColor: '#d33', + confirmButtonText: 'Yes, delete it!', + cancelButtonText: 'Cancel' + }).then((result) => { + if (result.isConfirmed) { + $.ajax({ + type: "DELETE", + url: '/communityhall/admin/api/deleteHallImage/' + hallImageId, + success: function (response) { + //console.log(response); + // Remove the image from the UI + $('#image-' + hallImageId).remove(); + Swal.fire({ + icon: 'success', + title: 'Deleted!', + text: 'Your image has been deleted.', + timer: 2000, // Optional: Auto-close after 2 seconds + showConfirmButton: false + }) + }, + error: function (xhr, status, error) { + //console.error(xhr.responseText); + Swal.fire( + 'Error!', + 'There was an issue deleting the image.', + 'error' + ); + } + }); + } + }); + } + + + function callview(hallId, i) { + $.ajax({ + type: "GET", + url: '/communityhall/admin/api/getHallDetails/' + hallId, + success: function (response) { + if (i === 0) { + showHallInfo(response); + } else if (i === 1) { + getZoneNo2().then(function () { + edit(response); + }).catch(function (error) { + console.error("Failed to load zones.", error); + }); + } + }, + error: function (xhr, status, error) { + console.error(xhr.responseText); + // Handle error here + } + }); + } + + + function showHallInfo(list) { + $('#infoForm').modal({ + backdrop: 'static', + keyboard: false + }); + + document.getElementById("id").value = list.hallId; + document.getElementById("hallName").value = list.hallName; + document.getElementById("zones").value = list.zone; + document.getElementById("divisions").value = list.division; + document.getElementById("doorNo").value = list.doorNo; + document.getElementById("pincode").value = list.pinCode; + document.getElementById("hallInchargeMobno").value = list.hallInchargeMobno; + document.getElementById("InchargeName").value = list.hallInchargeName; + document.getElementById("landmark").value = list.landMark; + document.getElementById("latitude").value = list.latitude; + document.getElementById("longitude").value = list.longitude; + document.getElementById("depositAmount").value = list.depositAmount; + document.getElementById("halfDepositAmount").value = list.halfDepositAmount; + document.getElementById("fullDayAmount").value = list.fullDayRent; + document.getElementById("halfDayAmount").value = list.halfDayRent; + document.getElementById("parkingCapacity").value = list.parkingCapacity; + + $('#infoForm').modal('show'); + return false; + } + + function edit(list) { + $('#editForm').modal({ + backdrop: 'static', + keyboard: false + }); + // Populate form fields with data + $('#idd').val(list.hallId); + $('#hallNam').val(list.hallName); + $('#zone2 option').each(function () { + if ($(this).text().trim() === list.zone) { + $('#zone2').val($(this).val()); + } + }); + $('#street').val(list.street); + getDiv2({value: $('#zone2').val()}).then(function () { + $('#division2 option').each(function () { + if ($(this).text().trim() === list.division) { + $('#division2').val($(this).val()); + } + }); + }).catch(function (error) { + console.error("Failed to load divisions.", error); + }); + $('#doornoo').val(list.doorNo); + $('#pincod').val(list.pinCode); + $('#area').val(list.area); + $('#InchargeMobno').val(list.hallInchargeMobno); + $('#InchargeNamehall').val(list.hallInchargeName); + $('#landmar').val(list.landMark); + $('#latitu').val(list.latitude); + $('#longitu').val(list.longitude); + $('#depositAmo').val(list.depositAmount); + $('#halfDepositAmo').val(list.halfDepositAmount); + $('#fullDayAmo').val(list.fullDayRent); + $('#halfDayAmo').val(list.halfDayRent); + $('#parkingCapaci').val(list.parkingCapacity); + $('#seatingCapaci').val(list.seatingCapacity); + $('#ebNumber').val(list.ebNumber); + $('#ebCostPerUnit').val(list.ebCostPerUnit); + $('#city').val(list.city); + $('#updatedgstpercentage').val(list.gst); + $('#hallStatus').val(list.active ? '1' : '0'); + // Display existing images + //document.getElementById("photo1image").src = "data:image/jpeg;base64," + list.hallImagesList.photo1; + + $('#editForm').modal('show'); + + } + + + function editsubmit() { + var hallId = document.getElementById("idd").value; + var hallName = document.getElementById("hallNam").value; + if (hallName.trim() === '' || hallName === undefined) { + return false; + } + var zoneLabel = $('#zone2 option:selected').text(); + var divisionLabel = $('#division2 option:selected').text(); + var doorNo = document.getElementById("doornoo").value; + var street = document.getElementById("street").value; + var pinCode = document.getElementById("pincod").value; + var area = document.getElementById("area").value; + var hallInchargeMobno = document.getElementById("InchargeMobno").value; + var hallInchargeName = document.getElementById("InchargeNamehall").value; + var landMark = document.getElementById("landmar").value; + var latitude = document.getElementById("latitu").value; + var longitude = document.getElementById("longitu").value; + var depositamount = document.getElementById("depositAmo").value; + var halfDepositamount = document.getElementById("halfDepositAmo").value; + var fullday = document.getElementById("fullDayAmo").value; + var halfday = document.getElementById("halfDayAmo").value; + var parkingCapacity = document.getElementById("parkingCapaci").value; + var seatingCapacity = document.getElementById("seatingCapaci").value; + var ebNumber = document.getElementById("ebNumber").value; + var ebCostPerUnit = document.getElementById("ebCostPerUnit").value; + var city = document.getElementById("city").value; + var gst = document.getElementById("updatedgstpercentage").value; + var isActive = document.getElementById("hallStatus").value; + + var formData = new FormData(); + formData.append("hallId", hallId); + formData.append("hallName", hallName); + formData.append("zone", zoneLabel); + formData.append("division", divisionLabel); + formData.append("doorNo", doorNo); + formData.append("street", street); + formData.append("pinCode", pinCode); + formData.append("area", area); + formData.append("hallInchargeMobno", hallInchargeMobno); + formData.append("hallInchargeName", hallInchargeName); + formData.append("landMark", landMark); + formData.append("latitude", latitude); + formData.append("longitude", longitude); + formData.append("depositAmount", parseFloat(depositamount)); + formData.append("halfDepositAmount", parseFloat(halfDepositamount)); + formData.append("fullDayRent", parseFloat(fullday)); + formData.append("halfDayRent", parseFloat(halfday)); + formData.append("parkingCapacity", parkingCapacity); + formData.append("seatingCapacity", parseInt(seatingCapacity)); + formData.append("ebNumber", ebNumber); + formData.append("ebCostPerUnit", ebCostPerUnit); + formData.append("city", city); + formData.append("gst", gst); + formData.append("isActive", isActive); + + $.ajax({ + + type: "POST", + url: '/communityhall/admin/api/updateHallDetails', + contentType: false, + processData: false, + data: formData, + dataType: 'text', + success: function (bodyMessage) { + + + if (bodyMessage.trim() == "Success") { + Swal.fire( + 'Success!', + 'Successfully updated.', + 'success' + ).then(() => { + location.reload(); + }); + } else { + Swal.fire( + 'Error!', + 'An error occurred while updating hall details.', + 'error' + ); + } + }, + error: function () { + Swal.fire( + 'Error!', + 'An error occurred while updating hall details.', + 'error' + ); + } + }); + + return false; + } + + function addnewhall() { + $('#hallDetailsModal').modal('show'); + } + + // Function to close the modal when the user clicks outside of it + window.onclick = function (event) { + var modal = document.getElementById("hallDetailsModal"); + if (event.target == modal) { + modal.style.display = "none"; + } + }; + $(document).ready(function () { + + + // Add photo input + $('#addPhoto').click(function () { + var lastPhotoInput = $('#photoInputs').children().last(); + var newPhotoInput = lastPhotoInput.clone(); + var photoCount = $('#photoInputs').children().length + 1; + + // Clear the value of the cloned input field + newPhotoInput.find('.hall-image').val(''); + + newPhotoInput.find('.hall-image').attr('id', 'photo' + photoCount); + newPhotoInput.find('label').attr('for', 'photo' + photoCount).text('Photo ' + photoCount + ':'); + + // Check if delete button already exists before appending + if (!newPhotoInput.find('.delete-photo').length) { + newPhotoInput.append('
'); + } + $('#photoInputs').append(newPhotoInput); + }); + + // Delete photo input + $(document).on('click', '.delete-photo', function () { + $(this).closest('.col-md-3').remove(); + // Update photo labels after deletion + $('#photoInputs .col-md-3').each(function (index) { + $(this).find('label').text('Photo ' + (index + 1) + ':'); + $(this).find('.hall-image').attr('id', 'photo' + (index + 1)); + }); + }); + + }); + + function viewHallImages(hallId) { + $.ajax({ + type: "GET", + url: '/communityhall/admin/api/getImageById', + data: { + 'hallId': hallId + }, + success: function (res) { + if (res && res.length > 0) { + getHallImagesById(res); + } else { + console.error('No images found for hallId:', hallId); + } + }, + error: function (xhr, status, error) { + console.error('Error fetching images:', error); + } + }); + } + + function getHallImagesById(images) { + const modalSlidesContainer = document.querySelector('.carousel-inner'); + modalSlidesContainer.innerHTML = ''; // Clear existing slides + + images.forEach((image, index) => { + const slide = document.createElement('div'); + slide.classList.add('carousel-item'); + if (index === 0) { + slide.classList.add('active'); + } + const img = document.createElement('img'); + img.src = image.hallImage; + // img.alt = Slide ${image.hallImageId}; + img.alt = `Slide ${image.hallImageId}`; + img.style.maxHeight = '550px'; // Adjust image size + img.style.width = 'auto'; // Maintain aspect ratio + slide.appendChild(img); + modalSlidesContainer.appendChild(slide); + }); + + $('#exampleModal').modal('show'); // Show Bootstrap modal + } + + + //Getting Zone No + function getZoneNo() { + + $.ajax({ + type: "GET", + url: '/communityhall/user/api/getZoneNo', + dataType: 'json', + success: function (bodyMessage) { + var tempJson = bodyMessage['ZoneDetailsResult']; + //alert("tempJson---:"+tempJson); + for (var i = 0; i < tempJson.length; i++) { + var tempJsonValue = tempJson[i]['ZoneId']; + //var tempJsonValue = tempJson[i]['ZoneName'].replace('N', ''); + var tempJsonLabel = tempJson[i]['ZoneName'].replace('N', ''); + $('#zone1').append(""); + } + }, error: function (e, ts, et) { + // alert(ts) + } + + }); + } + + //Getting Div + function getDiv($this) { + + $('#division option:not(:first)').remove(); + var zoneId = $this.value; + var zone = $this.value; + //alert("zone---:"+zone); + $.ajax({ + type: "GET", + url: '/communityhall/user/api/getDiv', + data: {'zoneId': zoneId}, + dataType: 'json', + success: function (bodyMessage) { + var tempJson = bodyMessage['DivisionDetailsResult']; + for (var i = 0; i < tempJson.length; i++) { + var tempJsonValue = tempJson[i]['DivisionName'].replace('N', ''); + //var tempJsonValue = tempJson[i]['DivisionId']; + var tempJsonLabel = tempJson[i]['DivisionName'].replace('N', ''); + $('#division').append(""); + } + }, error: function (e, ts, et) { + // alert(ts) + } + + }); + } + + + function submitForm() { + var selectedZone = document.getElementById("zone1"); + var selectedZoneValue = selectedZone.value; + + // Check if a zone is selected + if (selectedZoneValue === "" || selectedZoneValue === "---Select Zone---") { + selectedZone.setCustomValidity("Please select a zone."); + selectedZone.reportValidity(); + return false; // Prevent form submission + } else { + selectedZone.setCustomValidity(""); // Clear any previous error message + } + + // Set the hidden zone field value + document.getElementById("zone").value = selectedZone.options[selectedZone.selectedIndex].innerHTML; + + // Form is valid, allow submission + return true; + } + + + $(document).ready( + function () { + var buttons = [{ + extend: 'pageLength', + className: 'btn btn-primary' + }, { + title: 'Data export', + extend: 'copyHtml5', + text: 'Copy', + className: 'btn btn-primary', + id: 'copyBtn' + }, { + extend: 'excelHtml5', + text: 'Excel', + className: 'btn btn-primary', + id: 'excelBtn' + }, { + extend: 'csvHtml5', + text: 'CSV', + className: 'btn btn-primary', + id: 'csvBtn' + }, { + extend: 'pdfHtml5', + text: 'PDF', + className: 'btn btn-primary', + id: 'pdfBtn' + }, + + ]; + $('#halldetailsList').DataTable( + { + dom: 'Bftip', + columnDefs: [{ + targets: 'no-sort', + orderable: false + }], + lengthMenu: [ + [50, 100, 200, 500, -1], + ['50 rows', '100 rows', '200 rows', + '500 rows', 'Show all']], + scrollY: '50vh', + fixedColumns: { + left: 1, + right: 1 + }, + buttons: [buttons], + responsive: true, + searching: true, // Enable search + select: false, + processing: false, + }); + + // Link the search input to DataTable + $('#searchInput').on('keyup', function () { + dataTable.search(this.value).draw(); + }); + + }); + + function fieldsreset() { + // Select the form element + var form = document.getElementById('hallform'); + + // Check if form exists + if (form) { + // Clear all input fields + $(form).find('input').val(''); + $(form).find('textarea').val(''); + $(form).find('select').prop('selectedIndex', 0); + + // Remove any dynamically added error messages and classes + $('.error-message').remove(); + $('.file-upload-field').removeClass('error'); + + // Remove any dynamically added photo inputs + $('#photoInputs .hall-image').not(':first').parent().parent().remove(); + } else { + console.error('Form not found'); + } + } + + $('#hallDetailsModal').on('hidden.bs.modal', function () { + fieldsreset(); // Call resetFormFields function + }); + + function getZoneNo2() { + return new Promise(function (resolve, reject) { + $.ajax({ + type: "GET", + url: '/communityhall/user/api/getZoneNo', + dataType: 'json', + success: function (bodyMessage) { + var tempJson = bodyMessage['ZoneDetailsResult']; + $('#zone2').empty().append(""); + for (var i = 0; i < tempJson.length; i++) { + var tempJsonValue = tempJson[i]['ZoneId']; + var tempJsonLabel = tempJson[i]['ZoneName'].replace('N', ''); + //console.log("Appending option - value:", tempJsonValue, "label:", tempJsonLabel); + $('#zone2').append(""); + } + resolve(); + }, + error: function (e, ts, et) { + console.error(ts); + reject(); + } + }); + }); + } + + function getDiv2($this) { + return new Promise(function (resolve, reject) { + $('#division2 option:not(:first)').remove(); + var zoneId = $this.value; + $.ajax({ + type: "GET", + url: '/communityhall/user/api/getDiv', + data: {'zoneId': zoneId}, + dataType: 'json', + success: function (bodyMessage) { + var tempJson = bodyMessage['DivisionDetailsResult']; + for (var i = 0; i < tempJson.length; i++) { + var tempJsonValue = tempJson[i]['DivisionId']; // Assuming DivisionId is used for value + var tempJsonLabel = tempJson[i]['DivisionName'].replace('N', ''); + //console.log("Appending division option - value:", tempJsonValue, "label:", tempJsonLabel); + $('#division2').append(""); + } + resolve(); + }, + error: function (e, ts, et) { + console.error(ts); + reject(); + } + }); + }); + } + \ No newline at end of file diff --git a/src/main/resources/templates/admin/reports.html b/src/main/resources/templates/admin/reports.html index 0344c91c..097740ba 100644 --- a/src/main/resources/templates/admin/reports.html +++ b/src/main/resources/templates/admin/reports.html @@ -127,6 +127,7 @@ + @@ -719,6 +720,39 @@ +
+ + + + + + + + + + + + + + + + + + + +
S.NoZoneHall CountOnline Booking CountCounter Booking CountTotal Count
0 + +
+
+ + + + +
Security Deposit: + Full Day Security Deposit:
Half Day Security Deposit: +
diff --git a/src/main/resources/templates/user/hallbookingform.html b/src/main/resources/templates/user/hallbookingform.html index 3d1d3f95..1e6cbd69 100644 --- a/src/main/resources/templates/user/hallbookingform.html +++ b/src/main/resources/templates/user/hallbookingform.html @@ -1157,6 +1157,8 @@ id="rentAmount">

Full Day Rent: Rs

+

Half Day Security Deposit: Rs

Half Day Rent: Rs

GST: %

@@ -2618,6 +2620,7 @@ $('#rentAmount').html('' + response.depositAmount + ''); $('#gst').html('' + response.gst + ''); $('#fullDayAmount').html('' + response.fullDayRent + ''); + $('#halfrentAmount').html('' + response.halfDepositAmount + ''); $('#halfDayAmount').html('' + response.halfDayRent + ''); $('#ebunit').html('' + response.ebCostPerUnit + ''); $('#statichallId').val(response.hallId); diff --git a/src/main/resources/templates/user/viewhallform.html b/src/main/resources/templates/user/viewhallform.html index 9830f45e..0dbba5d4 100644 --- a/src/main/resources/templates/user/viewhallform.html +++ b/src/main/resources/templates/user/viewhallform.html @@ -1175,10 +1175,12 @@

Amount Details:
-

Security Deposit: Rs Full Day Security Deposit: Rs

Full Day Rent: Rs

+

Half Day Security Deposit: Rs

Half Day Rent: Rs

GST: %

@@ -1327,6 +1329,7 @@ $('#rentAmount').html('' + response.depositAmount + ''); $('#gst').html('' + response.gst + ''); $('#fullDayAmount').html('' + response.fullDayRent + ''); + $('#halfrentAmount').html('' + response.halfDepositAmount + ''); $('#halfDayAmount').html('' + response.halfDayRent + ''); $('#ebunit').html('' + response.ebCostPerUnit + ''); $('#statichallId').val(response.hallId);