#21 -- Fix new report indicators
This commit is contained in:
parent
97fff815df
commit
56fea5eeb3
@ -42,6 +42,11 @@ public class ReportService {
|
|||||||
Report report;
|
Report report;
|
||||||
if (reportDto.getId() == null || reportDto.getId() == 0) {
|
if (reportDto.getId() == null || reportDto.getId() == 0) {
|
||||||
report = new Report();
|
report = new Report();
|
||||||
|
report.setValues(aspirantService.getCurrentAspirantIndicators().stream().map(i -> {
|
||||||
|
ReportValue rv = new ReportValue();
|
||||||
|
rv.setIndicator(i);
|
||||||
|
return rv;
|
||||||
|
}).toList());
|
||||||
} else {
|
} else {
|
||||||
report = getReportById(reportDto.getId());
|
report = getReportById(reportDto.getId());
|
||||||
}
|
}
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row" sec:authorize="hasAnyRole('ROLE_ADMIN', 'ROLE_MANAGER', ROLE_HEAD)">
|
<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>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user