From 5bb0fa7d9e3c611e814bfe4d260580bcbfb45ce2 Mon Sep 17 00:00:00 2001 From: whitesnowx Date: Mon, 15 Apr 2024 04:46:31 +0800 Subject: [PATCH 1/3] edit to Version 1.4 --- docs/diagrams/ModelClassDiagram.puml | 27 +++++++++++++++++++------ src/main/java/staffconnect/MainApp.java | 2 +- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/docs/diagrams/ModelClassDiagram.puml b/docs/diagrams/ModelClassDiagram.puml index 15b686da1d3..60f9e81c93d 100644 --- a/docs/diagrams/ModelClassDiagram.puml +++ b/docs/diagrams/ModelClassDiagram.puml @@ -6,12 +6,16 @@ skinparam classBackgroundColor MODEL_COLOR Package Model as ModelPackage <>{ Class "<>\nReadOnlyStaffBook" as ReadOnlyStaffBook +Class "<>\nReadOnlyMeetingBook" as ReadOnlyMeetingBook Class "<>\nReadOnlyUserPrefs" as ReadOnlyUserPrefs Class "<>\nModel" as Model Class StaffBook Class ModelManager +Class MeetingBook +Class MeetingManager Class UserPrefs +Class UniqueMeetingList Class UniquePersonList Class Person Class Name @@ -30,8 +34,9 @@ Class I #FFFFFF Class HiddenOutside #FFFFFF HiddenOutside ..> Model -StaffBook .up.|> ReadOnlyStaffBook + +StaffBook .up.|> ReadOnlyStaffBook ModelManager .up.|> Model Model .right.> ReadOnlyUserPrefs Model .left.> ReadOnlyStaffBook @@ -39,8 +44,14 @@ ModelManager -left-> "1" StaffBook ModelManager -right-> "1" UserPrefs UserPrefs .up.|> ReadOnlyUserPrefs +MeetingManager -right-> "1" MeetingBook +MeetingBook .up.|> ReadOnlyMeetingBook +MeetingBook -down->"1" UniqueMeetingList + + + StaffBook *--> "1" UniquePersonList -UniquePersonList --> "~* all" Person +UniquePersonList --> " ~* all" Person Person *--> Name Person *--> Phone Person *--> Email @@ -49,7 +60,8 @@ Person *--> Faculty Person *--> Venue Person *--> "*" Tag Person *--> "*" Availability -Person *--> "*" Meeting +Person *--> "1" MeetingManager +UniqueMeetingList *--> "*" Meeting Person -[hidden]up--> I UniquePersonList -[hidden]right-> I @@ -61,7 +73,10 @@ Module -[hidden]right-> Faculty Faculty -[hidden]right-> Venue Venue -[hidden]right-> Tag Tag -[hidden]right-> Availability -Availability -[hidden]right-> Meeting -ModelManager --> "~* filtered" Person -@enduml +Person -[hidden]right> MeetingManager + +'ModelManager --> "~* filtered\n\n\n\n" Person + +ModelManager "\n\n\n\n\n\n\n\n\n\n\n\n ~*filtered" <-down- Person +@enduml \ No newline at end of file diff --git a/src/main/java/staffconnect/MainApp.java b/src/main/java/staffconnect/MainApp.java index 02aa007623e..5282b9e9704 100644 --- a/src/main/java/staffconnect/MainApp.java +++ b/src/main/java/staffconnect/MainApp.java @@ -36,7 +36,7 @@ */ public class MainApp extends Application { - public static final Version VERSION = new Version(1, 3, 0, false); + public static final Version VERSION = new Version(1, 4, 0, false); private static final Logger logger = LogsCenter.getLogger(MainApp.class); From ef610ac83e6ea4e13519b294c12cb86f7eaaf668 Mon Sep 17 00:00:00 2001 From: whitesnowx Date: Mon, 15 Apr 2024 04:52:36 +0800 Subject: [PATCH 2/3] Revert "edit to Version 1.4" This reverts commit 5bb0fa7d9e3c611e814bfe4d260580bcbfb45ce2. --- docs/diagrams/ModelClassDiagram.puml | 27 ++++++------------------- src/main/java/staffconnect/MainApp.java | 2 +- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/docs/diagrams/ModelClassDiagram.puml b/docs/diagrams/ModelClassDiagram.puml index 60f9e81c93d..15b686da1d3 100644 --- a/docs/diagrams/ModelClassDiagram.puml +++ b/docs/diagrams/ModelClassDiagram.puml @@ -6,16 +6,12 @@ skinparam classBackgroundColor MODEL_COLOR Package Model as ModelPackage <>{ Class "<>\nReadOnlyStaffBook" as ReadOnlyStaffBook -Class "<>\nReadOnlyMeetingBook" as ReadOnlyMeetingBook Class "<>\nReadOnlyUserPrefs" as ReadOnlyUserPrefs Class "<>\nModel" as Model Class StaffBook Class ModelManager -Class MeetingBook -Class MeetingManager Class UserPrefs -Class UniqueMeetingList Class UniquePersonList Class Person Class Name @@ -34,9 +30,8 @@ Class I #FFFFFF Class HiddenOutside #FFFFFF HiddenOutside ..> Model - - StaffBook .up.|> ReadOnlyStaffBook + ModelManager .up.|> Model Model .right.> ReadOnlyUserPrefs Model .left.> ReadOnlyStaffBook @@ -44,14 +39,8 @@ ModelManager -left-> "1" StaffBook ModelManager -right-> "1" UserPrefs UserPrefs .up.|> ReadOnlyUserPrefs -MeetingManager -right-> "1" MeetingBook -MeetingBook .up.|> ReadOnlyMeetingBook -MeetingBook -down->"1" UniqueMeetingList - - - StaffBook *--> "1" UniquePersonList -UniquePersonList --> " ~* all" Person +UniquePersonList --> "~* all" Person Person *--> Name Person *--> Phone Person *--> Email @@ -60,8 +49,7 @@ Person *--> Faculty Person *--> Venue Person *--> "*" Tag Person *--> "*" Availability -Person *--> "1" MeetingManager -UniqueMeetingList *--> "*" Meeting +Person *--> "*" Meeting Person -[hidden]up--> I UniquePersonList -[hidden]right-> I @@ -73,10 +61,7 @@ Module -[hidden]right-> Faculty Faculty -[hidden]right-> Venue Venue -[hidden]right-> Tag Tag -[hidden]right-> Availability +Availability -[hidden]right-> Meeting -Person -[hidden]right> MeetingManager - -'ModelManager --> "~* filtered\n\n\n\n" Person - -ModelManager "\n\n\n\n\n\n\n\n\n\n\n\n ~*filtered" <-down- Person -@enduml \ No newline at end of file +ModelManager --> "~* filtered" Person +@enduml diff --git a/src/main/java/staffconnect/MainApp.java b/src/main/java/staffconnect/MainApp.java index 5282b9e9704..02aa007623e 100644 --- a/src/main/java/staffconnect/MainApp.java +++ b/src/main/java/staffconnect/MainApp.java @@ -36,7 +36,7 @@ */ public class MainApp extends Application { - public static final Version VERSION = new Version(1, 4, 0, false); + public static final Version VERSION = new Version(1, 3, 0, false); private static final Logger logger = LogsCenter.getLogger(MainApp.class); From bcbde7c9727564e156089e2558b685d6c0778006 Mon Sep 17 00:00:00 2001 From: whitesnowx Date: Mon, 15 Apr 2024 04:53:22 +0800 Subject: [PATCH 3/3] revert testing done on model puml but add back version change --- src/main/java/staffconnect/MainApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/staffconnect/MainApp.java b/src/main/java/staffconnect/MainApp.java index 02aa007623e..5282b9e9704 100644 --- a/src/main/java/staffconnect/MainApp.java +++ b/src/main/java/staffconnect/MainApp.java @@ -36,7 +36,7 @@ */ public class MainApp extends Application { - public static final Version VERSION = new Version(1, 3, 0, false); + public static final Version VERSION = new Version(1, 4, 0, false); private static final Logger logger = LogsCenter.getLogger(MainApp.class);