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
ec716c7f
Unverified
Commit
ec716c7f
authored
1 year ago
by
Ankit Verma
Committed by
GitHub
1 year ago
Browse files
Options
Download
Plain Diff
Merge pull request #152 from Radheshhathwar/development
Attendance and Student Result
parents
372c20ef
d02047cc
github/fork/ruksana2808/filter_bug_examCycle
bug_fix_question_paper_upload
development
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/DataImporterService.java
+8
-8
...upsmf/examsAndAdmissions/service/DataImporterService.java
src/main/resources/application.properties
+2
-2
src/main/resources/application.properties
with
10 additions
and
10 deletions
+10
-10
src/main/java/com/tarento/upsmf/examsAndAdmissions/service/DataImporterService.java
+
8
−
8
View file @
ec716c7f
...
...
@@ -688,10 +688,10 @@ public class DataImporterService {
private
StudentResult
getStudentResult
(
StudentResult
dto
,
Long
instituteId
)
{
StudentResult
entity
=
new
StudentResult
();
Course
course
=
courseRepository
.
findByCourseNameIgnoreCase
(
dto
.
getCourse_name
()).
orElseThrow
();
Exam
exam
=
examRepository
.
findByExamName
(
dto
.
getExam_name
()).
orElseThrow
();
ExamCycle
examCycle
=
cycleRepository
.
findByExamCycleName
(
dto
.
getExamCycle_name
());
Student
student
=
studentRepository
.
findByEnrollmentNumber
(
dto
.
getEnrollmentNumber
()).
orElseThrow
();
//
Course course = courseRepository.findByCourseNameIgnoreCase(dto.getCourse_name()).orElseThrow();
//
Exam exam = examRepository.findByExamName(dto.getExam_name()).orElseThrow();
//
ExamCycle examCycle = cycleRepository.findByExamCycleName(dto.getExamCycle_name());
//
Student student = studentRepository.findByEnrollmentNumber(dto.getEnrollmentNumber()).orElseThrow();
entity
.
setFirstName
(
dto
.
getFirstName
());
entity
.
setLastName
(
dto
.
getLastName
());
...
...
@@ -712,10 +712,10 @@ public class DataImporterService {
entity
.
setOtherMarksObtained
(
dto
.
getOtherMarksObtained
());
entity
.
setInternalMarkFlag
(
true
);
entity
.
setInstituteId
(
instituteId
);
entity
.
setCourse
(
course
);
entity
.
setExam
(
exam
);
entity
.
setExamCycle
(
examCycle
);
entity
.
setStudent
(
student
);
//
entity.setCourse(course);
//
entity.setExam(exam);
//
entity.setExamCycle(examCycle);
//
entity.setStudent(student);
return
entity
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application.properties
+
2
−
2
View file @
ec716c7f
server.port
=
8083
spring.datasource.url
=
jdbc:postgresql://localhost:543
2
/frac_tool
spring.datasource.url
=
jdbc:postgresql://localhost:543
1
/frac_tool
spring.datasource.username
=
postgres
spring.datasource.password
=
postg
re
s
spring.datasource.password
=
yoursupersec
re
t
spring.jpa.properties.hibernate.dialect
=
org.hibernate.dialect.PostgreSQLDialect
spring.jpa.properties.hibernate.format_sql
=
true
spring.jpa.show-sql
=
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