initial commit

pom.xml

@@ -62,13 +62,33 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<!--<plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-surefire-plugin</artifactId>
+	<version>2.19.1</version>
+	<configuration>
+	<testFailureIgnore>true</testFailureIgnore>
+	</configuration>
+	<excludes>
+	<exclude>none</exclude>
+	</excludes>
+	</plugin>-->
 
 	<build>
-		<plugins>
+		<!--<plugins>
 			<plugin>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+		</plugins>-->
+		<plugins>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<configuration>
+				<testFailureIgnore>true</testFailureIgnore>
+			</configuration>
+		</plugin>
 		</plugins>
 		<defaultGoal>package</defaultGoal>
 

src/main/java/com/okayjava/html/Entity/PetRegisterEntity.java

@@ -13,7 +13,9 @@ import javax.persistence.*;
 public class PetRegisterEntity {
     @Id
     private long Id;
-
+    public long getId() {
+        return Id;
+    }
     public String getPaymentid() {
         return paymentid;
     }
@@ -22,9 +24,6 @@ public class PetRegisterEntity {
         this.paymentid = paymentid;
     }
 
-    public long getId() {
-        return Id;
-    }
     @Lob
     private byte[] addressProofPhoto;
     @Lob
@@ -111,7 +110,6 @@ public class PetRegisterEntity {
     }
 
     @Lob
-    private byte[] applicantPhoto;
     private String name;
     private String petID;
     private String zone;
@@ -122,9 +120,9 @@ public class PetRegisterEntity {
     private String street;
     private String area;
     private String city;
-    private String phone;
     private String pincode;
     private String state;
+    private String phone;
     private String email;
     private String pancardnumber;
     private String aadhar;
@@ -138,6 +136,8 @@ public class PetRegisterEntity {
     private String gender;
     private  String VeterinaryConsultant;
     private  String TNVCNo;
+    private byte[] applicantPhoto;
+
 
     public String getDivision() {
         return division;
@@ -304,6 +304,7 @@ public class PetRegisterEntity {
     }
 
     private String Ageyears;
+    private String Months;
 
     public String getMonths() {
         return Months;
@@ -313,7 +314,6 @@ public class PetRegisterEntity {
         Months = months;
     }
 
-    private String Months;
 
     public String getARVdate() {
         return ARVdate;
@@ -398,8 +398,8 @@ public class PetRegisterEntity {
     }
     public PetRegisterEntity(long id, String petID, String zone, String division,
                              String title, String fname, String doornumber,
-                             String street, String area, String city, String phone, String pincode,
-                             String state, String email, String pancardnumber, String aadhar, String votercard,
+                             String street, String area, String city, String pincode,
+                             String state, String phone, String email, String pancardnumber, String aadhar, String votercard,
                              String previouslicense, String petname, String species, String identificationmark,
                              String breed, String petcolor, String gender, String veterinaryConsultant,
                              String TNVCNo, String ageyears, String months, String ARVdate, String Lastdate,
@@ -414,9 +414,9 @@ public class PetRegisterEntity {
         this.street = street;
         this.area = area;
         this.city = city;
-        this.phone = phone;
         this.pincode = pincode;
         this.state = state;
+        this.phone = phone;
         this.email = email;
         this.pancardnumber = pancardnumber;
         this.aadhar = aadhar;
@@ -428,10 +428,10 @@ public class PetRegisterEntity {
         this.breed = breed;
         this.petcolor = petcolor;
         this.gender = gender;
-        VeterinaryConsultant = veterinaryConsultant;
+        this.VeterinaryConsultant = veterinaryConsultant;
         this.TNVCNo = TNVCNo;
-        Ageyears = ageyears;
-        Months = months;
+        this.Ageyears = ageyears;
+        this.Months = months;
         this.ARVdate = ARVdate;
         this.Lastdate = Lastdate;
         this.sterilization = sterilization;

src/main/java/com/okayjava/html/controller/AcceptReject.java

@@ -48,8 +48,8 @@ public class AcceptReject {
     /**
      * add your secretId and secretValue you got from your RazorPay account.
      */
-    private static final String SECRET_ID = "rzp_live_dZkTTP32cjf3wj";
-    private static final String SECRET_KEY = "pPgFK4AwzQoBC7zoPKSPl1At";
+    private static final String SECRET_ID = "rzp_live_ySI5Ns54Y7qOcJ";
+    private static final String SECRET_KEY = "Nwf1TjhUtaskof8vePkRR8Sb";
     public AcceptReject() throws RazorpayException {
         this.client =  new RazorpayClient(SECRET_ID, SECRET_KEY);
     }

src/main/java/com/okayjava/html/controller/Acknowledge.java

@@ -49,7 +49,8 @@ public class Acknowledge {
         try {
             petRegisters.get(0).setPet_photo(Base64.getEncoder().encodeToString(petRegisters.get(0).getPetPhoto_bytes()));
             petRegisters.get(0).setVaccination_certificate_photo(Base64.getEncoder().encodeToString(petRegisters.get(0).getVaccinationCertificatePhoto_bytes()));
-
+            petRegisters.get(0).setApplicant_photo(Base64.getEncoder().encodeToString(petRegisters.get(0).getApplicant_photo_bytes()));
+            petRegisters.get(0).setAddress_proof_photo(Base64.getEncoder().encodeToString(petRegisters.get(0).getAddressProofPhoto_bytes()));
 
             System.out.println(petRegisters.get(0).getApplicant_photo_bytes().length > 5);
             if (petRegisters.get(0).getApplicant_photo_bytes().length > 5) {

src/main/java/com/okayjava/html/controller/IndexController.java

@@ -1,27 +1,25 @@
 package com.okayjava.html.controller;
-import java.time.format.DateTimeFormatter;
-import java.time.LocalDateTime;
 
 import com.okayjava.html.utils.imageCompress;
 import com.okayjava.html.Repository.PetRepository;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
+
+import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
-import org.springframework.util.StringUtils;
+
 import org.springframework.web.bind.annotation.*;
-import com.okayjava.html.Service.PetRegisterService;
 
 import com.okayjava.html.model.PetRegister;
-import com.okayjava.html.Entity.PetRegisterEntity;
+
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.time.Instant;
-import java.util.Base64;
+
 import java.util.List;
 
 @Controller
@@ -30,19 +28,35 @@ public class IndexController {
 	@Autowired
 	private JdbcTemplate jdbcTemplate;
 	private PetRepository petRepository;
+
+	@GetMapping("")
+	public String viewHomePage() {
+		return "HomePage";
+	}
+
+	@GetMapping({"/register"})
+	public String showRegistrationForm(Model model) {
+		model.addAttribute("user", new SecurityProperties.User());
+
+		return "/index.html";
+	}
+
 	@GetMapping("/index")
 	public String index() {
 
 		return "index";
 	}
 
+
+
+
 	@GetMapping("/GetRegisteredPetdetails")
 	public String getRegisteredPetdetails(ModelMap model){
 		List<PetRegister> petRegisters = jdbcTemplate.query("select * from petregister ", (rs, rowNum) -> {
 			PetRegister petRegister = new PetRegister(rs.getString("petID"), rs.getString("zone"),
-					rs.getString("division"), rs.getString("title"), rs.getString("fname"),
-					rs.getString("doornumber"), rs.getString("street"), rs.getString("area"), rs.getString("city"), rs.getString("phone"),
-					rs.getString("pincode"), rs.getString("state"), rs.getString("email"), rs.getString("pancardnumber"),
+					rs.getString("division"), rs.getString("title"), rs.getString("name"),
+					rs.getString("doornumber"), rs.getString("street"), rs.getString("area"), rs.getString("city"),
+					rs.getString("pincode"), rs.getString("state"), rs.getString("phone"),rs.getString("email"), rs.getString("pancardnumber"),
 					rs.getString("aadhar"), rs.getString("votercard"), rs.getString("previouslicense"), rs.getString("petname"),
 					rs.getString("species"), rs.getString("identificationmark"), rs.getString("breed"), rs.getString("petcolor"),
 					rs.getString("gender"), rs.getString("Veterinary_Consultant"), rs.getString("TNVCNo"),
@@ -100,30 +114,38 @@ public class IndexController {
 //		System.out.println(pet.getPincode());
 		System.out.println(pet.getPetID());
 
-		model.addAttribute("firstname", pet.getFname());
-		model.addAttribute("email", pet.getEmail());
-		model.addAttribute("aadhar", pet.getAadhar());
-		model.addAttribute("pan", pet.getPan());
-		model.addAttribute("adopted", pet.getAdopted());
-		model.addAttribute("AntiRabies_vaccination", pet.getAntiRabies_vaccination());
-		model.addAttribute("ageyears", pet.getAgeyears());
-		model.addAttribute("ARVdate", pet.getARVdate());
-		model.addAttribute("Lastdate", pet.getLastdate());
-		model.addAttribute("area", pet.getArea());
-		model.addAttribute("breed", pet.getBreed());
-		model.addAttribute("city", pet.getCity());
+        model.addAttribute("zone", pet.getZone());
 		model.addAttribute("division", pet.getDivision());
+		model.addAttribute("title", pet.getTitle());
+		model.addAttribute("fname", pet.getFname());
 		model.addAttribute("doornumber", pet.getDoornumber());
-		model.addAttribute("identificationmark", pet.getIdentificationmark());
-		model.addAttribute("petcolour", pet.getPetcolor());
+		model.addAttribute("street", pet.getStreet());
+		model.addAttribute("area", pet.getArea());
+		model.addAttribute("city", pet.getCity());
+		model.addAttribute("pincode", pet.getPincode());
+		model.addAttribute("state", pet.getState());
+		model.addAttribute("phone", pet.getPhone());
+		model.addAttribute("email", pet.getEmail());
+		model.addAttribute("pan", pet.getPan());
+		model.addAttribute("aadhar", pet.getAadhar());
+		model.addAttribute("votercard", pet.getVotercard());
 		model.addAttribute("previouslicense", pet.getPreviouslicense());
+		model.addAttribute("petname",pet.getPetname());
 		model.addAttribute("species", pet.getSpecies());
-		model.addAttribute("sterilization", pet.getSterilization());
+		model.addAttribute("identificationmark", pet.getIdentificationmark());
+		model.addAttribute("breed", pet.getBreed());
+		model.addAttribute("petcolor", pet.getPetcolor());
+		model.addAttribute("gender",pet.getGender());
 		model.addAttribute("veterinaryconsultant", pet.getVeterinaryConsultant());
 		model.addAttribute("TNVCNo", pet.getTNVCNo());
-		model.addAttribute("title", pet.getTitle());
-		model.addAttribute("street", pet.getStreet());
-		model.addAttribute("pincode", pet.getPincode());
+		model.addAttribute("ageyears", pet.getAgeyears());
+        model.addAttribute("months",pet.getMonths());
+		model.addAttribute("ARVdate", pet.getARVdate());
+		model.addAttribute("Lastdate", pet.getLastdate());
+		model.addAttribute("sterilization", pet.getSterilization());
+		model.addAttribute("adopted", pet.getAdopted());
+		model.addAttribute("AntiRabies_vaccination", pet.getAntiRabies_vaccination());
+
 		model.addAttribute("state", pet.getPetID());
 		long id = Instant.now().toEpochMilli();
 
@@ -135,8 +157,8 @@ public class IndexController {
 				"address_proof_photo, vaccination_certificate_photo, pet_photo, comments) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
 		jdbcTemplate.update(sql, id, "PetReg_" + String.valueOf(id), pet.getZone(),
 				pet.getDivision(), pet.getTitle(), pet.getFname(),
-				pet.getDoornumber(), pet.getStreet(), pet.getArea(), pet.getCity(), pet.getPhone(),
-				pet.getPincode(), pet.getState(), pet.getEmail(), pet.getPancardnumber(),
+				pet.getDoornumber(), pet.getStreet(), pet.getArea(), pet.getCity(),
+				pet.getPincode(), pet.getState(), pet.getPhone(), pet.getEmail(), pet.getPancardnumber(),
 				pet.getAadhar(), pet.getVotercard(), pet.getPreviouslicense(), pet.getPetname(),
 				pet.getSpecies(), pet.getIdentificationmark(), pet.getBreed(), pet.getPetcolor(),
 				pet.getGender(), pet.getVeterinaryConsultant(), pet.getTNVCNo(),
@@ -151,8 +173,8 @@ public class IndexController {
 		List<PetRegister> petRegisters = jdbcTemplate.query("select * from petregister where paymentid is null", (rs, rowNum) -> {
 			PetRegister petRegister = new PetRegister(rs.getString("petID"), rs.getString("zone"),
 					rs.getString("division"), rs.getString("title"), rs.getString("fname"),
-					rs.getString("doornumber"), rs.getString("street"), rs.getString("area"), rs.getString("city"), rs.getString("phone"),
-					rs.getString("pincode"), rs.getString("state"), rs.getString("email"), rs.getString("pancardnumber"),
+					rs.getString("doornumber"), rs.getString("street"), rs.getString("area"), rs.getString("city"),
+					rs.getString("pincode"), rs.getString("state"),  rs.getString("phone"), rs.getString("email"), rs.getString("pancardnumber"),
 					rs.getString("aadhar"), rs.getString("votercard"), rs.getString("previouslicense"), rs.getString("petname"),
 					rs.getString("species"), rs.getString("identificationmark"), rs.getString("breed"), rs.getString("petcolor"),
 					rs.getString("gender"), rs.getString("Veterinary_Consultant"), rs.getString("TNVCNo"),

src/main/java/com/okayjava/html/model/PetRegister.java

@@ -434,7 +434,7 @@ public class PetRegister {
 
 	public PetRegister(String petID, String zone, String division, String title, String fname,
 					   String doornumber, String street, String area,
-					   String city, String phone, String pincode, String state, String email,
+					   String city, String pincode, String state, String phone, String email,
 					   String pancardnumber, String aadhar, String votercard, String previouslicense,
 					   String petname, String species, String identificationmark, String breed,
 					   String petcolor, String gender, String veterinaryConsultant, String TNVCNo,
@@ -459,9 +459,9 @@ public class PetRegister {
 		setStreet(street);
 		setArea(area);
 		setCity(city);
-		setPhone(phone);
 		setPincode(pincode);
 		setState(state);
+		setPhone(phone);
 		setEmail(email);
 		setPancardnumber(pancardnumber);
 		setAadhar(aadhar);
@@ -481,7 +481,7 @@ public class PetRegister {
 		this.Lastdate = Lastdate;
 		this.sterilization = sterilization;
 		this.adopted = adopted;
-//		this.AntiRabies_vaccination = AntiRabies_vaccination;
+     	this.AntiRabies_vaccination = AntiRabies_vaccination;
 		this.petID = petID;
 		this.name = name;
 	}
@@ -496,9 +496,9 @@ public class PetRegister {
 				"street= " + street +", " +
 				"area= " + area +", " +
 				"city= " + city +", " +
-				"phone= " + phone +", " +
 				"pincode= " + pincode +", " +
 				"state= " + state +", " +
+				"phone= " + phone +", " +
 				"email= " + email + ", " +
 				"pancardnumber= " + pancardnumber +", " +
 				"aadhar= " + aadhar +", " +
@@ -513,11 +513,10 @@ public class PetRegister {
 				"VeterinaryConsultant= " +  VeterinaryConsultant +", " +
 				"TNVCNo= " + TNVCNo +", " +
 				"Ageyears= " + Ageyears +", " +
-				"AgeMonths= " + Months +", " +
-				"AgeMonths= " + ARVdate +", " +
-				"AgeMonths= " + Lastdate +", " +
-				"AgeMonths= " + sterilization +", " +
-
+				"Months= " + Months +", " +
+				"ARVdate= " + ARVdate +", " +
+				"Lastdate= " + Lastdate +", " +
+				"sterilization= " + sterilization +", " +
 				"adopted= " + adopted + ", " +
 				"AntiRabies_vaccination= " + AntiRabies_vaccination + "]";
 	}

src/main/resources/application.properties

@@ -1,7 +1,7 @@
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://localhost:3306/pet
+spring.datasource.url = jdbc:mysql://localhost:3306/asset
 spring.datasource.username = root
-spring.datasource.password = Test@1234
+spring.datasource.password = password
 spring.jpa.show-sql = true
 spring.jpa.hibernate.ddl-auto = update
 spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect

src/main/resources/templates/Homepage.html

@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="https://thymeleaf.org" xmlns="http://www.w3.org/1999/html">
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-GLhlTQ8iRABdZLl6O3oVMWSktQOp6b7In1Zl3/Jr59b6EGGoI1aFkw7cmDA6j6gD" crossorigin="anonymous">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha1/dist/js/bootstrap.bundle.min.js" integrity="sha384-w76AqPfDkMBDXo30jS1Sgez6pr3x5MlQ1ZAGC+nuZB+EYdgRZgiwxhTBTkF7CXvN" crossorigin="anonymous"></script>
+	<script src="local.js"></script>
+
+</head>
+
+<div><h5 style="text-align: center;"><img src="https://upload.wikimedia.org/wikipedia/commons/a/a8/Chennai_Corporation_Emblem.png" class="center" width="70" height="70"></h5></div>
+
+<body>
+<div><h5 style="text-align: center;">பெருநகர சென்னை மாநகராட்சி
+	<br>Greater Chennai Corporation</br>
+	<br>
+	<span class="bold"> <h4>Pet License</h4></span></h5></div>
+</div>
+</div>
+<br>
+<br>
+
+<div>
+	<h5 style="text-align: center;">
+
+				<p><a th:href="@{|/register|}" th:text="'Register'"></a></p>
+				<p><a th:href="@{|/status|}" th:text="'Status'"></a></p>
+				<p><a th:href="@{|/payments|}" th:text="'Payments'"></a></p>
+</div>
+</div>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+				<br>
+</body>
+</html>
+

src/main/resources/templates/acknowledged.html

@@ -32,7 +32,7 @@ margin-top:12px;
     <title>acknowledged</title>
 </head>
 <body>
-<div th:substituteby="navbar :: navbar"></div>
+<!--<div th:substituteby="navbar :: navbar"></div>-->
 
 <div class="container">
 <!--    <div class="row mb-2">-->

src/main/resources/templates/welcome.html

@@ -28,7 +28,7 @@
         </style>
     </head>
     <body>
-    <div th:substituteby="navbar :: navbar"></div>
+  <!--  <div th:substituteby="navbar :: navbar"></div>-->
 
     <div class="container">
 
@@ -40,17 +40,17 @@
             <th class="first-col">Operations</th>
             <th>Status</th>
             <th>Payment ID</th>
-
             <th>Title</th>
             <th>First Name</th>
+            <th>zone</th>
             <th>division</th>
             <th>doornumber</th>
             <th>street</th>
             <th>area</th>
             <th>city</th>
-            <th>phone</th>
             <th>pincode</th>
             <th>state</th>
+            <th>phone</th>
             <th>email</th>
             <th>pancardnumber</th>
             <th>aadhar</th>
@@ -71,7 +71,7 @@
             <th>sterilization</th>
             <th>adopted</th>
             <th>antirabies_vaccination</th>
-        </tr>`
+        </tr>
         </thead>
         <tbody>
         <tr th:each="tPets:${pets}">
@@ -82,18 +82,20 @@
                         <input type="hidden" name="petsID" readonly th:value="${tPets.petID}">
                     </form>
                 </div></td>
+
             <td th:text="${tPets.status}"></td>
             <td th:text="${tPets.paymentid}"></td>
             <td th:text="${tPets.title}"></td>
             <td th:text="${tPets.fname}"></td>
+            <td th:text="${tPets.zone}"></td>
             <td th:text="${tPets.division}"></td>
             <td th:text="${tPets.doornumber}"></td>
             <td th:text="${tPets.street}"></td>
             <td th:text="${tPets.area}"></td>
             <td th:text="${tPets.city}"></td>
-            <td th:text="${tPets.phone}"></td>
             <td th:text="${tPets.pincode}"></td>
             <td th:text="${tPets.state}"></td>
+            <td th:text="${tPets.phone}"></td>
             <td th:text="${tPets.email}"></td>
             <td th:text="${tPets.pancardnumber}"></td>
             <td th:text="${tPets.aadhar}"></td>
@@ -106,7 +108,7 @@
             <td th:text="${tPets.petcolor}"></td>
             <td th:text="${tPets.gender}"></td>
             <td th:text="${tPets.VeterinaryConsultant}"></td>
-          <td th:text="${tPets.TNVCNo}"></td>
+            <td th:text="${tPets.TNVCNo}"></td>
             <td th:text="${tPets.ageyears}"></td>
             <td th:text="${tPets.months}"></td>
             <td th:text="${tPets.ARVdate}"></td>