byte/oop-labs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added null checking, fixed overwriting

Browse Source
This commit is contained in:
Daniel
2023-09-29 23:53:30 +03:00
parent cb9c874367
commit c1d7799be9
9 changed files with 272 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Lab2/src/main/java/org/lumijiez/managers/Supervisor.java
View File

@@ -4,7 +4,6 @@ import org.lumijiez.base.Faculty;
import org.lumijiez.base.Grade;
import org.lumijiez.base.Group;
import org.lumijiez.base.Student;
import org.lumijiez.enums.StudyField;
import java.io.Serializable;
import java.util.Date;
@@ -54,7 +53,7 @@ public class Supervisor implements Serializable {
getFm().getGm().getSm().addStudent(newStudent);
}
public void editStudent(Student student, String name, String surname, String email, Group group, Faculty faculty) {
public void editStudent(Student student, String name, String surname, String email, Group group, Faculty faculty, Date birth, Date enrol) {
student.getGroup().deleteStudent(student);
student.setName(name);
student.setSurname(surname);
@@ -63,8 +62,8 @@ public class Supervisor implements Serializable {
student.setGroup(group);
group.addStudent(student);
student.setFaculty(faculty);
student.setDateOfBirth(student.getDateOfBirth());
student.setEnrollmentDate(student.getEnrollmentDate());
student.setDateOfBirth(birth);
student.setEnrollmentDate(enrol);
}
public void addGroup(Group group, Faculty faculty) {
@@ -86,9 +85,9 @@ public class Supervisor implements Serializable {
return null;
}
public Group getGroupByName(String groupName) {
public Group getGroupByName(String groupName, Faculty faculty) {
for (Group group : getFm().getGm().getGroups()) {
if (group.getName().equals(groupName))
if (group.getName().equals(groupName) && group.getFaculty().equals(faculty))
return group;
}
return null;