DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 4 Actions Projects 1 Wiki Activity

Allows admins to manage grading report templates #14

Merged
niat8586 merged 41 commits from 3482-new-grading-criteria into develop 2024-10-30 10:05:23 +01:00
Conversation 4 Commits 41 Files Changed 69 +3 -5
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1756c9829e - Show all commits

2
view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplateEditPage.java
View File

@ -66,7 +66,7 @@ public class AdminGradingTemplateEditPage extends AbstractAdminProjectPage imple
add(form); add(form);
} }
public static GradingReportTemplateUpdate toUpdate(EditingGradingTemplate editingGradingTemplate) { static GradingReportTemplateUpdate toUpdate(EditingGradingTemplate editingGradingTemplate) {
List<GradingReportTemplateUpdate.GradeLimit> gradeLimits = editingGradingTemplate List<GradingReportTemplateUpdate.GradeLimit> gradeLimits = editingGradingTemplate
.getGradeLimits() .getGradeLimits()
.getGradeLimits() .getGradeLimits()

3
view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatePage.java
View File

@ -87,8 +87,7 @@ public class AdminGradingTemplatePage extends AbstractAdminProjectPage implement
} }
private List<GradingCriterionTemplate> getCriteria(GradingReportTemplate gradingReportTemplate) { private List<GradingCriterionTemplate> getCriteria(GradingReportTemplate gradingReportTemplate) {
ArrayList<GradingCriterionTemplate> criteria = new ArrayList<>(); ArrayList<GradingCriterionTemplate> criteria = new ArrayList<>(gradingReportTemplate.getCriteria());
gradingReportTemplate.getCriteria().forEach(criteria::add);
criteria.sort(Comparator.comparing(GradingCriterionTemplate::getSortOrder)); criteria.sort(Comparator.comparing(GradingCriterionTemplate::getSortOrder));
return Collections.unmodifiableList(criteria); return Collections.unmodifiableList(criteria);
} }

1
view/src/main/java/se/su/dsv/scipro/admin/pages/grading/AdminGradingTemplatesOverviewPage.java
View File

@ -8,7 +8,6 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel; import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import se.su.dsv.scipro.admin.pages.AbstractAdminProjectPage; import se.su.dsv.scipro.admin.pages.AbstractAdminProjectPage;
import se.su.dsv.scipro.components.NonEmptyLabel; import se.su.dsv.scipro.components.NonEmptyLabel;
import se.su.dsv.scipro.grading.GradingReportTemplateService; import se.su.dsv.scipro.grading.GradingReportTemplateService;

2
view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
View File

@ -86,7 +86,7 @@ class EditingGradingTemplate implements Serializable {
this.titleEn = criteria.getTitleEn(); this.titleEn = criteria.getTitleEn();
this.pointsRequiredToPass = criteria.getPointsRequiredToPass(); this.pointsRequiredToPass = criteria.getPointsRequiredToPass();
for (var point : criteria.getGradingCriterionPointTemplates()) { for (var point : criteria.getGradingCriterionPointTemplates()) {
if (point.getPoint() == 0) continue;; if (point.getPoint() == 0) continue;
Point editingPoint = new Point(point); Point editingPoint = new Point(point);
this.points.add(editingPoint); this.points.add(editingPoint);
} }