DMC/scipro
7
0
Fork 0
Code Issues 23 Pull Requests 2 Actions Projects 1 Releases Wiki Activity

3494-UI-improvements-grading-templates #21

Merged
ansv7779 merged 17 commits from 3494-UI-improvements-grading-templates into develop 2024-11-26 10:18:55 +01:00
Conversation 3 Commits 17 Files Changed 8 +16 -1
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4991719048 - Show all commits

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

@ -16,6 +16,7 @@ class EditingGradingTemplate implements Serializable {
private LocalDate validFrom; private LocalDate validFrom;
private List<Criteria> criteria; private List<Criteria> criteria;
private GradeLimits gradeLimits; private GradeLimits gradeLimits;
private String projectType;
public EditingGradingTemplate() { public EditingGradingTemplate() {
this.gradeLimits = new GradeLimits(); this.gradeLimits = new GradeLimits();
@ -41,6 +42,7 @@ class EditingGradingTemplate implements Serializable {
Criteria editingCriteria = new Criteria(criteria); Criteria editingCriteria = new Criteria(criteria);
this.criteria.add(editingCriteria); this.criteria.add(editingCriteria);
} }
this.projectType = template.getProjectType().getName();
} }
public String getNote() { public String getNote() {
@ -81,13 +83,18 @@ class EditingGradingTemplate implements Serializable {
this.criteria.add(new Criteria()); this.criteria.add(new Criteria());
} }
public String getProjectType() {
return projectType;
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
return o instanceof EditingGradingTemplate that return o instanceof EditingGradingTemplate that
&& Objects.equals(note, that.note) && Objects.equals(note, that.note)
&& Objects.equals(validFrom, that.validFrom) && Objects.equals(validFrom, that.validFrom)
&& Objects.equals(criteria, that.criteria) && Objects.equals(criteria, that.criteria)
&& Objects.equals(gradeLimits, that.gradeLimits); && Objects.equals(gradeLimits, that.gradeLimits)
&& Objects.equals(projectType, that.projectType);
} }
@Override @Override

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

@ -9,6 +9,12 @@
</head> </head>
<body> <body>
<wicket:panel> <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"> <div class="mb-3 line-length-limit">
<label class="form-label" wicket:for="valid_from"> <label class="form-label" wicket:for="valid_from">
Valid from Valid from

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

@ -30,6 +30,7 @@ class EditingGradingTemplateComponentPanel extends GenericPanel<EditingGradingTe
setOutputMarkupId(true); setOutputMarkupId(true);
add(new Label("project_type_name", editingGradingTemplateModel.map(EditingGradingTemplate::getProjectType)));
TextField<LocalDate> validFromField = new RequiredTextField<>("valid_from", TextField<LocalDate> validFromField = new RequiredTextField<>("valid_from",
LambdaModel.of(editingGradingTemplateModel, LambdaModel.of(editingGradingTemplateModel,
EditingGradingTemplate::getValidFrom, EditingGradingTemplate::getValidFrom,

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

@ -11,3 +11,4 @@ Type.INDIVIDUAL=Individually for each author
minimum.Required=You must set the minimum number of points for each grade minimum.Required=You must set the minimum number of points for each grade
grade.Required=You must set the letter for each grade grade.Required=You must set the letter for each grade
flag.nullValid=None flag.nullValid=None
project_type_name_editing=You are editing a ${project_type_name} grading template.