Implemented all methods marked with WIP
This commit is contained in:
@@ -3,6 +3,7 @@ package org.lumijiez.base;
|
||||
import org.lumijiez.enums.StudyField;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class Faculty implements Serializable {
|
||||
@@ -15,7 +16,7 @@ public class Faculty implements Serializable {
|
||||
|
||||
private String name;
|
||||
private String abbreviation;
|
||||
private List<Group> groups;
|
||||
private List<Group> groups = new ArrayList<>();
|
||||
private StudyField field;
|
||||
|
||||
public void addGroup(Group group) {
|
||||
@@ -54,4 +55,9 @@ public class Faculty implements Serializable {
|
||||
this.field = field;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getName();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -54,4 +54,9 @@ public class Group implements Serializable {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,11 +9,14 @@ import java.util.List;
|
||||
|
||||
public class Student implements Serializable {
|
||||
|
||||
public Student(String name, String surname, Group group, Faculty faculty) {
|
||||
public Student(String name, String surname, Group group, Faculty faculty, Date birth, Date enrol) {
|
||||
this.name = name;
|
||||
this.surname = surname;
|
||||
this.fullname = name + " " + surname;
|
||||
this.group = group;
|
||||
this.faculty = faculty;
|
||||
this.dateOfBirth = birth;
|
||||
this.enrollmentDate = enrol;
|
||||
this.FSD = new FullStudentData(name, surname, group.getName(), faculty.getName());
|
||||
}
|
||||
|
||||
@@ -116,4 +119,9 @@ public class Student implements Serializable {
|
||||
this.dateOfBirth = dateOfBirth;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return fullname;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user