From 6fd7dbb37545b77aef757e8292f5019f6156eaa1 Mon Sep 17 00:00:00 2001 From: Kailash201 <109354852+Kailash201@users.noreply.github.com> Date: Sun, 12 Nov 2023 16:58:06 +0800 Subject: [PATCH] update UI and ModelClass model --- docs/DeveloperGuide.md | 2 ++ docs/diagrams/ModelClassDiagram.puml | 18 ++++++++++++++---- docs/diagrams/UiClassDiagram.puml | 7 +++++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 84d1d50ae58..950b7461318 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -88,6 +88,8 @@ The **API** of this component is specified in [`Ui.java`](https://github.com/AY2 The UI consists of a `MainWindow` that is made up of parts e.g.`CommandBox`, `ResultDisplay`, `PersonListPanel`, `StatusBarFooter` etc. All these, including the `MainWindow`, inherit from the abstract `UiPart` class which captures the commonalities between classes that represent parts of the visible GUI. +`GroupTimeContainer` is a helper class that process the data from the `model` in `Calendar` and passes the processed data to `DayCard` which will be then displayed in the `UI`. + The `UI` component uses the JavaFx UI framework. The layout of these UI parts are defined in matching `.fxml` files that are in the `src/main/resources/view` folder. For example, the layout of the [`MainWindow`](https://github.com/AY2324S1-CS2103T-T10-3/tp/blob/master/src/main/java/seedu/address/ui/MainWindow.java) is specified in [`MainWindow.fxml`](https://github.com/AY2324S1-CS2103T-T10-3/tp/blob/master/src/main/resources/view/MainWindow.fxml) The `UI` component, diff --git a/docs/diagrams/ModelClassDiagram.puml b/docs/diagrams/ModelClassDiagram.puml index cfdfb00270f..3e0233d4449 100644 --- a/docs/diagrams/ModelClassDiagram.puml +++ b/docs/diagrams/ModelClassDiagram.puml @@ -15,13 +15,14 @@ Class UserPrefs Class UniquePersonList Class Person Class Email -Class Groups +Class Group Class Name Class Phone -Class FreeTimes Class GroupList class TimeIntervalList class TimeInterval +class Time +class GroupRemark Class I #FFFFFF } @@ -41,7 +42,7 @@ AddressBook *--> "1" UniquePersonList UniquePersonList --> "~* all" Person AddressBook *--> "1" GroupList -GroupList --> "*" Groups +GroupList --> "*" Group Person *--> Name Person *--> Phone @@ -49,14 +50,23 @@ Person *--> "1" GroupList Person *--> Email Person *--> "1" TimeIntervalList +Group *--> TimeIntervalList +Group -->"*" Person +Group *--> GroupRemark + TimeIntervalList --> "*" TimeInterval +TimeInterval *--> Time Person -[hidden]up--> I UniquePersonList -[hidden]right-> I Name -[hidden]right-> Phone Phone -[hidden]right-> Email -Email -[hidden]right-> Groups + + ModelManager --> "~* filtered" Person +ModelManager --> "~* filtered" Group + + @enduml diff --git a/docs/diagrams/UiClassDiagram.puml b/docs/diagrams/UiClassDiagram.puml index 2eeb1393659..31f5b486f50 100644 --- a/docs/diagrams/UiClassDiagram.puml +++ b/docs/diagrams/UiClassDiagram.puml @@ -18,6 +18,7 @@ Class CommandBox Class Calendar Class DayCard Class EachDayTaskLine +Class GroupTimeContainer } package Model <> { @@ -42,9 +43,11 @@ MainWindow --> "0..1" HelpWindow PersonListPanel -down-> "*" PersonCard -Calendar -down-> "7" DayCard +Calendar *-down-> "7" DayCard +Calendar *-> GroupTimeContainer -DayCard -down-> "*" EachDayTaskLine +DayCard *-down-> "*" EachDayTaskLine +DayCard -left-> GroupTimeContainer MainWindow -left-|> UiPart