diff --git a/src/main/java/ru/ulstu/report/controller/ReportValueController.java b/src/main/java/ru/ulstu/report/controller/ReportValueController.java index b77e4b0..0721028 100644 --- a/src/main/java/ru/ulstu/report/controller/ReportValueController.java +++ b/src/main/java/ru/ulstu/report/controller/ReportValueController.java @@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; -import ru.ulstu.aspirant.service.AspirantService; import ru.ulstu.report.model.dto.ReportValueDto; import ru.ulstu.report.service.ReportValueService; @@ -17,11 +16,9 @@ import java.io.IOException; @RequestMapping("report-value") public class ReportValueController { private final ReportValueService reportValueService; - private final AspirantService aspirantService; - public ReportValueController(ReportValueService reportValueService, AspirantService aspirantService) { + public ReportValueController(ReportValueService reportValueService) { this.reportValueService = reportValueService; - this.aspirantService = aspirantService; } @GetMapping("edit-report-value/{reportId}/{indicatorId}") @@ -30,6 +27,7 @@ public class ReportValueController { Model model) { model.addAttribute("reportValue", reportValueService.getByIndicatorId(reportId, indicatorId)); model.addAttribute("canEdit", reportValueService.canEdit(reportId)); + model.addAttribute("status", reportValueService.getStatus(reportId)); return "report/editReportValue"; } diff --git a/src/main/java/ru/ulstu/report/service/ReportValueService.java b/src/main/java/ru/ulstu/report/service/ReportValueService.java index 017675c..9d8e9ba 100644 --- a/src/main/java/ru/ulstu/report/service/ReportValueService.java +++ b/src/main/java/ru/ulstu/report/service/ReportValueService.java @@ -4,6 +4,7 @@ import org.springframework.stereotype.Service; import ru.ulstu.file.model.FileData; import ru.ulstu.file.service.FileService; import ru.ulstu.indicator.service.IndicatorService; +import ru.ulstu.report.model.ReportStatus; import ru.ulstu.report.model.ReportValue; import ru.ulstu.report.model.dto.ReportValueDto; import ru.ulstu.report.repository.ReportValueRepository; @@ -73,4 +74,8 @@ public class ReportValueService { public boolean canEdit(Integer reportId) { return reportService.getReportById(reportId).getAspirant().getUser().equals(userService.getCurrentUser()); } + + public ReportStatus getStatus(Integer reportId) { + return reportService.getReportById(reportId).getStatus(); + } } diff --git a/src/main/resources/templates/report/editReportValue.html b/src/main/resources/templates/report/editReportValue.html index 0e27511..9496c09 100644 --- a/src/main/resources/templates/report/editReportValue.html +++ b/src/main/resources/templates/report/editReportValue.html @@ -65,7 +65,7 @@ -