DMC/scipro
7
0
Fork 0
Code Issues 32 Pull Requests 3 Actions Projects 1 Wiki Activity

Fix intermittent sorting of criterion to actual order #18

Merged
tozh4728 merged 2 commits from 3495-grading-report-template-random-order into develop 2024-11-14 12:39:42 +01:00
Conversation 2 Commits 2 Files Changed 1 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0af4e538a1 - Show all commits

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

@ -10,6 +10,7 @@ import jakarta.persistence.Id;
import jakarta.persistence.JoinColumn; import jakarta.persistence.JoinColumn;
import jakarta.persistence.OneToMany; import jakarta.persistence.OneToMany;
import jakarta.persistence.OneToOne; import jakarta.persistence.OneToOne;
import jakarta.persistence.OrderBy;
import jakarta.persistence.Table; import jakarta.persistence.Table;
import jakarta.persistence.Temporal; import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType; import jakarta.persistence.TemporalType;
@ -22,7 +23,6 @@ import se.su.dsv.scipro.system.User;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -62,7 +62,8 @@ public class GradingReportTemplate extends DomainObject {
// JPA-mappings of other tables referencing to this table "grading_report_template" // JPA-mappings of other tables referencing to this table "grading_report_template"
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
@OneToMany(mappedBy = "gradingReportTemplate", cascade = {CascadeType.ALL}, orphanRemoval = true) @OneToMany(mappedBy = "gradingReportTemplate", cascade = {CascadeType.ALL}, orphanRemoval = true)
private Collection<GradingCriterionTemplate> criteria = new HashSet<>(); @OrderBy("sortOrder ASC")
private List<GradingCriterionTemplate> criteria = new ArrayList<>();
@OneToMany(cascade = CascadeType.ALL, orphanRemoval = true) @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "grading_report_template_id", referencedColumnName = "id") @JoinColumn(name = "grading_report_template_id", referencedColumnName = "id")