diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
index 0310b28dd0..91e54841ce 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplate.java
@@ -5,11 +5,13 @@ import se.su.dsv.scipro.report.GradingCriterionTemplate;
import se.su.dsv.scipro.report.GradingReportTemplate;
import java.io.Serializable;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
class EditingGradingTemplate implements Serializable {
private String note;
+ private LocalDate validFrom;
private List<Criteria> criteria;
private GradeLimits gradeLimits;
@@ -31,6 +33,14 @@ class EditingGradingTemplate implements Serializable {
this.note = note;
}
+ public LocalDate getValidFrom() {
+ return validFrom;
+ }
+
+ public void setValidFrom(LocalDate validFrom) {
+ this.validFrom = validFrom;
+ }
+
public GradeLimits getGradeLimits() {
return gradeLimits;
}
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html
index e6d55f0e0d..9737b1e4e4 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.html
@@ -9,6 +9,16 @@
</head>
<body>
<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">
<label class="form-label" wicket:for="note">
Note
diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java
index 99bd10468b..212cc73d5e 100644
--- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java
+++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.java
@@ -17,7 +17,9 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LambdaModel;
import se.su.dsv.scipro.components.AjaxDropDownChoice;
+import se.su.dsv.scipro.components.BootstrapDatePicker;
+import java.time.LocalDate;
import java.util.List;
class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTemplate> {
@@ -27,6 +29,14 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
{
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(
editingGradingTemplateModel,
EditingGradingTemplate::getNote,