improve UML details

1 files changed, 35 insertions, 24 deletions

diff --git a/classes.puml b/classes.puml
index 9907c7a..c585acc 100644
--- a/classes.puml
+++ b/classes.puml
@@ -1,5 +1,6 @@
 @startuml
 skinparam packageStyle file
+skinparam linetype ortho
 
 package Person {
 
@@ -54,48 +55,58 @@ Institute *- Person.ResearchAssociate
 
 }
 
-package Project {
+package Activity {
 
-abstract Project {
+abstract Activity {
   +name
-  +dateBegin
-  +dateEnd
 }
 
-class ProjectHours
-ProjectHours "1" *-- Project
-ProjectHours o-- Person.ResearchAssociate
+abstract Project extends Activity {
++ dateBegin
++ dateEnd
++ hours[]
+}
+Project *- Person.ResearchAssociate
+(Project, Person.ResearchAssociate) .. Hours
 
-interface ProvidesEcts {
-  +ects
+class Hours {
++ person
++ hours
 }
 
-class Course implements ProvidesEcts
 class Course extends Project {
-  +id
-  +name
-  +hoursWeekly
++ id
++ lecturer
++ ects
 }
-Course -- Person.Lecturer
+Course *-- Person.Lecturer
 
-class StudentProject implements ProvidesEcts
-class StudentProject extends Project
-StudentProject --* Person.Supervisor
+class StudentProject extends Project {
++ supervisor
++ ects
+}
+StudentProject *-- Person.Supervisor
 
 class Programme {
-  addActivity()
-  valid()
++ student
++ activity[]
++ addActivity()
++ valid()
 }
-Programme o- Course
-Programme o- StudentProject
-Programme --* Person.Student
+Programme *- Course
+Programme *- StudentProject
+Programme "1" *-- Person.Student
 
 }
 
 package Bachelorizer {
 
-class Bachelorizer
-Bachelorizer --> Project.Programme
+class Bachelorizer {
++ programme[]
++ addProgramme(student,activity...)
+}
+
+Activity.Programme --* Bachelorizer
 
 }