diff --git a/pom.xml b/pom.xml
index 392ca10..5124647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,110 +1,107 @@
- 4.0.0
-
- org.springframework.boot
- spring-boot-starter-parent
- 3.4.0
-
-
- com.example.RiponBuilding
- VisitorRegistration
- 0.0.1-SNAPSHOT
- VisitorRegistration
- Demo project for Spring Boot
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 17
-
-
-
- org.springframework.boot
- spring-boot-starter-thymeleaf
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 3.4.0
+
+
+ com.example.RiponBuilding
+ riponbuildingvisit
+ 1
+ riponbuildingvisit
+ Demo project for Spring Boot
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 17
+
+
+
+ org.springframework.boot
+ spring-boot-starter-thymeleaf
+
-
- org.springframework.boot
- spring-boot-devtools
- runtime
- true
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-jdbc
-
-
- mysql
- mysql-connector-java
- 8.0.33
-
-
-
- com.google.zxing
- javase
- 3.5.1
-
-
- com.google.zxing
- core
- 3.5.1
-
-
- org.springframework.boot
- spring-boot-starter
-
-
- commons-logging
- commons-logging
- 1.2
-
-
-
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa
-
-
- com.itextpdf
- itextpdf
- 5.5.13.2
-
+
+ org.springframework.boot
+ spring-boot-devtools
+ runtime
+ true
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-jdbc
+
+
+ mysql
+ mysql-connector-java
+ 8.0.33
+
+
+
+ com.google.zxing
+ javase
+ 3.5.1
+
+
+ com.google.zxing
+ core
+ 3.5.1
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+ commons-logging
+ commons-logging
+ 1.2
+
-
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+ com.itextpdf
+ itextpdf
+ 5.5.13.2
+
-
+
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
-
-
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/AppConfig.java b/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/AppConfig.java
new file mode 100644
index 0000000..2962e98
--- /dev/null
+++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/AppConfig.java
@@ -0,0 +1,47 @@
+package com.example.RiponBuilding.VisitorRegistration.configuration;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "app")
+public class AppConfig {
+
+ private String title;
+ private String baseUrl;
+ private String getOtpUrl;
+ private String erpUrl;
+
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getBaseUrl() {
+ return baseUrl;
+ }
+
+ public void setBaseUrl(String baseUrl) {
+ this.baseUrl = baseUrl;
+ }
+
+ public String getGetOtpUrl() {
+ return getOtpUrl;
+ }
+
+ public void setGetOtpUrl(String getOtpUrl) {
+ this.getOtpUrl = getOtpUrl;
+ }
+
+ public String getErpUrl() {
+ return erpUrl;
+ }
+
+ public void setErpUrl(String erpUrl) {
+ this.erpUrl = erpUrl;
+ }
+
+}
\ No newline at end of file
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 6443052..4f83115 100644
--- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/DataSourceConfig.java
+++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/configuration/DataSourceConfig.java
@@ -1,75 +1,76 @@
-package com.example.RiponBuilding.VisitorRegistration.configuration;
-
-import java.util.Properties;
-
-import javax.sql.DataSource;
-
-import org.hibernate.jpa.HibernatePersistenceProvider;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.orm.jpa.JpaTransactionManager;
-import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
-
-@Configuration
-@EnableTransactionManagement
-public class DataSourceConfig {
-
- private static String host = "localhost:3306";
- private static String dbpassword = "gccroot";
-
- @Configuration
- @EnableTransactionManagement
- @EnableJpaRepositories(
- entityManagerFactoryRef = "appEntityManagerFactory",
- transactionManagerRef = "appTransactionManager",
- basePackages = {"in.gov.chennaicorporation"})
-
- public static class MysqlAppDataSourceConfig {
- @Primary
- @Bean(name = "mysqlAppDataSource")
- public DataSource mysqlAppDataSource() {
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
- //dataSource.setUrl("jdbc:mysql://"+host+"/coworkingspace");
- dataSource.setUrl("jdbc:mysql://"+host+"/gcc_ripon_building");
- dataSource.setUsername("root");
- dataSource.setPassword(dbpassword);
- return dataSource;
- }
-
- @Primary
- @Bean(name="appEntityManagerFactory")
- public LocalContainerEntityManagerFactoryBean entityManagerFactory(
- @Qualifier("mysqlAppDataSource") DataSource dataSource) {
- LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
- entityManagerFactoryBean.setDataSource(dataSource);
- entityManagerFactoryBean.setPackagesToScan("com.gcc.coworkspace");
- entityManagerFactoryBean.setPersistenceProviderClass(HibernatePersistenceProvider.class);
- Properties properties = new Properties();
- properties.setProperty("hibernate.hbm2ddl.auto", "update");
- entityManagerFactoryBean.setJpaProperties(properties);
-
- return entityManagerFactoryBean;
- }
-
- @Primary
- @Bean(name = "appTransactionManager")
- public PlatformTransactionManager transactionManager(@Qualifier("appEntityManagerFactory") jakarta.persistence.EntityManagerFactory entityManagerFactory) {
- return new JpaTransactionManager(entityManagerFactory);
- }
- }
-
- @Bean
- public RestTemplate restTemplate() {
- return new RestTemplate();
- }
-
-
-}
+//package com.example.RiponBuilding.VisitorRegistration.configuration;
+//
+//import java.util.Properties;
+//
+//import javax.sql.DataSource;
+//
+//import org.hibernate.jpa.HibernatePersistenceProvider;
+//import org.springframework.beans.factory.annotation.Qualifier;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//import org.springframework.context.annotation.Primary;
+//import org.springframework.jdbc.datasource.DriverManagerDataSource;
+//import org.springframework.orm.jpa.JpaTransactionManager;
+//import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
+//import org.springframework.transaction.PlatformTransactionManager;
+//import org.springframework.transaction.annotation.EnableTransactionManagement;
+//import org.springframework.web.client.RestTemplate;
+//import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+//
+//@Configuration
+//@EnableTransactionManagement
+//public class DataSourceConfig {
+//
+// private static String host = "localhost:3306";
+// private static String dbpassword = "root";
+//// private static String dbpassword = "gccroot";
+//
+// @Configuration
+// @EnableTransactionManagement
+// @EnableJpaRepositories(
+// entityManagerFactoryRef = "appEntityManagerFactory",
+// transactionManagerRef = "appTransactionManager",
+// basePackages = {"com.example.RiponBuilding"})
+//
+// public static class MysqlAppDataSourceConfig {
+// @Primary
+// @Bean(name = "mysqlAppDataSource")
+// public DataSource mysqlAppDataSource() {
+// DriverManagerDataSource dataSource = new DriverManagerDataSource();
+// dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
+// //dataSource.setUrl("jdbc:mysql://"+host+"/coworkingspace");
+// dataSource.setUrl("jdbc:mysql://"+host+"/gcc_ripon_building");
+// dataSource.setUsername("root");
+// dataSource.setPassword(dbpassword);
+// return dataSource;
+// }
+//
+// @Primary
+// @Bean(name="appEntityManagerFactory")
+// public LocalContainerEntityManagerFactoryBean entityManagerFactory(
+// @Qualifier("mysqlAppDataSource") DataSource dataSource) {
+// LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
+// entityManagerFactoryBean.setDataSource(dataSource);
+// entityManagerFactoryBean.setPackagesToScan("com.gcc.coworkspace");
+// entityManagerFactoryBean.setPersistenceProviderClass(HibernatePersistenceProvider.class);
+// Properties properties = new Properties();
+// properties.setProperty("hibernate.hbm2ddl.auto", "update");
+// entityManagerFactoryBean.setJpaProperties(properties);
+//
+// return entityManagerFactoryBean;
+// }
+//
+// @Primary
+// @Bean(name = "appTransactionManager")
+// public PlatformTransactionManager transactionManager(@Qualifier("appEntityManagerFactory") jakarta.persistence.EntityManagerFactory entityManagerFactory) {
+// return new JpaTransactionManager(entityManagerFactory);
+// }
+// }
+//
+// @Bean
+// public RestTemplate restTemplate() {
+// return new RestTemplate();
+// }
+//
+//
+//}
diff --git a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/LoginController.java b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/LoginController.java
index bf28bbd..2dc088b 100644
--- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/LoginController.java
+++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/LoginController.java
@@ -9,18 +9,18 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
-
import com.example.RiponBuilding.VisitorRegistration.service.LoginService;
+
import jakarta.servlet.http.HttpSession;
@Controller
@RequestMapping("/heritagewalk/registration")
public class LoginController {
-
- @Autowired
- private LoginService loginService;
+
+ @Autowired
+ private LoginService loginService;
@@ -30,8 +30,10 @@ public class LoginController {
try {
String userName = loginService.validateLogin(usernametxt, passwordtxt);
- System.out.println("Received username: " + usernametxt + " and password: " + passwordtxt);
-System.out.println("username .....:" + userName);
+
+ System.out.println("Received username: " + usernametxt + " and password: " + passwordtxt);
+
+ System.out.println("username .....:" + userName);
if (userName != null) {
// Set user info in the session
session.setAttribute("user_name",userName );
diff --git a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MobilePdfController.java b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MobilePdfController.java
index ff98a7b..55b7326 100644
--- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MobilePdfController.java
+++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/MobilePdfController.java
@@ -2,6 +2,7 @@ package com.example.RiponBuilding.VisitorRegistration.controller;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.text.ParseException;
import java.util.Date;
import java.util.Map;
@@ -41,12 +42,29 @@ public class MobilePdfController {
long aadhaarID = getbyId.get("aadhar_no") == null? 0:(long) getbyId.get("aadhar_no") ;
AadhaarID = Long.toString(aadhaarID);
// System.out.println("check 12");
-
- String VisitingDate = (String) getbyId.get("visting_day_time");
-
+//
+// LocalDateTime vDate = (LocalDateTime) getbyId.get("visting_day_time");
+// Date visitdate = Date.from(vDate.atZone(ZoneId.systemDefault()).toInstant());
+// SimpleDateFormat vdf = new SimpleDateFormat("dd-MM-yyyy");
+// String VisitingDate = vdf.format(visitdate);
+//
+
+
+ String vDateStr = (String) getbyId.get("visting_day_time");
+
+ String VisitingDate = null;
+ if (vDateStr != null && !vDateStr.isEmpty()) {
+ // Parse and format date
+ SimpleDateFormat fromFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat toFormat = new SimpleDateFormat("dd-MM-yyyy");
+ Date visitdate = fromFormat.parse(vDateStr);
+ VisitingDate = toFormat.format(visitdate);
+ }
+
+
LocalDateTime registeredDate = (LocalDateTime) getbyId.get("cdate");
Date regdate = Date.from(registeredDate.atZone(ZoneId.systemDefault()).toInstant());
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy");
String RegisteredDate = sdf.format(regdate);
@@ -169,6 +187,8 @@ public class MobilePdfController {
} catch (DocumentException e) {
e.printStackTrace();
return ResponseEntity.internalServerError().build();
+ } catch (ParseException e) {
+ throw new RuntimeException(e);
}
}
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 31d81f3..6f4b542 100644
--- a/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/RegistrationController.java
+++ b/src/main/java/com/example/RiponBuilding/VisitorRegistration/controller/RegistrationController.java
@@ -28,526 +28,521 @@ import com.example.RiponBuilding.VisitorRegistration.service.RegistrationService
@RestController
@RequestMapping("/heritagewalk/registration/api")
public class RegistrationController {
-
- @Autowired
- RegistrationService registrationService;
-
- @Value("${visitor.limit}")
- private int visitorLimit;
-
-
- @PostMapping("/saveIndividualRegistration")
- public Map saveIndividualRegistration(
- @RequestParam(required = false) String name,
- @RequestParam(required = false) String address,
- @RequestParam(required = false) String mobile,
- @RequestParam(required = false) String visitorType,
- @RequestParam BigInteger aadhar,
- @RequestParam int age,
- @RequestParam String visitDayTime,
- @RequestParam String language,
- @RequestParam(defaultValue = "true") boolean signLanguage) {
-
- Map response = new HashMap<>();
-
- System.out.println("Received Data: " + name + ", " + address + ", " + mobile + ", " + visitorType + ", " + aadhar + ", " + age);
- try {
- boolean entry=registrationService.IndividualCheckAvailability(visitDayTime);
- if(entry)
- {
- // Assuming registrationService is already configured to handle these parameters
- Map savedData = registrationService.saveIndividualRegistration(
- name, address, mobile, visitorType, aadhar, age, visitDayTime, language, signLanguage);
- if (savedData.size() > 0) {
- // return "Successfully Saved";
- response.put("status", "success");
- response.put("Message", "Registered Successfully!");
- response.put("Data", savedData);
- return response;
- }
- else {
- response.put("status", "fail");
- response.put("Message", "Failed to save");
- return response;
- }
- }
- else {
- response.put("status", "filled");
- response.put("Message", " The bookings are full on this date, so please try for another day.");
- return response;
- }
-
-
- } catch (Exception e) {
- e.printStackTrace();
- response.put("Message", "Failed");
- return response;
- }
-
- }
-
- @PostMapping("/saveFamilyRegistration")
- public Map saveFamilyRegistration(@RequestParam String name,
- @RequestParam String address,
- @RequestParam String mobile,
- @RequestParam String visitorType,
- @RequestParam("aadhar") BigInteger aadhar,
- @RequestParam int age,
- @RequestParam String visitDayTime,
- @RequestParam String language,
- @RequestParam boolean signLanguage,
- @RequestParam int familyMembers,
- @RequestParam int childrenBelow5,
- @RequestParam int children6to17,
- @RequestParam int adults) {
-
- Map response = new HashMap<>();
-
- try {
- Map availabilityStatus=registrationService.FamilycheckAvailability(visitDayTime, familyMembers);
-
- String status = (String) availabilityStatus.get("status");
-
- if ("filled".equals(status)) {
- // If slots are filled
- response.put("status", "filled");
- response.put("Message", availabilityStatus.get("Message"));
- return response;
- } else if ("partial".equals(status)) {
- // If there is partial availability
- response.put("status", "partial");
- response.put("Message", availabilityStatus.get("Message"));
- response.put("AvailableSlots", availabilityStatus.get("Data"));
- return response;
- } else if ("success".equals(status)) {
- // If there is enough availability, proceed to save the family registration
- Map savedData = registrationService.saveFamilyRegistration(
- name, address, mobile, visitorType, aadhar, age, visitDayTime, language, signLanguage,
- familyMembers, childrenBelow5, children6to17, adults);
-
- if (savedData.size() > 0) {
- response.put("status", "success");
- response.put("Message", "Registered Successfully!");
- response.put("Data", savedData);
- return response;
- } else {
- response.put("status", "fail");
- response.put("Message", "Failed to save the data");
- return response;
- }
- } else {
- // Handle unexpected case
- response.put("status", "unexpected");
- response.put("Message", "Unexpected error occurred");
- return response;
- }
- }
-
- catch (Exception e) {
- e.printStackTrace();
- response.put("Message", "Failed");
- return response;
- }
-
- }
-
- @PostMapping("/saveSchoolRegistration")
- public ResponseEntity> saveSchoolRegistration(
- @RequestParam String name,
- @RequestParam String address,
- @RequestParam String mobile,
- @RequestParam String visitorType,
- @RequestParam String schoolname,
- @RequestParam String grade,
- @RequestParam(required = false, defaultValue = "0") int noofstudents,
- @RequestParam(name = "approxage", required = false) Double approxage,
- @RequestParam String language,
- @RequestParam boolean signLanguage,
- @RequestParam String visitDayTime) {
-
- Map response = new HashMap<>();
-
- if (approxage == null || approxage <= 0) {
- return ResponseEntity.badRequest().body("Approximate Age must be a positive number.");
- }
- if (noofstudents <= 0) {
- return ResponseEntity.badRequest().body(response);
- }
- try {
- // Check availability
- Map availabilityStatus = registrationService.SchoolcheckAvailability(visitDayTime, noofstudents);
- String status = (String) availabilityStatus.get("status");
-
- if ("filled".equals(status)) {
- response.put("status", "filled");
- response.put("Message", availabilityStatus.get("Message"));
- return ResponseEntity.ok(response);
- } else if ("partial".equals(status)) {
- response.put("status", "partial");
- response.put("Message", availabilityStatus.get("Message"));
- response.put("AvailableSlots", availabilityStatus.get("Data"));
- return ResponseEntity.ok(response);
- } else if ("success".equals(status)) {
- // Save registration
- Map savedData = registrationService.saveSchoolRegistration(
- name, address, mobile, visitorType, schoolname, grade, noofstudents, approxage, language, signLanguage, visitDayTime);
-
- if (!savedData.isEmpty()) {
- response.put("status", "success");
- response.put("Message", "Registered Successfully!");
- response.put("Data", savedData);
- return ResponseEntity.ok(response);
- } else {
- response.put("status", "fail");
- response.put("Message", "Failed to save the data");
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
- }
- } else {
- response.put("status", "unexpected");
- response.put("Message", "Unexpected error occurred");
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
- }
- } catch (Exception e) {
- e.printStackTrace();
- response.put("Message", "Failed");
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
- }
- }
-
- @PostMapping("/saveCollegeRegistration")
- 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) {
-
- Map response = new HashMap<>();
-
-
- try {
-
- Map availabilityStatus=registrationService.CollegecheckAvailability(visitDayTime, noofStudents);
- String status = (String) availabilityStatus.get("status");
-
-
- if ("filled".equals(status)) {
- // If slots are filled
- response.put("status", "filled");
- response.put("Message", availabilityStatus.get("Message"));
- return response;
- } else if ("partial".equals(status)) {
- // If there is partial availability
- response.put("status", "partial");
- response.put("Message", availabilityStatus.get("Message"));
- response.put("AvailableSlots", availabilityStatus.get("Data"));
- return response;
- } else if ("success".equals(status)) {
- // If there is enough availability, proceed to save the college registration
- Map savedData = registrationService.saveCollegeRegistration(name,address, mobile, visitorType, Collegename,
- department, years, noofStudents, Aproxage, language, signLanguage, visitDayTime);
-
- if (savedData.size() > 0) {
- // return "Successfully Saved";
- response.put("status", "success");
- response.put("Message", "Registered Successfully!");
- response.put("Data", savedData);
- return response;
- } else {
- // return "Failed to save the Data";
- response.put("status", "fail");
- response.put("Message", "Failed to save the data");
- return response;
- }
- }
- else {
- // Handle unexpected case
- response.put("status", "unexpected");
- response.put("Message", "Unexpected error occurred");
- return response;
- }
-
- }
-
- catch (Exception e) {
- e.printStackTrace();
- response.put("Message", "Failed");
- return response;
- }
-
- }
-
- /*
- * @GetMapping("/bookingdetails/{id}") public Map
- * getBookingById(@PathVariable String id) { System.out.println("Id:" + id);
- * return registrationService.getBookingById(id); }
- */
-
- @GetMapping("/bookingdetails")
- public ResponseEntity