DMC/scipro
7
0
Fork 0
Code Issues42 Pull Requests4 Actions Projects1 Releases Wiki Activity

2984 Fix saving problem with grading basis

Browse Source
This commit is contained in:
Andreas Svanberg 2023-10-12 20:17:18 +02:00
parent 3ccd2b49c5
commit 73bd111a63
1 changed files with 7 additions and 2 deletions

9
core/src/main/java/se/su/dsv/scipro/report/GradingReportServiceImpl.java

@ -78,7 +78,8 @@ public class GradingReportServiceImpl extends AbstractServiceImpl<GradingReport,
for (SupervisorGradingReport supervisorGradingReport : supervisorGradingReports) {
for (GradingCriterion projectCriterion : supervisorGradingReport.getProjectCriteria()) {
for (GradingBasis.Assessment assessment : gradingBasis.criteria()) {
if (Objects.equals(assessment.criterion().title(), projectCriterion.getTitle())) {
String title = getTitle(supervisorGradingReport.isSwedish(), projectCriterion);
if (Objects.equals(assessment.criterion().title(), title)) {
projectCriterion.setPoints(assessment.getPoints());
}
}
@ -98,11 +99,15 @@ public class GradingReportServiceImpl extends AbstractServiceImpl<GradingReport,
.sorted(Comparator.comparing(GradingCriterionPoint::getPoint))
.map(gcp -> toRequirement(isSwedish, gcp))
.toList();
String title = isSwedish ? gc.getTitle() : gc.getTitleEn();
String title = getTitle(isSwedish, gc);
GradingBasis.Criterion criterion = new GradingBasis.Criterion(title, requirements, gc.getPointsRequiredToPass());
return new GradingBasis.Assessment(criterion, gc.getPoints());
}
private static String getTitle(boolean isSwedish, GradingCriterion gc) {
return isSwedish ? gc.getTitle() : gc.getTitleEn();
}
private GradingBasis.Criterion.Requirement toRequirement(
boolean isSwedish,
GradingCriterionPoint gcp)