Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
LaMartin-Webomagic
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Sneha
LaMartin-Webomagic
Commits
355331c9
Commit
355331c9
authored
Jul 04, 2024
by
Deep Dey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: update backend on new change request
parent
29f9b34a
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
67 additions
and
2 deletions
+67
-2
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
.../admission/dao/controller/AdmissionFormDAOController.java
+0
-2
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/repository/AdmissionFormDataRepository.java
...admission/dao/repository/AdmissionFormDataRepository.java
+39
-0
lamartinBackend/src/main/java/com/example/LaMartin/admission/mapper/AdmissionFormMapper.java
...xample/LaMartin/admission/mapper/AdmissionFormMapper.java
+14
-0
lamartinBackend/src/main/java/com/example/LaMartin/admission/model/AdmissionFormData.java
...m/example/LaMartin/admission/model/AdmissionFormData.java
+14
-0
No files found.
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/controller/AdmissionFormDAOController.java
View file @
355331c9
...
@@ -11,8 +11,6 @@ import org.jetbrains.annotations.NotNull;
...
@@ -11,8 +11,6 @@ import org.jetbrains.annotations.NotNull;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
javax.mail.MessagingException
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.List
;
@Controller
@Controller
...
...
lamartinBackend/src/main/java/com/example/LaMartin/admission/dao/repository/AdmissionFormDataRepository.java
View file @
355331c9
...
@@ -35,6 +35,19 @@ public class AdmissionFormDataRepository {
...
@@ -35,6 +35,19 @@ public class AdmissionFormDataRepository {
"mother_mother_tongue, mother_community, mother_school_info, mother_college_info, "
+
"mother_mother_tongue, mother_community, mother_school_info, mother_college_info, "
+
"mother_university_info, mother_professional_qualification, mother_occupation, "
+
"mother_university_info, mother_professional_qualification, mother_occupation, "
+
"mother_monthly_income, mother_workplace_info, "
+
"mother_monthly_income, mother_workplace_info, "
+
// newly added fields
"staff_department, "
+
"staff_category, "
+
"ex_student_info, "
+
"denomination, "
+
"church, "
+
"home_address, "
+
"correspondence_address, "
+
"father_denomination, "
+
"father_church, "
+
"mother_denomination, "
+
"mother_church, "
+
// end newly added fields
"candidate_image_name, "
+
"candidate_image_name, "
+
"father_image_name, "
+
"father_image_name, "
+
"mother_image_name) "
+
"mother_image_name) "
+
...
@@ -49,6 +62,19 @@ public class AdmissionFormDataRepository {
...
@@ -49,6 +62,19 @@ public class AdmissionFormDataRepository {
":motherMotherTongue, :motherCommunity, :motherSchoolInfo, :motherCollegeInfo, "
+
":motherMotherTongue, :motherCommunity, :motherSchoolInfo, :motherCollegeInfo, "
+
":motherUniversityInfo, :motherProfessionalQualification, :motherOccupation, "
+
":motherUniversityInfo, :motherProfessionalQualification, :motherOccupation, "
+
":motherMonthlyIncome, :motherWorkplaceInfo, "
+
":motherMonthlyIncome, :motherWorkplaceInfo, "
+
// newly added fields
":staffDepartment, "
+
":staffCategory, "
+
":exStudentInfo, "
+
":denomination, "
+
":church, "
+
":homeAddress, "
+
":correspondenceAddress, "
+
":fatherDenomination, "
+
":fatherChurch, "
+
":motherDenomination, "
+
":motherChurch, "
+
// end newly added fields
":candidateImageName, "
+
":candidateImageName, "
+
":fatherImageName, "
+
":fatherImageName, "
+
":motherImageName)"
;
":motherImageName)"
;
...
@@ -95,6 +121,19 @@ public class AdmissionFormDataRepository {
...
@@ -95,6 +121,19 @@ public class AdmissionFormDataRepository {
params
.
addValue
(
"motherOccupation"
,
formData
.
getMotherOccupation
());
params
.
addValue
(
"motherOccupation"
,
formData
.
getMotherOccupation
());
params
.
addValue
(
"motherMonthlyIncome"
,
formData
.
getMotherMonthlyIncome
());
params
.
addValue
(
"motherMonthlyIncome"
,
formData
.
getMotherMonthlyIncome
());
params
.
addValue
(
"motherWorkplaceInfo"
,
formData
.
getMotherWorkplaceInfo
());
params
.
addValue
(
"motherWorkplaceInfo"
,
formData
.
getMotherWorkplaceInfo
());
// newly added fields
params
.
addValue
(
"staffDepartment"
,
formData
.
getStaffDepartment
());
params
.
addValue
(
"staffCategory"
,
formData
.
getStaffCategory
());
params
.
addValue
(
"exStudentInfo"
,
formData
.
getExStudentInfo
());
params
.
addValue
(
"denomination"
,
formData
.
getDenomination
());
params
.
addValue
(
"church"
,
formData
.
getChurch
());
params
.
addValue
(
"homeAddress"
,
formData
.
getHomeAddress
());
params
.
addValue
(
"correspondenceAddress"
,
formData
.
getCorrespondenceAddress
());
params
.
addValue
(
"fatherDenomination"
,
formData
.
getFatherDenomination
());
params
.
addValue
(
"fatherChurch"
,
formData
.
getFatherChurch
());
params
.
addValue
(
"motherDenomination"
,
formData
.
getMotherDenomination
());
params
.
addValue
(
"motherChurch"
,
formData
.
getMotherChurch
());
// end newly added fields
params
.
addValue
(
"candidateImageName"
,
formData
.
getCandidateImageName
());
params
.
addValue
(
"candidateImageName"
,
formData
.
getCandidateImageName
());
params
.
addValue
(
"fatherImageName"
,
formData
.
getFatherImageName
());
params
.
addValue
(
"fatherImageName"
,
formData
.
getFatherImageName
());
params
.
addValue
(
"motherImageName"
,
formData
.
getMotherImageName
());
params
.
addValue
(
"motherImageName"
,
formData
.
getMotherImageName
());
...
...
lamartinBackend/src/main/java/com/example/LaMartin/admission/mapper/AdmissionFormMapper.java
View file @
355331c9
...
@@ -66,6 +66,20 @@ public class AdmissionFormMapper implements RowMapper<AdmissionFormData> {
...
@@ -66,6 +66,20 @@ public class AdmissionFormMapper implements RowMapper<AdmissionFormData> {
formData
.
setInteractionDate
(
RowMapperUtil
.
getString
(
rs
,
"interaction_date"
));
formData
.
setInteractionDate
(
RowMapperUtil
.
getString
(
rs
,
"interaction_date"
));
formData
.
setInteractionTime
(
RowMapperUtil
.
getString
(
rs
,
"interaction_time"
));
formData
.
setInteractionTime
(
RowMapperUtil
.
getString
(
rs
,
"interaction_time"
));
// newly added fields
formData
.
setStaffDepartment
(
RowMapperUtil
.
getString
(
rs
,
"staff_department"
));
formData
.
setStaffCategory
(
RowMapperUtil
.
getString
(
rs
,
"staff_category"
));
formData
.
setExStudentInfo
(
RowMapperUtil
.
getString
(
rs
,
"ex_student_info"
));
formData
.
setDenomination
(
RowMapperUtil
.
getString
(
rs
,
"denomination"
));
formData
.
setChurch
(
RowMapperUtil
.
getString
(
rs
,
"church"
));
formData
.
setHomeAddress
(
RowMapperUtil
.
getString
(
rs
,
"home_address"
));
formData
.
setCorrespondenceAddress
(
RowMapperUtil
.
getString
(
rs
,
"correspondence_address"
));
formData
.
setFatherDenomination
(
RowMapperUtil
.
getString
(
rs
,
"father_denomination"
));
formData
.
setFatherChurch
(
RowMapperUtil
.
getString
(
rs
,
"father_church"
));
formData
.
setMotherDenomination
(
RowMapperUtil
.
getString
(
rs
,
"mother_denomination"
));
formData
.
setMotherChurch
(
RowMapperUtil
.
getString
(
rs
,
"mother_church"
));
// end newly added fields
return
formData
;
return
formData
;
}
}
}
}
lamartinBackend/src/main/java/com/example/LaMartin/admission/model/AdmissionFormData.java
View file @
355331c9
...
@@ -20,6 +20,9 @@ public class AdmissionFormData {
...
@@ -20,6 +20,9 @@ public class AdmissionFormData {
private
String
school
;
private
String
school
;
@NotEmpty
(
message
=
"Category cannot be empty"
)
@NotEmpty
(
message
=
"Category cannot be empty"
)
private
String
category
;
private
String
category
;
private
String
staffDepartment
;
private
String
staffCategory
;
private
String
exStudentInfo
;
@NotEmpty
(
message
=
"Name cannot be empty"
)
@NotEmpty
(
message
=
"Name cannot be empty"
)
private
String
fullName
;
private
String
fullName
;
@NotEmpty
(
message
=
"Admission Class cannot be empty"
)
@NotEmpty
(
message
=
"Admission Class cannot be empty"
)
...
@@ -30,10 +33,16 @@ public class AdmissionFormData {
...
@@ -30,10 +33,16 @@ public class AdmissionFormData {
private
String
nationality
;
private
String
nationality
;
@NotEmpty
(
message
=
"Religion cannot be empty"
)
@NotEmpty
(
message
=
"Religion cannot be empty"
)
private
String
religion
;
private
String
religion
;
private
String
denomination
;
private
String
church
;
@NotEmpty
(
message
=
"Mother Tongue cannot be empty"
)
@NotEmpty
(
message
=
"Mother Tongue cannot be empty"
)
private
String
motherTongue
;
private
String
motherTongue
;
@NotEmpty
(
message
=
"Community cannot be empty"
)
@NotEmpty
(
message
=
"Community cannot be empty"
)
private
String
community
;
private
String
community
;
@NotEmpty
(
message
=
"Home address cannot be empty"
)
private
String
homeAddress
;
@NotEmpty
(
message
=
"Correspondence address cannot be empty"
)
private
String
correspondenceAddress
;
private
String
otherChildren
;
private
String
otherChildren
;
@NotEmpty
(
message
=
"Marital Status cannot be empty"
)
@NotEmpty
(
message
=
"Marital Status cannot be empty"
)
...
@@ -49,6 +58,8 @@ public class AdmissionFormData {
...
@@ -49,6 +58,8 @@ public class AdmissionFormData {
private
String
fatherNationality
;
private
String
fatherNationality
;
@NotEmpty
(
message
=
"Father Religion cannot be empty"
)
@NotEmpty
(
message
=
"Father Religion cannot be empty"
)
private
String
fatherReligion
;
private
String
fatherReligion
;
private
String
fatherDenomination
;
private
String
fatherChurch
;
@NotEmpty
(
message
=
"Father Mother Tongue cannot be empty"
)
@NotEmpty
(
message
=
"Father Mother Tongue cannot be empty"
)
private
String
fatherMotherTongue
;
private
String
fatherMotherTongue
;
@NotEmpty
(
message
=
"Father Community cannot be empty"
)
@NotEmpty
(
message
=
"Father Community cannot be empty"
)
...
@@ -72,6 +83,8 @@ public class AdmissionFormData {
...
@@ -72,6 +83,8 @@ public class AdmissionFormData {
private
String
motherNationality
;
private
String
motherNationality
;
@NotEmpty
(
message
=
"Mother Religion cannot be empty"
)
@NotEmpty
(
message
=
"Mother Religion cannot be empty"
)
private
String
motherReligion
;
private
String
motherReligion
;
private
String
motherDenomination
;
private
String
motherChurch
;
@NotEmpty
(
message
=
"Mother Mother Tongue cannot be empty"
)
@NotEmpty
(
message
=
"Mother Mother Tongue cannot be empty"
)
private
String
motherMotherTongue
;
private
String
motherMotherTongue
;
@NotEmpty
(
message
=
"Mother Community cannot be empty"
)
@NotEmpty
(
message
=
"Mother Community cannot be empty"
)
...
@@ -81,6 +94,7 @@ public class AdmissionFormData {
...
@@ -81,6 +94,7 @@ public class AdmissionFormData {
private
String
motherCollegeInfo
;
private
String
motherCollegeInfo
;
private
String
motherUniversityInfo
;
private
String
motherUniversityInfo
;
private
String
motherProfessionalQualification
;
private
String
motherProfessionalQualification
;
@NotEmpty
(
message
=
"Mother Occupation cannot be empty"
)
private
String
motherOccupation
;
private
String
motherOccupation
;
private
String
motherMonthlyIncome
;
private
String
motherMonthlyIncome
;
private
String
motherWorkplaceInfo
;
private
String
motherWorkplaceInfo
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment