DMC/scipro
7
0
Fork 0
Code Issues 33 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 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6bcf7dce3f - Show all commits

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

@ -41,7 +41,7 @@ public class AdminGradingTemplatesOverviewPage extends AbstractAdminProjectPage
IModel<GradingReportTemplate> currentTemplate = model.map(gradingReportTemplateService::getCurrentTemplate); IModel<GradingReportTemplate> currentTemplate = model.map(gradingReportTemplateService::getCurrentTemplate);
add(new Label("valid_from", currentTemplate.map(GradingReportTemplate::getValidFrom))); add(new Label("valid_from", currentTemplate.map(GradingReportTemplate::getValidFrom)));
add(new NonEmptyLabel("note", Model.of(""))); add(new NonEmptyLabel("note", currentTemplate.map(GradingReportTemplate::getNote)));
add(new BookmarkablePageLink<>("view_template", AdminGradingTemplatePage.class, AdminGradingTemplatePage.getPageParameters(currentTemplate.getObject()))); add(new BookmarkablePageLink<>("view_template", AdminGradingTemplatePage.class, AdminGradingTemplatePage.getPageParameters(currentTemplate.getObject())));
IModel<List<GradingReportTemplate>> upcomingTemplates = model.map(gradingReportTemplateService::getUpcomingTemplates); IModel<List<GradingReportTemplate>> upcomingTemplates = model.map(gradingReportTemplateService::getUpcomingTemplates);
@ -49,7 +49,7 @@ public class AdminGradingTemplatesOverviewPage extends AbstractAdminProjectPage
@Override @Override
protected void populateItem(ListItem<GradingReportTemplate> item) { protected void populateItem(ListItem<GradingReportTemplate> item) {
item.add(new Label("valid_from", item.getModel().map(GradingReportTemplate::getValidFrom))); item.add(new Label("valid_from", item.getModel().map(GradingReportTemplate::getValidFrom)));
item.add(new NonEmptyLabel("note", Model.of(""))); item.add(new NonEmptyLabel("note", item.getModel().map(GradingReportTemplate::getNote)));
item.add(new BookmarkablePageLink<>("edit_template", AdminGradingTemplateEditPage.class, AdminGradingTemplateEditPage.getPageParameters(item.getModelObject()))); item.add(new BookmarkablePageLink<>("edit_template", AdminGradingTemplateEditPage.class, AdminGradingTemplateEditPage.getPageParameters(item.getModelObject())));
} }
}); });