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

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

@ -47,7 +47,7 @@
<li wicket:id="points"> <li wicket:id="points">
<fieldset wicket:id="point" class="card mb-3"> <fieldset wicket:id="point" class="card mb-3">
<legend class="card-header hstack justify-content-between"> <legend class="card-header hstack justify-content-between">
<span wicket:id="point"></span> <span>Requirement for <span wicket:id="point"></span> point(s)</span>
<button class="btn btn-sm btn-outline-danger" wicket:id="remove">Remove</button> <button class="btn btn-sm btn-outline-danger" wicket:id="remove">Remove</button>
</legend> </legend>
<div class="card-body"> <div class="card-body">

12
view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java
View File

@ -69,7 +69,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
add(new ListView<>("points", model.map(EditingGradingTemplate.Criteria::getPoints)) { add(new ListView<>("points", model.map(EditingGradingTemplate.Criteria::getPoints)) {
@Override @Override
protected void populateItem(ListItem<EditingGradingTemplate.Criteria.Point> item) { protected void populateItem(ListItem<EditingGradingTemplate.Criteria.Point> item) {
item.add(new PointEditingPanel("point", item.getModel())); item.add(new PointEditingPanel("point", item));
} }
}); });
@ -78,7 +78,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
newPointForm.add(new Label("new_point", model newPointForm.add(new Label("new_point", model
.map(criteria -> criteria.getPoints().size()) .map(criteria -> criteria.getPoints().size())
.map(size -> "Requirement for " + size + " points"))); .map(size -> "Requirement for " + (size + 1) + " points")));
newPointForm.add(new AjaxSubmitLink("add_new_point", newPointForm) { newPointForm.add(new AjaxSubmitLink("add_new_point", newPointForm) {
@Override @Override
@ -92,10 +92,12 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
} }
private class PointEditingPanel extends GenericWebMarkupContainer<EditingGradingTemplate.Criteria.Point> { private class PointEditingPanel extends GenericWebMarkupContainer<EditingGradingTemplate.Criteria.Point> {
public PointEditingPanel(String id, IModel<EditingGradingTemplate.Criteria.Point> model) { public PointEditingPanel(String id, ListItem<EditingGradingTemplate.Criteria.Point> item) {
super(id, model); super(id, item.getModel());
add(new Label("point", "Requirement for 1 point")); IModel<EditingGradingTemplate.Criteria.Point> model = item.getModel();
add(new Label("point", () -> item.getIndex() + 1));
add(new TextArea<>("requirement_en", LambdaModel.of( add(new TextArea<>("requirement_en", LambdaModel.of(
model, model,