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

Implemented UI, fixed serialization inconsistency

Browse Source
This commit is contained in:
Daniel
2023-09-25 20:30:04 +03:00
parent 24d671f765
commit b703d8f658
12 changed files with 134 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Lab2/src/main/java/org/lumijiez/managers/FacultyManager.java
View File

@@ -8,20 +8,21 @@ import java.util.List;
public class FacultyManager implements Serializable {
public FacultyManager(GroupManager gm, StudentManager sm) {
this.gm = new GroupManager(sm);
this.sm = sm;
}
private final GroupManager gm;
private final StudentManager sm;
private final StudentManager sm = new StudentManager();
private final GroupManager gm = new GroupManager(sm);
private final List<Faculty> faculties = new ArrayList<>();
public Faculty getFaculty(String facultyName, GroupManager gm) {
public Faculty getFaculty(String facultyName) {
for (Faculty fc : faculties)
if (fc.getName().equals(facultyName)) return fc;
return null;
}
public GroupManager getGm() {
return gm;
}
public void addFaculty(Faculty faculty) {
faculties.add(faculty);
}
@@ -33,13 +34,4 @@ public class FacultyManager implements Serializable {
public List<Faculty> getFaculties() {
return faculties;
}
public String getFacultiesText() {
StringBuilder builder = new StringBuilder();
for (Faculty fc : faculties)
builder.append(fc.getName()).append("\n");
return builder.toString();
}
}

14
Lab2/src/main/java/org/lumijiez/managers/GroupManager.java
View File

@@ -33,17 +33,7 @@ public class GroupManager implements Serializable {
return groups;
}
public String getGroupsText() {
StringBuilder builder = new StringBuilder();
for (Group gr : groups)
builder.append(gr.getName()).append("\n");
return builder.toString();
}
public Group findGroup(String name) {
for (Group gr : groups) {
if (gr.getName().equals(name)) return gr;
}
return null;
public StudentManager getSm() {
return sm;
}
}

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

@@ -1,8 +1,9 @@
package org.lumijiez.managers;
import org.lumijiez.base.Faculty;
import org.lumijiez.base.Grade;
import org.lumijiez.base.Group;
import org.lumijiez.util.NameSurnameGroup;
import org.lumijiez.util.FullStudentData;
import org.lumijiez.base.Student;
import java.io.Serializable;
@@ -11,12 +12,12 @@ public class Supervisor implements Serializable {
private final FacultyManager fm;
public Supervisor() {
this.groupManager = new FacultyManager();
this.fm = new FacultyManager();
}
public String getStudentsText() {
StringBuilder info = new StringBuilder();
for (Group group : groupManager.getGroups()) {
for (Group group : fm.getGm().getGroups()) {
for (Student student : group.getStudents()) {
info.append(student.getFullname()).append(" ").append(student.getGroup().getName()).append("\n");
}
@@ -24,27 +25,46 @@ public class Supervisor implements Serializable {
return info.toString();
}
public String getGradesText(NameSurnameGroup NSG) {
public String getGradesText(FullStudentData data) {
StringBuilder info = new StringBuilder();
for (Grade grade : groupManager.getGroup(NSG.group()).getStudent(NSG.name(), NSG.surname()).getGrades()) {
info.append(grade.getSubject()).append(" ").append(grade.getGrade());
for (Grade gr : fm.getGm().getSm().getStudent(data).getGrades()) {
info.append(gr.getSubject()).append(" ").append(gr.getGrade());
}
return info.toString();
}
public void changeGroup(NameSurnameGroup NSG, String groupName) {
Group gr = groupManager.findGroup(groupName);
groupManager.getGroup(groupName).getStudent(NSG.name(), NSG.surname()).setGroup(gr);
public String getGroupsText() {
StringBuilder builder = new StringBuilder();
for (Group gr : fm.getGm().getGroups())
builder.append(gr.getName()).append("\n");
return builder.toString();
}
public void addStudent(NameSurnameGroup NSG) {
Group currentGroup = groupManager.getGroup(NSG.group());
currentGroup.addStudent(new Student(NSG.name(), NSG.surname(), currentGroup));
public String getFacultiesText() {
StringBuilder builder = new StringBuilder();
for (Faculty fc : fm.getFaculties())
builder.append(fc.getName()).append("\n");
return builder.toString();
}
public void addGrade(NameSurnameGroup NSG, Grade grade) {
Student student = groupManager.getGroup(NSG.group()).getStudent(NSG.name(), NSG.surname());
student.addGrade(grade);
public FacultyManager getFm() {
return fm;
}
// public void changeGroup(NameSurnameGroup NSG, String groupName) {
// Group gr = groupManager.findGroup(groupName);
// groupManager.getGroup(groupName).getStudent(NSG.name(), NSG.surname()).setGroup(gr);
// }
// public void addStudent(NameSurnameGroup NSG) {
// Group currentGroup = groupManager.getGroup(NSG.group());
// currentGroup.addStudent(new Student(NSG.name(), NSG.surname(), currentGroup));
// }
// public void addGrade(NameSurnameGroup NSG, Grade grade) {
// Student student = groupManager.getGroup(NSG.group()).getStudent(NSG.name(), NSG.surname());
// student.addGrade(grade);
// }
}