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 04f6402920..1202d83137 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 @@ -16,6 +16,7 @@ class EditingGradingTemplate implements Serializable { private LocalDate validFrom; private List<Criteria> criteria; private GradeLimits gradeLimits; + private String projectType; public EditingGradingTemplate() { this.gradeLimits = new GradeLimits(); @@ -41,6 +42,7 @@ class EditingGradingTemplate implements Serializable { Criteria editingCriteria = new Criteria(criteria); this.criteria.add(editingCriteria); } + this.projectType = template.getProjectType().getName(); } public String getNote() { @@ -81,13 +83,18 @@ class EditingGradingTemplate implements Serializable { this.criteria.add(new Criteria()); } + public String getProjectType() { + return projectType; + } + @Override public boolean equals(Object o) { return o instanceof EditingGradingTemplate that && Objects.equals(note, that.note) && Objects.equals(validFrom, that.validFrom) && Objects.equals(criteria, that.criteria) - && Objects.equals(gradeLimits, that.gradeLimits); + && Objects.equals(gradeLimits, that.gradeLimits) + && Objects.equals(projectType, that.projectType); } @Override 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 80952a8f02..f4ea4e67dc 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,12 @@ </head> <body> <wicket:panel> + <div class="mb-3 lead"> + <wicket:message key="project_type_name_editing"> + <span wicket:id="project_type_name"></span> + </wicket:message> + </div> + <div class="mb-3 line-length-limit"> <label class="form-label" wicket:for="valid_from"> Valid from 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 5980e6834c..6c28a46bde 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 @@ -30,6 +30,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe setOutputMarkupId(true); + add(new Label("project_type_name", editingGradingTemplateModel.map(EditingGradingTemplate::getProjectType))); TextField<LocalDate> validFromField = new RequiredTextField<>("valid_from", LambdaModel.of(editingGradingTemplateModel, EditingGradingTemplate::getValidFrom, diff --git a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.utf8.properties b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.utf8.properties index 6315499c53..db27aba41e 100644 --- a/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.utf8.properties +++ b/view/src/main/java/se/su/dsv/scipro/admin/pages/grading/EditingGradingTemplateComponentPanel.utf8.properties @@ -11,3 +11,4 @@ Type.INDIVIDUAL=Individually for each author minimum.Required=You must set the minimum number of points for each grade grade.Required=You must set the letter for each grade flag.nullValid=None +project_type_name_editing=You are editing a ${project_type_name} grading template.