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 +30
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a02291897e - Show all commits

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

@ -5,11 +5,13 @@ import se.su.dsv.scipro.report.GradingCriterionTemplate;
import se.su.dsv.scipro.report.GradingReportTemplate; import se.su.dsv.scipro.report.GradingReportTemplate;
import java.io.Serializable; import java.io.Serializable;
import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
class EditingGradingTemplate implements Serializable { class EditingGradingTemplate implements Serializable {
private String note; private String note;
private LocalDate validFrom;
private List<Criteria> criteria; private List<Criteria> criteria;
private GradeLimits gradeLimits; private GradeLimits gradeLimits;
@ -31,6 +33,14 @@ class EditingGradingTemplate implements Serializable {
this.note = note; this.note = note;
} }
public LocalDate getValidFrom() {
return validFrom;
}
public void setValidFrom(LocalDate validFrom) {
this.validFrom = validFrom;
}
public GradeLimits getGradeLimits() { public GradeLimits getGradeLimits() {
return gradeLimits; return gradeLimits;
} }

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

@ -9,6 +9,16 @@
</head> </head>
<body> <body>
<wicket:panel> <wicket:panel>
<div class="mb-3 line-length-limit">
<label class="form-label" wicket:for="valid_from">
Valid from
</label>
<input type="text" class="form-control" wicket:id="valid_from">
<small class="text-muted">
When does this grading template take effect.
</small>
</div>
<div class="mb-3 line-length-limit"> <div class="mb-3 line-length-limit">
<label class="form-label" wicket:for="note"> <label class="form-label" wicket:for="note">
Note Note

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

@ -17,7 +17,9 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel; import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel; import org.apache.wicket.model.LambdaModel;
import se.su.dsv.scipro.components.AjaxDropDownChoice; import se.su.dsv.scipro.components.AjaxDropDownChoice;
import se.su.dsv.scipro.components.BootstrapDatePicker;
import java.time.LocalDate;
import java.util.List; import java.util.List;
class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTemplate> { class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTemplate> {
@ -27,6 +29,14 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
{ {
super(id, editingGradingTemplateModel); super(id, editingGradingTemplateModel);
TextField<LocalDate> validFromField = new TextField<>("valid_from",
LambdaModel.of(editingGradingTemplateModel,
EditingGradingTemplate::getValidFrom,
EditingGradingTemplate::setValidFrom),
LocalDate.class);
validFromField.add(new BootstrapDatePicker());
add(validFromField);
add(new TextArea<>("note", LambdaModel.of( add(new TextArea<>("note", LambdaModel.of(
editingGradingTemplateModel, editingGradingTemplateModel,
EditingGradingTemplate::getNote, EditingGradingTemplate::getNote,