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
010cedfe
Commit
010cedfe
authored
1 year ago
by
shishir suman
Browse files
Options
Download
Plain Diff
Merge branch 'development' into fee_workflow
parents
ab96c364
46bc2162
uri_access_check
Response_fixes
auxillary_apis
bug_fix_question_paper_upload
development
fee_changes
fee_workflow
github/fork/ruksana2808/filter_bug_examCycle
instituteApis_shishir
1 merge request
!45
Fee workflow
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
.idea/.gitignore
+3
-0
.idea/.gitignore
.idea/compiler.xml
+25
-0
.idea/compiler.xml
.idea/encodings.xml
+11
-0
.idea/encodings.xml
.idea/jarRepositories.xml
+25
-0
.idea/jarRepositories.xml
.idea/misc.xml
+12
-0
.idea/misc.xml
.idea/vcs.xml
+6
-0
.idea/vcs.xml
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/CourseSubjectMappingController.java
+1
-1
...Admissions/controller/CourseSubjectMappingController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/ExamController.java
+5
-4
...o/upsmf/examsAndAdmissions/controller/ExamController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/ExamCycleController.java
+36
-7
...mf/examsAndAdmissions/controller/ExamCycleController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/InstituteController.java
+1
-1
...mf/examsAndAdmissions/controller/InstituteController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/InstituteCourseMappingController.java
+3
-1
...missions/controller/InstituteCourseMappingController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/StudentController.java
+1
-4
...psmf/examsAndAdmissions/controller/StudentController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/StudentExamRegistrationController.java
+4
-2
...issions/controller/StudentExamRegistrationController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/StudentResultController.java
+8
-30
...xamsAndAdmissions/controller/StudentResultController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/enums/ExamCycleStatus.java
+5
-0
...rento/upsmf/examsAndAdmissions/enums/ExamCycleStatus.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/enums/RetotallingStatus.java
+6
-0
...nto/upsmf/examsAndAdmissions/enums/RetotallingStatus.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/enums/VerificationStatus.java
+1
-1
...to/upsmf/examsAndAdmissions/enums/VerificationStatus.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/DocumentVerification.java
+1
-0
.../upsmf/examsAndAdmissions/model/DocumentVerification.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/ExamCycle.java
+2
-5
...com/tarento/upsmf/examsAndAdmissions/model/ExamCycle.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/model/RetotallingRequest.java
+2
-1
...to/upsmf/examsAndAdmissions/model/RetotallingRequest.java
with
158 additions
and
57 deletions
+158
-57
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