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

task/3382: Harmonisera tabellnamn #6

Merged
ansv7779 merged 104 commits from task/3382 into develop 2024-11-12 13:33:44 +01:00
Conversation 6 Commits 104 Files Changed 129 +21 -7
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b073cc2db0 - Show all commits

14
core/src/main/java/se/su/dsv/scipro/finalseminar/FinalSeminarSettings.java
View File

@ -7,6 +7,7 @@ import java.util.Objects;
@Entity @Entity
@Cacheable(true) @Cacheable(true)
@Table(name = "final_seminar_settings")
public class FinalSeminarSettings extends DomainObject { public class FinalSeminarSettings extends DomainObject {
public static final int DEFAULT_DAYS_AHEAD_TO_UPLOAD_THESIS = 10; public static final int DEFAULT_DAYS_AHEAD_TO_UPLOAD_THESIS = 10;
public static final int DEFAULT_DAYS_AHEAD_TO_REGISTER_OPPOSITION = 3; public static final int DEFAULT_DAYS_AHEAD_TO_REGISTER_OPPOSITION = 3;
@ -22,25 +23,26 @@ public class FinalSeminarSettings extends DomainObject {
this.id = id; this.id = id;
} }
@Basic(optional = false) @Column(name = "days_ahead_to_create", nullable = false)
private int daysAheadToCreate; private int daysAheadToCreate;
@Basic(optional = false) @Column(name = "days_ahead_to_register_participation", nullable = false)
private int daysAheadToRegisterParticipation = DEFAULT_DAYS_AHEAD_TO_REGISTER_PARTICIPATION; private int daysAheadToRegisterParticipation = DEFAULT_DAYS_AHEAD_TO_REGISTER_PARTICIPATION;
@Basic(optional = false) @Column(name = "days_ahead_to_register_opposition", nullable = false)
private int daysAheadToRegisterOpposition = DEFAULT_DAYS_AHEAD_TO_REGISTER_OPPOSITION; private int daysAheadToRegisterOpposition = DEFAULT_DAYS_AHEAD_TO_REGISTER_OPPOSITION;
@Basic(optional = false) @Column(name = "days_ahead_to_upload_thesis", nullable = false)
private int daysAheadToUploadThesis = DEFAULT_DAYS_AHEAD_TO_UPLOAD_THESIS; private int daysAheadToUploadThesis = DEFAULT_DAYS_AHEAD_TO_UPLOAD_THESIS;
@Basic(optional = false) @Column(name = "thesis_must_be_pdf", nullable = false)
private boolean thesisMustBePDF = false; private boolean thesisMustBePDF = false;
@Basic(optional = true) @Column(name = "evaluation_url", nullable = true)
private String evaluationURL; private String evaluationURL;
@Basic(optional = false) @Basic(optional = false)
@Column(name = "opposition_priority_days", nullable = false)
private int oppositionPriorityDays; private int oppositionPriorityDays;
public boolean getThesisMustBePDF() { public boolean getThesisMustBePDF() {

14
core/src/main/resources/db/migration/V388__harmonize_table_attribute_name.sql
View File

@ -391,4 +391,16 @@ alter table `urkund_settings` rename column `username` to `user_name`;
alter table `reviewer_deadline_settings` rename column `roughDraftApproval` to `rough_draft_approval`; alter table `reviewer_deadline_settings` rename column `roughDraftApproval` to `rough_draft_approval`;
alter table `reviewer_deadline_settings` rename column `finalSeminarApproval` to `final_seminar_approval`; alter table `reviewer_deadline_settings` rename column `finalSeminarApproval` to `final_seminar_approval`;
alter table `reviewer_deadline_settings` rename column `finalGrading` to `final_grading`; alter table `reviewer_deadline_settings` rename column `finalGrading` to `final_grading`;
-- table: final_seminar_settings
alter table `FinalSeminarSettings` rename column `daysAheadToCreate` to `days_ahead_to_create`;
alter table `FinalSeminarSettings` rename column `daysAheadToRegisterParticipation` to `days_ahead_to_register_participation`;
alter table `FinalSeminarSettings` rename column `daysAheadToRegisterOpposition` to `days_ahead_to_register_opposition`;
alter table `FinalSeminarSettings` rename column `daysAheadToUploadThesis` to `days_ahead_to_upload_thesis`;
alter table `FinalSeminarSettings` rename column `thesisMustBePDF` to `thesis_must_be_pdf`;
alter table `FinalSeminarSettings` rename column `evaluationURL` to `evaluation_url`;
alter table `FinalSeminarSettings` rename column `oppositionPriorityDays` to `opposition_priority_days`;
rename table `FinalSeminarSettings` to `final_seminar_settings`;