filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added new columns into a FileMigrator and etc

Browse Source 
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
This commit is contained in:
Marcin Woźniak
2020-12-26 13:17:39 +01:00
parent 038d0b95d2
commit f51979484f
4 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java
View File

@ -34,26 +34,26 @@ public class Groups {
@ManyToOne
@JoinColumn(name = "lecturer_id")
private Lecturer lecturer;
private String zaj_cyk_id;
private String gr_nr;
private Integer zajCykId;
private Integer grNr;
public Groups() {
}
public String getGr_nr() {
return gr_nr;
public Integer getGr_nr() {
return grNr;
}
public void setGr_nr(String gr_nr) {
this.gr_nr = gr_nr;
public void setGr_nr(Integer grNr) {
this.grNr = grNr;
}
public String getZaj_cyk_id() {
return zaj_cyk_id;
public Integer getZaj_cyk_id() {
return zajCykId;
}
public void setZaj_cyk_id(String zaj_cyk_id) {
this.zaj_cyk_id = zaj_cyk_id;
public void setZaj_cyk_id(Integer zajCykId) {
this.zajCykId = zajCykId;
}
@ -89,13 +89,13 @@ public class Groups {
* @param endTime end time of class in minutes
* @param day day given to the groups
* @param lecturer lecturer given to the groups
* @param zaj_cyk_id number of class in the term
* @param zajCykId number of class in the term
* @param gr_nr Number of class/course
*/
public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer, String zaj_cyk_id, String gr_nr) {
public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer, Integer zajCykId, Integer grNr) {
this(capacity, room, course, time, endTime, day, lecturer);
this.zaj_cyk_id = zaj_cyk_id;
this.gr_nr = gr_nr;
this.zajCykId = zajCykId;
this.grNr = grNr;
}
/**
@ -107,13 +107,13 @@ public class Groups {
* @param time time given to the groups
* @param day day given to the groups
* @param lecturer lecturer given to the groups
* @param zaj_cyk_id number of class in the term
* @param gr_nr Number of class/course
* @param zajCykId number of class in the term
* @param grNr Number of class/course
*/
public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer, String zaj_cyk_id, String gr_nr) {
public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer, Integer zajCykId, Integer grNr) {
this(capacity, room, course, time, time + DEFAULT_CLASS_TIME, day, lecturer);
this.zaj_cyk_id = zaj_cyk_id;
this.gr_nr = gr_nr;
this.zajCykId = zajCykId;
this.grNr = grNr;
}
/**