Unverified Commit ec716c7f authored by Ankit Verma's avatar Ankit Verma Committed by GitHub
Browse files

Merge pull request #152 from Radheshhathwar/development

Attendance and Student Result
Showing with 10 additions and 10 deletions
+10 -10
......@@ -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;
}
......
server.port = 8083
spring.datasource.url=jdbc:postgresql://localhost:5432/frac_tool
spring.datasource.url=jdbc:postgresql://localhost:5431/frac_tool
spring.datasource.username=postgres
spring.datasource.password=postgres
spring.datasource.password=yoursupersecret
spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect
spring.jpa.properties.hibernate.format_sql=true
spring.jpa.show-sql=false
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment