Better UI, added LookAndFeel, changed fonts
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
package org.lumijiez.base;
|
||||
|
||||
import org.lumijiez.util.FullStudentData;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
@@ -9,50 +7,45 @@ import java.util.List;
|
||||
|
||||
public class Student implements Serializable {
|
||||
|
||||
public Student(String name, String surname, 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.surname = surname;
|
||||
this.fullname = name + " " + surname;
|
||||
this.email = email;
|
||||
this.group = group;
|
||||
this.faculty = faculty;
|
||||
this.dateOfBirth = birth;
|
||||
this.enrollmentDate = enrol;
|
||||
this.FSD = new FullStudentData(name, surname, group.getName(), faculty.getName());
|
||||
}
|
||||
|
||||
private boolean graduated = false;
|
||||
|
||||
private String name;
|
||||
|
||||
private String surname;
|
||||
|
||||
private String fullname;
|
||||
|
||||
private String email;
|
||||
|
||||
private Date enrollmentDate;
|
||||
|
||||
private Date dateOfBirth;
|
||||
|
||||
private Faculty faculty;
|
||||
|
||||
private Group group;
|
||||
// This acts like an identification serial number for each student
|
||||
private FullStudentData FSD;
|
||||
|
||||
private final List<Grade> grades = new ArrayList<>();
|
||||
|
||||
|
||||
// Student stores a reference to its own Group and Faculty, bidirectional association
|
||||
|
||||
public Faculty getFaculty() {
|
||||
return faculty;
|
||||
}
|
||||
|
||||
public FullStudentData getFSD() {
|
||||
return FSD;
|
||||
}
|
||||
|
||||
public void setFSD(FullStudentData FSD) {
|
||||
this.FSD = FSD;
|
||||
}
|
||||
|
||||
public void setFaculty(Faculty faculty) {
|
||||
this.faculty = faculty;
|
||||
}
|
||||
|
||||
|
||||
public void setGroup(Group gr) {
|
||||
this.group.deleteStudent(this);
|
||||
this.group = gr;
|
||||
@@ -95,6 +88,10 @@ public class Student implements Serializable {
|
||||
return group;
|
||||
}
|
||||
|
||||
public boolean isGraduated() {
|
||||
return this.graduated;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
@@ -119,6 +116,10 @@ public class Student implements Serializable {
|
||||
this.dateOfBirth = dateOfBirth;
|
||||
}
|
||||
|
||||
public void setGraduated(boolean graduated) {
|
||||
this.graduated = graduated;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return fullname;
|
||||
|
||||
Reference in New Issue
Block a user