removed remark from student exam registration since it is not require…

Created by: jaypratapsingh1

…d at UI

src/main/java/com/tarento/upsmf/examsAndAdmissions/model/dto/PendingDataDto.java

@@ -19,6 +19,7 @@ public class PendingDataDto {
     private String studentEnrollmentNumber;
     private LocalDate registrationDate;
     private String status;
+    private String remarks;
     private String examCenterName;
     private boolean feesPaid;
     private double attendancePercentage;

src/main/java/com/tarento/upsmf/examsAndAdmissions/model/StudentExamRegistration.java

@@ -34,6 +34,7 @@ public class StudentExamRegistration {
 
     private LocalDate registrationDate;
     private String status;
+    private String remarks;
     private String createdBy;
     private String updatedBy;
     @ManyToOne

src/main/java/com/tarento/upsmf/examsAndAdmissions/service/HallTicketService.java

@@ -559,6 +559,7 @@ public class HallTicketService {
         dto.setStudentEnrollmentNumber(registration.getStudent().getEnrollmentNumber());
         dto.setRegistrationDate(registration.getRegistrationDate());
         dto.setStatus(registration.getStatus());
+        dto.setRemarks(registration.getRemarks());
         dto.setHallTicketStatus(registration.getHallTicketStatus());
         if (registration.getExamCenter() != null) {
             dto.setExamCenterName(registration.getExamCenter().getName());
@@ -673,9 +674,6 @@ public class HallTicketService {
             examCycleData.put("modifiedBy", examCycle.getModifiedBy());
             examCycleData.put("status", examCycle.getStatus());
             examCycleData.put("obsolete", examCycle.getObsolete());
-
-            formattedData.put("examCycle", examCycleData);
-
             // Exams details
             List<Exam> exams = examRepository.findByExamCycleId(examCycle.getId());
             List<Map<String, Object>> examsData = new ArrayList<>();
@@ -695,7 +693,10 @@ public class HallTicketService {
                 examsData.add(examData);
             }
 
-            formattedData.put("exams", examsData);
+            // Add examsData list inside examCycleData
+            examCycleData.put("exams", examsData);
+
+            formattedData.put("examCycle", examCycleData);
 
             response.put(Constants.RESPONSE, formattedData);
             response.setResponseCode(HttpStatus.OK);

src/main/java/com/tarento/upsmf/examsAndAdmissions/service/StudentExamRegistrationService.java

@@ -137,6 +137,7 @@ public class StudentExamRegistrationService {
             registration.setExamCycle(examCycleMap.get(request.getExamCycleId()));
             registration.setRegistrationDate(request.getRegistrationDate());
             registration.setStatus(request.getStatus());
+            registration.setRemarks(request.getRemarks());
             registration.setUpdatedBy(userId);
 
             newRegistrations.add(registration);
@@ -198,6 +199,7 @@ public class StudentExamRegistrationService {
         dto.setExamCycleId(entity.getExamCycle().getId());
         dto.setRegistrationDate(entity.getRegistrationDate());
         dto.setStatus(entity.getStatus());
+        dto.setRemarks(entity.getRemarks());
         dto.setCreatedBy(entity.getCreatedBy());
         dto.setUpdatedBy(entity.getUpdatedBy());