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
f4d887bd
Commit
f4d887bd
authored
1 year ago
by
Radheshhathwar
Browse files
Options
Download
Patches
Plain Diff
Removed DOB from view result
parent
ba7f2965
github/fork/ruksana2808/filter_bug_examCycle
bug_fix_question_paper_upload
development
fee_changes
2 merge requests
!146
Removed DOB from view result
,
!147
Development
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/StudentResultController.java
+2
-2
...xamsAndAdmissions/controller/StudentResultController.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentResultRepository.java
+3
-1
...xamsAndAdmissions/repository/StudentResultRepository.java
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/StudentResultService.java
+2
-2
...psmf/examsAndAdmissions/service/StudentResultService.java
with
7 additions
and
5 deletions
+7
-5
src/main/java/com/tarento/upsmf/examsAndAdmissions/controller/StudentResultController.java
+
2
−
2
View file @
f4d887bd
...
...
@@ -48,8 +48,8 @@ public class StudentResultController {
}
@GetMapping
(
"/results"
)
public
ResponseEntity
<
ResponseDto
>
viewResults
(
@RequestParam
String
enrolmentNumber
,
@RequestParam
String
dateOfBirth
,
@RequestParam
Long
examCycleId
)
{
return
new
ResponseEntity
<>(
studentResultService
.
findByEnrollmentNumberAndDateOfBirth
(
enrolmentNumber
,
LocalDate
.
parse
(
dateOfBirth
),
examCycleId
),
HttpStatus
.
OK
);
public
ResponseEntity
<
ResponseDto
>
viewResults
(
@RequestParam
String
enrolmentNumber
,
@RequestParam
Long
examCycleId
)
{
return
new
ResponseEntity
<>(
studentResultService
.
findByEnrollmentNumberAndDateOfBirth
(
enrolmentNumber
,
examCycleId
),
HttpStatus
.
OK
);
}
@PostMapping
(
"/requestRetotalling"
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/tarento/upsmf/examsAndAdmissions/repository/StudentResultRepository.java
+
3
−
1
View file @
f4d887bd
...
...
@@ -20,7 +20,7 @@ public interface StudentResultRepository extends JpaRepository<StudentResult, Lo
List
<
StudentResult
>
findByCourse_IdAndExam_ExamCycleIdAndPublished
(
Long
courseId
,
Long
examCycleId
,
boolean
b
);
List
<
StudentResult
>
findByStudent_EnrollmentNumberAndStudent_DateOfBirthAndExamCycle_IdAndPublished
(
String
enrollmentNumber
,
LocalDate
dateOfBirth
,
Long
examCycleId
,
boolean
published
);
//
List<StudentResult> findByStudent_EnrollmentNumberAndStudent_DateOfBirthAndExamCycle_IdAndPublished(String enrollmentNumber, LocalDate dateOfBirth, Long examCycleId, boolean published);
boolean
existsByEnrollmentNumber
(
String
enrollmentNumber
);
...
...
@@ -51,5 +51,7 @@ public interface StudentResultRepository extends JpaRepository<StudentResult, Lo
Optional
<
StudentResult
>
findByExamId
(
Long
id
);
List
<
StudentResult
>
findByExamIdAndInstituteId
(
Long
id
,
Long
instituteId
);
List
<
StudentResult
>
findByStudent_EnrollmentNumberAndExamCycle_IdAndPublished
(
String
enrollmentNumber
,
Long
examCycleId
,
boolean
b
);
}
This diff is collapsed.
Click to expand it.
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/StudentResultService.java
+
2
−
2
View file @
f4d887bd
...
...
@@ -404,9 +404,9 @@ public class StudentResultService {
return
response
;
}
public
ResponseDto
findByEnrollmentNumberAndDateOfBirth
(
String
enrollmentNumber
,
LocalDate
dateOfBirth
,
Long
examCycleId
)
{
public
ResponseDto
findByEnrollmentNumberAndDateOfBirth
(
String
enrollmentNumber
,
Long
examCycleId
)
{
ResponseDto
response
=
new
ResponseDto
(
Constants
.
API_FIND_BY_ENROLLMENT_NUMBER_AND_DOB
);
List
<
StudentResult
>
studentResultList
=
studentResultRepository
.
findByStudent_EnrollmentNumberAnd
Student_DateOfBirthAnd
ExamCycle_IdAndPublished
(
enrollmentNumber
,
dateOfBirth
,
examCycleId
,
true
);
List
<
StudentResult
>
studentResultList
=
studentResultRepository
.
findByStudent_EnrollmentNumberAndExamCycle_IdAndPublished
(
enrollmentNumber
,
examCycleId
,
true
);
if
(!
studentResultList
.
isEmpty
())
{
StudentResultDTO
studentResultDTO
=
mapToDTO
(
studentResultList
);
...
...
This diff is collapsed.
Click to expand it.
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