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
6abe593f
Commit
6abe593f
authored
1 year ago
by
Radheshhathwar
Browse files
Options
Download
Patches
Plain Diff
Added data inside response for bulk upload
parent
e94209db
github/fork/ruksana2808/filter_bug_examCycle
bug_fix_question_paper_upload
development
1 merge request
!151
Added data inside response for bulk upload
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/DataImporterService.java
+3
-1
...upsmf/examsAndAdmissions/service/DataImporterService.java
with
3 additions
and
1 deletion
+3
-1
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/DataImporterService.java
+
3
−
1
View file @
6abe593f
...
...
@@ -414,7 +414,8 @@ public class DataImporterService {
if
(!
DataValidation
.
isMarksValid
(
dto
.
getExternalMarksObtained
()))
{
validationErrors
.
add
(
"- External Marks Obtained is invalid: "
+
dto
.
getExternalMarksObtained
()
+
" Marks have to be within 0 and 100"
);
}
}
else
{
}
if
(
validationErrors
.
isEmpty
())
{
StudentResult
existingEntity
=
repository
.
findByFirstNameAndLastNameAndEnrollmentNumber
(
dto
.
getFirstName
(),
dto
.
getLastName
(),
dto
.
getEnrollmentNumber
());
List
<
StudentResult
>
marks
=
calculateResult
(
existingEntity
.
getInternalMarks
(),
existingEntity
.
getPassingInternalMarks
(),
existingEntity
.
getInternalMarksObtained
(),
existingEntity
.
getPracticalMarks
(),
existingEntity
.
getPassingPracticalMarks
(),
existingEntity
.
getPracticalMarksObtained
(),
dto
.
getExternalMarks
(),
dto
.
getPassingExternalMarks
(),
dto
.
getExternalMarksObtained
());
...
...
@@ -432,6 +433,7 @@ public class DataImporterService {
entityList
.
add
(
existingEntity
);
}
}
ValidationResultDto
resultDto
=
new
ValidationResultDto
();
if
(!
validationErrors
.
isEmpty
())
{
resultDto
.
setValid
(
false
);
...
...
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