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

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

@ -115,7 +115,7 @@
</fieldset> </fieldset>
</li> </li>
<li> <li>
<div class="row align-items-center" wicket:id="new_point_form"> <div class="row align-items-center">
<label class="col-auto"> <label class="col-auto">
<wicket:container wicket:id="new_point"/> <wicket:container wicket:id="new_point"/>
</label> </label>

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

@ -3,11 +3,9 @@ package se.su.dsv.scipro.admin.pages.grading;
import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.markup.html.GenericWebMarkupContainer; import org.apache.wicket.markup.html.GenericWebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.EnumChoiceRenderer; import org.apache.wicket.markup.html.form.EnumChoiceRenderer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.NumberTextField; import org.apache.wicket.markup.html.form.NumberTextField;
import org.apache.wicket.markup.html.form.RequiredTextField; import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.markup.html.form.TextArea;
@ -117,16 +115,13 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
} }
}); });
Form<Object> newPointForm = new Form<>("new_point_form"); add(new Label("new_point", model
add(newPointForm);
newPointForm.add(new Label("new_point", model
.map(criteria -> criteria.getPoints().size()) .map(criteria -> criteria.getPoints().size())
.map(size -> "Requirement for " + (size + 1) + " points"))); .map(size -> "Requirement for " + (size + 1) + " points")));
newPointForm.add(new AjaxSubmitLink("add_new_point", newPointForm) { add(new AjaxLink<>("add_new_point") {
@Override @Override
public void onSubmit(AjaxRequestTarget target) { public void onClick(AjaxRequestTarget target) {
EditingGradingTemplate.Criteria criteria = model.getObject(); EditingGradingTemplate.Criteria criteria = model.getObject();
EditingGradingTemplate.Criteria.Point newPoint = criteria.new Point(); EditingGradingTemplate.Criteria.Point newPoint = criteria.new Point();
criteria.getPoints().add(newPoint); criteria.getPoints().add(newPoint);