diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java b/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java index 3aecce0..725d126 100755 --- a/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java +++ b/buisnesslogic/src/main/java/com/plannaplan/entities/Groups.java @@ -34,10 +34,29 @@ public class Groups { @ManyToOne @JoinColumn(name = "lecturer_id") private Lecturer lecturer; + private String zaj_cyk_id; + private String gr_nr; public Groups() { } + public String getGr_nr() { + return gr_nr; + } + + public void setGr_nr(String gr_nr) { + this.gr_nr = gr_nr; + } + + public String getZaj_cyk_id() { + return zaj_cyk_id; + } + + public void setZaj_cyk_id(String zaj_cyk_id) { + this.zaj_cyk_id = zaj_cyk_id; + } + + /** * Groups * @@ -60,6 +79,43 @@ public class Groups { this.type = capacity >= 50 ? GroupType.LECTURE : GroupType.CLASS; } + /** + * Groups + * + * @param capacity capacity given to the groups + * @param room room given to the groups + * @param course course given to the groups + * @param time time given to the 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 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) { + this(capacity, room, course, time, endTime, day, lecturer); + this.zaj_cyk_id = zaj_cyk_id; + this.gr_nr = gr_nr; + } + + /** + * Groups + * + * @param capacity capacity given to the groups + * @param room room given to the groups + * @param course course given to the 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 + */ + public Groups(int capacity, String room, Course course, int time, WeekDay day, Lecturer lecturer, String zaj_cyk_id, String gr_nr) { + this(capacity, room, course, time, time + DEFAULT_CLASS_TIME, day, lecturer); + this.zaj_cyk_id = zaj_cyk_id; + this.gr_nr = gr_nr; + } + /** * Create groups with default class duration * diff --git a/buisnesslogic/src/test/resources/Zajecia.xlsx b/buisnesslogic/src/test/resources/Zajecia.xlsx index 91d7f5e..71e0ba7 100755 Binary files a/buisnesslogic/src/test/resources/Zajecia.xlsx and b/buisnesslogic/src/test/resources/Zajecia.xlsx differ diff --git a/restservice/src/main/resources/Zajecia.xlsx b/restservice/src/main/resources/Zajecia.xlsx index 91d7f5e..71e0ba7 100755 Binary files a/restservice/src/main/resources/Zajecia.xlsx and b/restservice/src/main/resources/Zajecia.xlsx differ diff --git a/restservice/src/test/resources/Zajecia.xlsx b/restservice/src/test/resources/Zajecia.xlsx index 91d7f5e..71e0ba7 100755 Binary files a/restservice/src/test/resources/Zajecia.xlsx and b/restservice/src/test/resources/Zajecia.xlsx differ