DMC/scipro
7
0
Fork 0
Code Issues45 Pull Requests7 Actions Projects1 Releases Wiki Activity

2984 Correct language of the criteria title/descriptions

Browse Source
This commit is contained in:
Andreas Svanberg 2023-09-13 09:39:42 +02:00
parent 0730798f53
commit 19efe7b343
1 changed files with 15 additions and 6 deletions

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

@ -50,7 +50,7 @@ public class GradingReportServiceImpl extends AbstractServiceImpl<GradingReport,
List<GradingBasis.Assessment> assessment = supervisorGradingReport.getProjectCriteria()
.stream()
.sorted(Comparator.comparing(GradingCriterion::getSortOrder))
.map(this::toAssessment)
.map(gc -> toAssessment(supervisorGradingReport.isSwedish(), gc))
.toList();
return new GradingBasis(
assessment,
@ -79,18 +79,27 @@ public class GradingReportServiceImpl extends AbstractServiceImpl<GradingReport,
return getGradingBasis(project);
}
private GradingBasis.Assessment toAssessment(GradingCriterion gc) {
private GradingBasis.Assessment toAssessment(
boolean isSwedish,
GradingCriterion gc) {
List<GradingBasis.Criterion.Requirement> requirements = gc.getGradingCriterionPoints()
.stream()
.sorted(Comparator.comparing(GradingCriterionPoint::getPoint))
.map(this::toRequirement)
.map(gcp -> toRequirement(isSwedish, gcp))
.toList();
GradingBasis.Criterion criterion = new GradingBasis.Criterion(gc.getTitle(), requirements, gc.getPointsRequiredToPass());
String title = isSwedish ? gc.getTitle() : gc.getTitleEn();
GradingBasis.Criterion criterion = new GradingBasis.Criterion(title, requirements, gc.getPointsRequiredToPass());
return new GradingBasis.Assessment(criterion, gc.getPoints());
}
private GradingBasis.Criterion.Requirement toRequirement(GradingCriterionPoint gcp) {
return new GradingBasis.Criterion.Requirement(gcp.getPoint(), gcp.getDescription());
private GradingBasis.Criterion.Requirement toRequirement(
boolean isSwedish,
GradingCriterionPoint gcp)
{
String description = isSwedish ? gcp.getDescription() : gcp.getDescriptionEn();
return new GradingBasis.Criterion.Requirement(
gcp.getPoint(),
description);
}
@Override