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

24
core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplate.java
View File

@ -32,6 +32,14 @@ public class GradingReportTemplate extends DomainObject {
@Column(name = "valid_from")
private LocalDate validFrom;
@Basic
@Column(name = "note")
private String note;
@Basic
@Column(name = "failing_grade")
private String failingGrade;
protected GradingReportTemplate() {
}
@ -92,6 +100,22 @@ public class GradingReportTemplate extends DomainObject {
this.projectType = projectType;
}
public String getNote() {
return note;
}
public void setNote(String note) {
this.note = note;
}
public String getFailingGrade() {
return failingGrade;
}
public void setFailingGrade(String failingGrade) {
this.failingGrade = failingGrade;
}
@Override
public boolean equals(final Object o) {
if (o == this) return true;

2
core/src/main/java/se/su/dsv/scipro/report/GradingReportTemplateRepoImpl.java
View File

@ -66,6 +66,8 @@ public class GradingReportTemplateRepoImpl extends GenericRepo<GradingReportTemp
public GradingReportTemplate updateTemplate(long templateId, GradingReportTemplateUpdate update) {
GradingReportTemplate gradingReportTemplate = findOne(templateId);
gradingReportTemplate.setValidFrom(update.validFrom());
gradingReportTemplate.setNote(update.note());
gradingReportTemplate.setFailingGrade(update.failingGrade());
gradingReportTemplate.getCriteria().clear();
for (var criteria : update.criteria()) {

3
core/src/main/resources/db/migration/V390__failing_grade_and_note_on_templates.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE `grading_report_template`
ADD COLUMN `note` TEXT,
ADD COLUMN `failing_grade` VARCHAR(32);

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

@ -16,9 +16,9 @@ class EditingGradingTemplate implements Serializable {
private GradeLimits gradeLimits;
EditingGradingTemplate(GradingReportTemplate template) {
this.note = "";
this.note = template.getNote();
this.validFrom = template.getValidFrom();
this.gradeLimits = new GradeLimits();
this.gradeLimits = new GradeLimits(template);
this.criteria = new ArrayList<>();
for (var criteria : template.getCriteria()) {
Criteria editingCriteria = new Criteria(criteria);

5
view/src/main/java/se/su/dsv/scipro/admin/pages/grading/GradeLimits.java
View File

@ -1,5 +1,7 @@
package se.su.dsv.scipro.admin.pages.grading;
import se.su.dsv.scipro.report.GradingReportTemplate;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@ -8,8 +10,9 @@ class GradeLimits implements Serializable {
private List<GradeLimit> gradeLimits;
private String failingGrade;
GradeLimits() {
GradeLimits(GradingReportTemplate template) {
this.gradeLimits = new ArrayList<>();
this.failingGrade = template.getFailingGrade();
}
void addNewLimit() {