Change update function and added new contrutor in the Groups
This commit is contained in:
parent
fe06243bda
commit
8c0b880412
@ -11,6 +11,7 @@ import javax.persistence.Id;
|
|||||||
import javax.persistence.JoinColumn;
|
import javax.persistence.JoinColumn;
|
||||||
import javax.persistence.ManyToMany;
|
import javax.persistence.ManyToMany;
|
||||||
import javax.persistence.ManyToOne;
|
import javax.persistence.ManyToOne;
|
||||||
|
import javax.swing.GroupLayout.Group;
|
||||||
|
|
||||||
import com.plannaplan.types.GroupType;
|
import com.plannaplan.types.GroupType;
|
||||||
import com.plannaplan.types.WeekDay;
|
import com.plannaplan.types.WeekDay;
|
||||||
@ -96,6 +97,26 @@ public class Groups {
|
|||||||
this.type = capacity >= 50 ? GroupType.LECTURE : GroupType.CLASS;
|
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 zajCykId number of class in the term
|
||||||
|
* @param grNr Number of class/course
|
||||||
|
* @param type type of class/cource
|
||||||
|
*/
|
||||||
|
public Groups(int capacity, String room, Course course, int time, int endTime, WeekDay day, Lecturer lecturer,
|
||||||
|
Integer zajCykId, Integer grNr, GroupType type) {
|
||||||
|
this(capacity, room, course, time, endTime, day, lecturer, zajCykId, grNr);
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Groups
|
* Groups
|
||||||
*
|
*
|
||||||
@ -159,9 +180,10 @@ public class Groups {
|
|||||||
* @param endTime end time of class in minutes
|
* @param endTime end time of class in minutes
|
||||||
* @param day day given to the groups
|
* @param day day given to the groups
|
||||||
* @param lecturer lecturer given to the groups
|
* @param lecturer lecturer given to the groups
|
||||||
|
* @param type type given to the groups
|
||||||
*/
|
*/
|
||||||
public void update(Integer capacity, String room, Course course, Integer time, Integer endTime, WeekDay day,
|
public void update(Integer capacity, String room, Course course, Integer time, Integer endTime, WeekDay day,
|
||||||
Lecturer lecturer) {
|
Lecturer lecturer, GroupType type) {
|
||||||
if (capacity != null) {
|
if (capacity != null) {
|
||||||
this.capacity = capacity;
|
this.capacity = capacity;
|
||||||
}
|
}
|
||||||
@ -189,6 +211,10 @@ public class Groups {
|
|||||||
if (lecturer != null) {
|
if (lecturer != null) {
|
||||||
this.lecturer = lecturer;
|
this.lecturer = lecturer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (type != null) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user