Merge branch 'grademanager_v1.0' into 'gui+logic'
# Conflicts: # .idea/dbnavigator.xml # .idea/misc.xml # .idea/uiDesigner.xml # pom.xml
No related branches found
No related tags found
Showing
- .idea/jpa-buddy.xml 6 additions, 0 deletions.idea/jpa-buddy.xml
- .idea/workspace.xml 126 additions, 0 deletions.idea/workspace.xml
- pom.xml 27 additions, 8 deletionspom.xml
- src/main/Application.java 37 additions, 0 deletionssrc/main/Application.java
- src/main/JpaService.java 76 additions, 0 deletionssrc/main/JpaService.java
- src/main/abstractClasses/UniversityMember.java 164 additions, 0 deletionssrc/main/abstractClasses/UniversityMember.java
- src/main/classes/Course.java 154 additions, 0 deletionssrc/main/classes/Course.java
- src/main/classes/CoursesOfStudy.java 153 additions, 0 deletionssrc/main/classes/CoursesOfStudy.java
- src/main/classes/Enrollment.java 96 additions, 0 deletionssrc/main/classes/Enrollment.java
- src/main/classes/Lecturer.java 37 additions, 0 deletionssrc/main/classes/Lecturer.java
- src/main/classes/Student.java 82 additions, 0 deletionssrc/main/classes/Student.java
- src/main/enumeration/CourseType.java 22 additions, 0 deletionssrc/main/enumeration/CourseType.java
- src/main/enumeration/Degree.java 23 additions, 0 deletionssrc/main/enumeration/Degree.java
- src/main/enumeration/ExamType.java 25 additions, 0 deletionssrc/main/enumeration/ExamType.java
- src/main/enumeration/FieldOfStudy.java 19 additions, 0 deletionssrc/main/enumeration/FieldOfStudy.java
- src/main/enumeration/Gender.java 20 additions, 0 deletionssrc/main/enumeration/Gender.java
- src/main/enumeration/Mark.java 30 additions, 0 deletionssrc/main/enumeration/Mark.java
- src/main/enumeration/Semester.java 31 additions, 0 deletionssrc/main/enumeration/Semester.java
- src/main/enumeration/Status.java 20 additions, 0 deletionssrc/main/enumeration/Status.java
- src/main/interfaces/Calculable.java 7 additions, 0 deletionssrc/main/interfaces/Calculable.java
Loading
Please register or sign in to comment