diff --git a/src/main/java/com/volunteersregistration/entity/VolunteerInformation.java b/src/main/java/com/volunteersregistration/entity/VolunteerInformation.java index ef0ce7d..8912a03 100644 --- a/src/main/java/com/volunteersregistration/entity/VolunteerInformation.java +++ b/src/main/java/com/volunteersregistration/entity/VolunteerInformation.java @@ -21,14 +21,14 @@ public class VolunteerInformation { private String gender; private long mobile_no; - private long landline_no; + private Long landline_no; private String district; private String address; private int pin_code; private String degree; private String college_name; - private boolean vol_nss; - private boolean vol_ncc; + private Boolean vol_nss; + private Boolean vol_ncc; private String occupation; private String designation; private String ngo_associated; @@ -103,14 +103,32 @@ public class VolunteerInformation { this.mobile_no = mobile_no; } - public long getLandline_no() { + + + public Long getLandline_no() { return landline_no; } - public void setLandline_no(long landline_no) { + public void setLandline_no(Long landline_no) { this.landline_no = landline_no; } + public Boolean getVol_nss() { + return vol_nss; + } + + public void setVol_nss(Boolean vol_nss) { + this.vol_nss = vol_nss; + } + + public Boolean getVol_ncc() { + return vol_ncc; + } + + public void setVol_ncc(Boolean vol_ncc) { + this.vol_ncc = vol_ncc; + } + public String getDistrict() { return district; } @@ -151,21 +169,7 @@ public class VolunteerInformation { this.college_name = college_name; } - public boolean isVol_nss() { - return vol_nss; - } - - public void setVol_nss(boolean vol_nss) { - this.vol_nss = vol_nss; - } - - public boolean isVol_ncc() { - return vol_ncc; - } - - public void setVol_ncc(boolean vol_ncc) { - this.vol_ncc = vol_ncc; - } + public String getOccupation() { return occupation; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b589b60..96687da 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +1 @@ - spring.profiles.active=dev \ No newline at end of file + spring.profiles.active=prod \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 353b91a..cbccc3e 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -249,12 +249,12 @@ -
+
@@ -313,7 +313,7 @@
-
+
@@ -349,7 +349,7 @@
-
+ -

Education Qualification Details

+ -

Employment Details

+ -

Other Information

+
-
+
-
@@ -1102,17 +1102,17 @@ var mobile = document.getElementById("mobile").value = document.getElementById("mobile").value.trim(); var address = document.getElementById("address").value = document.getElementById("address").value.trim(); var pincode = document.getElementById("pincode").value = document.getElementById("pincode").value.trim(); - var edu = document.getElementById("edu").value = document.getElementById("edu").value.trim(); - var college = document.getElementById("college").value = document.getElementById("college").value.trim(); - let nssSelected = document.querySelector('input[name="nss"]:checked'); - let nccSelected = document.querySelector('input[name="ncc"]:checked'); + //var edu = document.getElementById("edu").value = document.getElementById("edu").value.trim(); + //var college = document.getElementById("college").value = document.getElementById("college").value.trim(); + //let nssSelected = document.querySelector('input[name="nss"]:checked'); + //let nccSelected = document.querySelector('input[name="ncc"]:checked'); // var occupation = document.getElementById("occupation").value= document.getElementById("occupation").value.trim(); // var designation = document.getElementById("designation").value= document.getElementById("designation").value.trim(); let preVolSelected = document.querySelector('input[name="preVol"]:checked'); - var ngoAny = document.getElementById("ngoAny").value = document.getElementById("ngoAny").value.trim(); + //var ngoAny = document.getElementById("ngoAny").value = document.getElementById("ngoAny").value.trim(); var dob = document.getElementById("dob").value = document.getElementById("dob").value.trim(); - var aadhar = document.getElementById("aadhar").value = document.getElementById("aadhar").value.trim(); - var bloodgroup = document.getElementById("bloodgroup").value; + //var aadhar = document.getElementById("aadhar").value = document.getElementById("aadhar").value.trim(); + //var bloodgroup = document.getElementById("bloodgroup").value; @@ -1152,10 +1152,10 @@ $("#pincodeError").text("Please enter a valid 6-digit pincode"); isValid = false; } - if (edu == undefined || edu == "") { + /* if (edu == undefined || edu == "") { $("#eduError").text("Please Enter Education details !"); isValid = false; - } + } if (college == undefined || college == "") { $("#collegeError").text("Please Enter college details !"); isValid = false; @@ -1175,17 +1175,17 @@ if (!nccSelected) { $("#nccError").text("Please Select NCC details !"); isValid = false; - } + }*/ if (!preVolSelected) { $("#prevolError").text("Please Select Previous Volunteer details !"); isValid = false; } - if (ngoAny == undefined || ngoAny == "") { + /* if (ngoAny == undefined || ngoAny == "") { $("#ngoAnyError").text("Please Enter Company/NGO details !"); isValid = false; - } + } */ if (i == 0) { $("#anyAreaError").text("Please select Preferred Area details !"); isValid = false; @@ -1336,22 +1336,22 @@ dob: $("#dob").val(), gender: $("input[name='gender']:checked").val(), mobile_no: $("#mobile").val(), - landline_no: $("#landline").val(), + //landline_no: $("#landline").val(), district: $("#district").val(), address: $("#address").val(), pin_code: $("#pincode").val(), - degree: $("#edu").val(), - college_name: $("#college").val(), - vol_nss: $("input[name='nss']:checked").val(), - vol_ncc: $("input[name='ncc']:checked").val(), - occupation: $("#occupation").val(), - designation: $("#designation").val(), - ngo_associated: $("#ngoAny").val(), + //degree: $("#edu").val(), + //college_name: $("#college").val(), + //vol_nss: $("input[name='nss']:checked").val(), + //vol_ncc: $("input[name='ncc']:checked").val(), + //occupation: $("#occupation").val(), + //designation: $("#designation").val(), + //ngo_associated: $("#ngoAny").val(), previous_volunteered: $("input[name='preVol']:checked").val(), // Add more fields if needed referBy: $("#ref").val(), - aadhar: $("#aadhar").val(), - bloodgroup: $("#bloodgroup").val(), + //aadhar: $("#aadhar").val(), + //bloodgroup: $("#bloodgroup").val(), preferredAreas: preferredAreas }; $('#loader').show();