From 0c6838c3b0c904ee6edd8c32c2eeef59852eba85 Mon Sep 17 00:00:00 2001 From: SriPaari Date: Mon, 29 Sep 2025 13:47:18 +0530 Subject: [PATCH] updated visitor registration changes --- .../configuration/DataSourceConfig.java | 2 +- .../controller/MainController.java | 6 +- .../controller/RegistrationController.java | 122 ++++++++++++------ .../service/RegistrationService.java | 16 +-- .../templates/fragments/user-head.html | 20 +-- .../templates/fragments/user-script.html | 32 ++--- .../templates/user/registrationpage.html | 14 +- 7 files changed, 128 insertions(+), 84 deletions(-) diff --git a/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/DataSourceConfig.java b/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/DataSourceConfig.java index 6a64f33..6443052 100644 --- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/DataSourceConfig.java +++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/DataSourceConfig.java @@ -22,7 +22,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; public class DataSourceConfig { private static String host = "localhost:3306"; - private static String dbpassword = "password"; + private static String dbpassword = "gccroot"; @Configuration @EnableTransactionManagement diff --git a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MainController.java b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MainController.java index 8f70770..5b91b61 100644 --- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MainController.java +++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MainController.java @@ -22,11 +22,7 @@ public class MainController { return "user/registrationpage"; } - @GetMapping(value= {"/veterinary"}) - public String viewveterinary() { - return "user/veterinary"; - } - + /* diff --git a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/RegistrationController.java b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/RegistrationController.java index fde4a5e..31d81f3 100644 --- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/RegistrationController.java +++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/RegistrationController.java @@ -215,7 +215,8 @@ public class RegistrationController { } @PostMapping("/saveCollegeRegistration") - public Map saveCollegeRegistration(@RequestParam String name, @RequestParam String address, @RequestParam String mobile, + public Map saveCollegeRegistration(@RequestParam String name, @RequestParam String address, + @RequestParam String mobile, @RequestParam String visitorType, @RequestParam String Collegename, @RequestParam String department, @RequestParam String years, @RequestParam int noofStudents, @RequestParam double Aproxage, @RequestParam String language, @RequestParam boolean signLanguage, @RequestParam String visitDayTime) { @@ -282,17 +283,36 @@ public class RegistrationController { */ @GetMapping("/bookingdetails") - public ResponseEntity> getBookingDetails( - @RequestParam("refId") String refId) { + public ResponseEntity> getBookingDetails( + @RequestParam(value = "refId", required = false) String refId) { + + Map response = new HashMap<>(); + + if (refId == null || refId.trim().isEmpty()) { + response.put("status", "Error"); + response.put("message", "Missing required parameter: refId"); + return ResponseEntity.badRequest().body(response); + } + + try { + Map bookingDetails = registrationService.getBookingByRefId(refId); + + if (bookingDetails == null || bookingDetails.isEmpty()) { + response.put("status", "Error"); + response.put("message", "Booking not found for refId: " + refId); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response); + } - Map bookingDetails = - registrationService.getBookingByRefId(refId); + return ResponseEntity.ok(bookingDetails); - if (bookingDetails.isEmpty()) { - return ResponseEntity.status(HttpStatus.NOT_FOUND).build(); + } catch (Exception e) { + e.printStackTrace(); + response.put("status", "Error"); + response.put("message", "Internal server error: " + e.getMessage()); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); } - return ResponseEntity.ok(bookingDetails); - } + } + @GetMapping("/getAllData") public ResponseEntity> getAllData( @@ -341,7 +361,14 @@ public class RegistrationController { System.out.println("Visitor Category: " + visitorCategory); Map response = new HashMap<>(); + try { + if (!"individual".equalsIgnoreCase(visitorCategory.trim())) { + response.put("Status", "Error"); + response.put("Message", "Only individual data is allowed."); + return ResponseEntity.ok(response); + } + List> data = registrationService.getIndividualData(fromDate, toDate, visitorCategory); System.out.println("Controller: Data from Service: " + data); @@ -351,7 +378,7 @@ public class RegistrationController { response.put("data", data); } else { response.put("Status", "Error"); - response.put("Message", "No Data Found"); + response.put("Message", "No Data Found for individual category"); } return ResponseEntity.ok(response); } catch (Exception e) { @@ -365,8 +392,6 @@ public class RegistrationController { - - @GetMapping("/getFamilyData") public ResponseEntity> getFamilyData( @RequestParam String fromDate, @@ -380,6 +405,12 @@ public class RegistrationController { Map response = new HashMap<>(); try { + if (!"family".equalsIgnoreCase(visitorCategory.trim())) { + response.put("Status", "Error"); + response.put("Message", "Only family data is allowed."); + return ResponseEntity.ok(response); + } + List> data = registrationService.getFamilyData(fromDate, toDate, visitorCategory); System.out.println("Controller: Data from Service: " + data); @@ -389,7 +420,7 @@ public class RegistrationController { response.put("data", data); } else { response.put("Status", "Error"); - response.put("Message", "No Data Found"); + response.put("Message", "No Data Found for family category"); } return ResponseEntity.ok(response); } catch (Exception e) { @@ -413,6 +444,12 @@ public class RegistrationController { Map response = new HashMap<>(); try { + if (!"school".equalsIgnoreCase(visitorCategory.trim())) { + response.put("Status", "Error"); + response.put("Message", "Only school data is allowed."); + return ResponseEntity.ok(response); + } + List> data = registrationService.getSchoolData(fromDate, toDate, visitorCategory); System.out.println("Controller: Data from Service: " + data); @@ -422,7 +459,7 @@ public class RegistrationController { response.put("data", data); } else { response.put("Status", "Error"); - response.put("Message", "No Data Found"); + response.put("Message", "No Data Found for school category"); } return ResponseEntity.ok(response); } catch (Exception e) { @@ -446,6 +483,12 @@ public class RegistrationController { Map response = new HashMap<>(); try { + if (!"college".equalsIgnoreCase(visitorCategory.trim())) { + response.put("Status", "Error"); + response.put("Message", "Only college data is allowed."); + return ResponseEntity.ok(response); + } + List> data = registrationService.getCollegeData(fromDate, toDate, visitorCategory); System.out.println("Controller: Data from Service: " + data); @@ -455,7 +498,7 @@ public class RegistrationController { response.put("data", data); } else { response.put("Status", "Error"); - response.put("Message", "No Data Found"); + response.put("Message", "No Data Found for college category"); } return ResponseEntity.ok(response); } catch (Exception e) { @@ -467,30 +510,35 @@ public class RegistrationController { } @GetMapping("/getlist") - public Map getlist( - @RequestParam Long mobileno){ + public Map getlist(@RequestParam(required = false) Long mobileno) { Map response = new HashMap<>(); - try { - - List> userList = registrationService.getListByMobileNo(mobileno); - - if(userList !=null && !userList.isEmpty()) { - response.put("Message", "Success"); - response.put("Data", userList); - } else { - - response.put("Status", "Error"); - response.put("Message", "No Data Found"); - } - - } catch (Exception e) { - e.printStackTrace(); - response.put("Status", "Error"); - response.put("Message", "Failed to retrieve data"); - } - return response; - + + // Check if parameter is missing + if (mobileno == null) { + response.put("Status", "Error"); + response.put("Message", "Missing required parameter: mobileno"); + return response; + } + + try { + List> userList = registrationService.getListByMobileNo(mobileno); + + if (userList != null && !userList.isEmpty()) { + response.put("Status", "Success"); + response.put("Data", userList); + } else { + response.put("Status", "Error"); + response.put("Message", "This Mobile Number is not registered"); + } + + } catch (Exception e) { + e.printStackTrace(); + response.put("Status", "Error"); + response.put("Message", "Failed to retrieve data"); + } + return response; } + @GetMapping("/getAllBookingCounts") public ResponseEntity> getAllBookingCounts() { diff --git a/src/main/java/com/example/RiponBuilding/VisitorRegistration/service/RegistrationService.java b/src/main/java/com/example/RiponBuilding/VisitorRegistration/service/RegistrationService.java index 127a2f1..4a244b6 100644 --- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/service/RegistrationService.java +++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/service/RegistrationService.java @@ -418,11 +418,11 @@ public class RegistrationService { "sign_lang , visting_day_time , DATE_FORMAT(cdate, '%d-%m-%Y') AS cdate " + "FROM gcc_ripon_building.registration_details " + "WHERE DATE(visting_day_time) BETWEEN STR_TO_DATE(?, '%Y-%m-%d') AND STR_TO_DATE(?, '%Y-%m-%d') " + - "AND visitor_category = ?"; + "AND visitor_category = 'individual' "; System.out.println("Service: Executing Query: " + sql); - List> result = jdbcTemplate.queryForList(sql, fromDate, toDate, visitorCategory); + List> result = jdbcTemplate.queryForList(sql, fromDate, toDate); System.out.println("Service: Query Result: " + result); @@ -439,8 +439,8 @@ public class RegistrationService { + "DATE_FORMAT(cdate, '%d-%m-%Y') AS cdate, aadhar_no, age, family_mem_count, below5_year_count, children_bw_6and17, adults_count " + "FROM gcc_ripon_building.registration_details " + "WHERE DATE(visting_day_time) BETWEEN STR_TO_DATE(?, '%Y-%m-%d') AND STR_TO_DATE(?, '%Y-%m-%d') " - + "AND visitor_category = ?"; - return jdbcTemplate.queryForList(sql, fromDate, toDate, visitorCategory); + + "AND visitor_category = 'family'"; + return jdbcTemplate.queryForList(sql, fromDate, toDate); } @@ -458,8 +458,8 @@ public class RegistrationService { String sql = "SELECT Id, reg_username, reg_address, mobile_no, visitor_category, guide_lang, sign_lang, visting_day_time, DATE_FORMAT(cdate, '%d-%m-%Y') AS cdate, institution_name, grade_year, no_of_students, students_age FROM gcc_ripon_building.registration_details \r\n" + "where\r\n" + "DATE(visting_day_time) BETWEEN STR_TO_DATE(?, '%Y-%m-%d') AND STR_TO_DATE(?, '%Y-%m-%d')\r\n" - + "And visitor_category = ?"; - return jdbcTemplate.queryForList(sql, fromDate, toDate, visitorCategory); + + "And visitor_category = 'school'"; + return jdbcTemplate.queryForList(sql, fromDate, toDate); } @Transactional @@ -467,8 +467,8 @@ public class RegistrationService { String sql = "SELECT Id, reg_username, reg_address, mobile_no, visitor_category, guide_lang, sign_lang, visting_day_time, DATE_FORMAT(cdate, '%d-%m-%Y') AS cdate, institution_name, department, grade_year, no_of_students, students_age FROM gcc_ripon_building.registration_details \r\n" + "where\r\n" + "DATE(visting_day_time) BETWEEN STR_TO_DATE(?, '%Y-%m-%d') AND STR_TO_DATE(?, '%Y-%m-%d')\r\n" - + "And visitor_category = ?"; - return jdbcTemplate.queryForList(sql, fromDate, toDate, visitorCategory); + + "And visitor_category = 'college'"; + return jdbcTemplate.queryForList(sql, fromDate, toDate); } public List> getListByMobileNo(Long mobileno) { diff --git a/src/main/resources/templates/fragments/user-head.html b/src/main/resources/templates/fragments/user-head.html index 5ef354a..23fbc3e 100644 --- a/src/main/resources/templates/fragments/user-head.html +++ b/src/main/resources/templates/fragments/user-head.html @@ -10,26 +10,26 @@ content="Admin , Responsive, Landing, Bootstrap, App, Template, Mobile, iOS, Android, apple, creative app"> - + - + - + - + - + - + - + - - - + + + diff --git a/src/main/resources/templates/fragments/user-script.html b/src/main/resources/templates/fragments/user-script.html index 56ffda4..d19ad7e 100644 --- a/src/main/resources/templates/fragments/user-script.html +++ b/src/main/resources/templates/fragments/user-script.html @@ -1,27 +1,27 @@ - - - - + + + + - + - - + + - + - - + + - + src="/heritagewalk/files/bower_components/i18next-browser-languagedetector/js/i18nextBrowserLanguageDetector.min.js"> + - - - - + + + + diff --git a/src/main/resources/templates/user/registrationpage.html b/src/main/resources/templates/user/registrationpage.html index 061d577..1a520b8 100644 --- a/src/main/resources/templates/user/registrationpage.html +++ b/src/main/resources/templates/user/registrationpage.html @@ -580,7 +580,7 @@ - Ripon Building + Ripon Building
Registration for Heritage Walk at Ripon Buildings
@@ -594,37 +594,37 @@
1 / 6
- +
2 / 6
- +
3 / 6
- +
4 / 6
- +
5 / 6
- +
6 / 6
- +