romanov73/seminar
1
0
Fork 0
Code Issues 9 Pull Requests 1 Projects Releases 1 Wiki Activity

#21 -- Fix status

Browse Source
This commit is contained in:
Anton Romanov 2025-04-15 23:13:46 +04:00
parent a4307ea5a0
commit 28c6db4c21
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ru/ulstu/report/controller/ReportValueController.java
View File

@ -7,7 +7,6 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import ru.ulstu.aspirant.service.AspirantService;
import ru.ulstu.report.model.dto.ReportValueDto; import ru.ulstu.report.model.dto.ReportValueDto;
import ru.ulstu.report.service.ReportValueService; import ru.ulstu.report.service.ReportValueService;
@ -17,11 +16,9 @@ import java.io.IOException;
@RequestMapping("report-value") @RequestMapping("report-value")
public class ReportValueController { public class ReportValueController {
private final ReportValueService reportValueService; private final ReportValueService reportValueService;
private final AspirantService aspirantService;
public ReportValueController(ReportValueService reportValueService, AspirantService aspirantService) { public ReportValueController(ReportValueService reportValueService) {
this.reportValueService = reportValueService; this.reportValueService = reportValueService;
this.aspirantService = aspirantService;
} }
@GetMapping("edit-report-value/{reportId}/{indicatorId}") @GetMapping("edit-report-value/{reportId}/{indicatorId}")
@ -30,6 +27,7 @@ public class ReportValueController {
Model model) { Model model) {
model.addAttribute("reportValue", reportValueService.getByIndicatorId(reportId, indicatorId)); model.addAttribute("reportValue", reportValueService.getByIndicatorId(reportId, indicatorId));
model.addAttribute("canEdit", reportValueService.canEdit(reportId)); model.addAttribute("canEdit", reportValueService.canEdit(reportId));
model.addAttribute("status", reportValueService.getStatus(reportId));
return "report/editReportValue"; return "report/editReportValue";
} }

5
src/main/java/ru/ulstu/report/service/ReportValueService.java
View File

@ -4,6 +4,7 @@ import org.springframework.stereotype.Service;
import ru.ulstu.file.model.FileData; import ru.ulstu.file.model.FileData;
import ru.ulstu.file.service.FileService; import ru.ulstu.file.service.FileService;
import ru.ulstu.indicator.service.IndicatorService; import ru.ulstu.indicator.service.IndicatorService;
import ru.ulstu.report.model.ReportStatus;
import ru.ulstu.report.model.ReportValue; import ru.ulstu.report.model.ReportValue;
import ru.ulstu.report.model.dto.ReportValueDto; import ru.ulstu.report.model.dto.ReportValueDto;
import ru.ulstu.report.repository.ReportValueRepository; import ru.ulstu.report.repository.ReportValueRepository;
@ -73,4 +74,8 @@ public class ReportValueService {
public boolean canEdit(Integer reportId) { public boolean canEdit(Integer reportId) {
return reportService.getReportById(reportId).getAspirant().getUser().equals(userService.getCurrentUser()); return reportService.getReportById(reportId).getAspirant().getUser().equals(userService.getCurrentUser());
} }
public ReportStatus getStatus(Integer reportId) {
return reportService.getReportById(reportId).getStatus();
}
} }

2
src/main/resources/templates/report/editReportValue.html
View File

@ -65,7 +65,7 @@
</div> </div>
</div> </div>
<div class="row" sec:authorize="hasRole('ROLE_MANAGER')"> <div class="row" sec:authorize="hasAnyRole('ROLE_ADMIN', 'ROLE_MANAGER', ROLE_HEAD)">
<div class="col col-md-6"> <div class="col col-md-6">
<div class="form-group"> <div class="form-group">
<label for="val" class="form-label">Получаемый балл</label> <label for="val" class="form-label">Получаемый балл</label>