Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
examsAndAdmissions
Commits
edea9692
Commit
edea9692
authored
1 year ago
by
shishir suman
Browse files
Options
Download
Plain Diff
Merge branch 'development' into fee_workflow
parents
010cedfe
8641f801
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/AttendanceController.java
+45
-0
...f/examsAndAdmissions/controller/AttendanceController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/StudentResultController.java
+44
-9
...xamsAndAdmissions/controller/StudentResultController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/AttendanceRecord.java
+37
-2
...ento/upsmf/examsAndAdmissions/model/AttendanceRecord.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/ExamCycle.java
+3
-2
...com/tarento/upsmf/examsAndAdmissions/model/ExamCycle.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/Institute.java
+1
-1
...com/tarento/upsmf/examsAndAdmissions/model/Institute.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/Student.java
+1
-3
...a/com/tarento/upsmf/examsAndAdmissions/model/Student.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/StudentResult.java
+30
-4
...tarento/upsmf/examsAndAdmissions/model/StudentResult.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/dto/StudentDto.java
+0
-2
...arento/upsmf/examsAndAdmissions/model/dto/StudentDto.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/ResultRepository.java
+8
-8
...upsmf/examsAndAdmissions/repository/ResultRepository.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/DataImporterService.java
+87
-3
...upsmf/examsAndAdmissions/service/DataImporterService.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/ExamCycleService.java
+11
-2
...to/upsmf/examsAndAdmissions/service/ExamCycleService.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/StudentService.java
+1
-1
...ento/upsmf/examsAndAdmissions/service/StudentService.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/impl/AttachmentServiceImpl.java
+1
-1
...xamsAndAdmissions/service/impl/AttachmentServiceImpl.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/impl/InstituteCourseMappingServiceImpl.java
+2
-2
...sions/service/impl/InstituteCourseMappingServiceImpl.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/util/CustomDateDeserializer.java
+23
-0
...upsmf/examsAndAdmissions/util/CustomDateDeserializer.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/util/CustomDateSerializer.java
+17
-0
...o/upsmf/examsAndAdmissions/util/CustomDateSerializer.java
with
311 additions
and
40 deletions
+311
-40
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets
