Cleaned up
This commit is contained in:
@@ -16,17 +16,7 @@ public class Faculty implements Serializable {
|
|||||||
this.name = name;
|
this.name = name;
|
||||||
this.abbreviation = abbreviation;
|
this.abbreviation = abbreviation;
|
||||||
this.field = field;
|
this.field = field;
|
||||||
// this.uuid = UUID.randomUUID().toString();
|
|
||||||
}
|
}
|
||||||
// private String uuid;
|
|
||||||
|
|
||||||
// public String getUuid() {
|
|
||||||
// return uuid;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setUuid(String uuid) {
|
|
||||||
// this.uuid = uuid;
|
|
||||||
// }
|
|
||||||
|
|
||||||
public void addGroup(Group group) {
|
public void addGroup(Group group) {
|
||||||
groups.add(group);
|
groups.add(group);
|
||||||
|
|||||||
@@ -8,12 +8,10 @@ public class Group implements Serializable {
|
|||||||
|
|
||||||
private final List<Student> students = new ArrayList<>();
|
private final List<Student> students = new ArrayList<>();
|
||||||
private String name;
|
private String name;
|
||||||
// private String uuid;
|
|
||||||
private Faculty faculty;
|
private Faculty faculty;
|
||||||
|
|
||||||
public Group(String name) {
|
public Group(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
// this.uuid = UUID.randomUUID().toString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Faculty getFaculty() {
|
public Faculty getFaculty() {
|
||||||
@@ -49,11 +47,4 @@ public class Group implements Serializable {
|
|||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public String getUuid() {
|
|
||||||
// return uuid;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// public void setUuid(String uuid) {
|
|
||||||
// this.uuid = uuid;
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,8 +26,6 @@ public class Student implements Serializable {
|
|||||||
|
|
||||||
private Group group;
|
private Group group;
|
||||||
|
|
||||||
// private String uuid;
|
|
||||||
|
|
||||||
public Student(String name, String surname, String email, Group group, Faculty faculty, Date birth, Date enrol) {
|
public Student(String name, String surname, String email, Group group, Faculty faculty, Date birth, Date enrol) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.surname = surname;
|
this.surname = surname;
|
||||||
@@ -37,7 +35,6 @@ public class Student implements Serializable {
|
|||||||
this.faculty = faculty;
|
this.faculty = faculty;
|
||||||
this.dateOfBirth = birth;
|
this.dateOfBirth = birth;
|
||||||
this.enrollmentDate = enrol;
|
this.enrollmentDate = enrol;
|
||||||
// this.uuid = UUID.randomUUID().toString();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Faculty getFaculty() {
|
public Faculty getFaculty() {
|
||||||
|
|||||||
Reference in New Issue
Block a user