Skip to content

Commit

Permalink
Merge pull request #55 from eugene3231/update-UMLdiagrams&images
Browse files Browse the repository at this point in the history
Update UML diagrams and images to CliniCal and Patient
  • Loading branch information
Michaeliaaa authored Sep 27, 2020
2 parents 5e828ed + 9ed75df commit 1b54c4b
Show file tree
Hide file tree
Showing 31 changed files with 94 additions and 94 deletions.
4 changes: 2 additions & 2 deletions docs/diagrams/ArchitectureSequenceDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ activate ui UI_COLOR
ui -[UI_COLOR]> logic : execute("delete 1")
activate logic LOGIC_COLOR

logic -[LOGIC_COLOR]> model : deletePerson(p)
logic -[LOGIC_COLOR]> model : deletePatient(p)
activate model MODEL_COLOR

model -[MODEL_COLOR]-> logic
deactivate model

logic -[LOGIC_COLOR]> storage : saveAddressBook(cliniCal)
logic -[LOGIC_COLOR]> storage : saveCliniCal(cliniCal)
activate storage STORAGE_COLOR

storage -[STORAGE_COLOR]> storage : Save to file
Expand Down
20 changes: 10 additions & 10 deletions docs/diagrams/BetterModelClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ skinparam arrowThickness 1.1
skinparam arrowColor MODEL_COLOR
skinparam classBackgroundColor MODEL_COLOR

AddressBook *-right-> "1" UniquePersonList
AddressBook *-right-> "1" UniqueTagList
UniqueTagList -[hidden]down- UniquePersonList
UniqueTagList -[hidden]down- UniquePersonList
CliniCal *-right-> "1" UniquePatientList
CliniCal *-right-> "1" UniqueTagList
UniqueTagList -[hidden]down- UniquePatientList
UniqueTagList -[hidden]down- UniquePatientList

UniqueTagList *-right-> "*" Tag
UniquePersonList o-right-> Person
UniquePatientList o-right-> Patient

Person -up-> "*" Tag
Patient -up-> "*" Tag

Person *--> Name
Person *--> Phone
Person *--> Email
Person *--> Address
Patient *--> Name
Patient *--> Phone
Patient *--> Email
Patient *--> Address
@enduml
6 changes: 3 additions & 3 deletions docs/diagrams/CommitActivityDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ start
'Since the beta syntax does not support placing the condition outside the
'diamond we place it as the true branch instead.

if () then ([command commits AddressBook])
if () then ([command commits CliniCal])
:Purge redunant states;
:Save AddressBook to
addressBookStateList;
:Save CliniCal to
CliniCalStateList;
else ([else])
endif
stop
Expand Down
22 changes: 11 additions & 11 deletions docs/diagrams/DeleteSequenceDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

box Logic LOGIC_COLOR_T1
participant ":LogicManager" as LogicManager LOGIC_COLOR
participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
participant ":CliniCalParser" as CliniCalParser LOGIC_COLOR
participant ":DeleteCommandParser" as DeleteCommandParser LOGIC_COLOR
participant "d:DeleteCommand" as DeleteCommand LOGIC_COLOR
participant ":CommandResult" as CommandResult LOGIC_COLOR
Expand All @@ -16,17 +16,17 @@ end box
[-> LogicManager : execute("delete 1")
activate LogicManager

LogicManager -> AddressBookParser : parseCommand("delete 1")
activate AddressBookParser
LogicManager -> CliniCalParser : parseCommand("delete 1")
activate CliniCalParser

create DeleteCommandParser
AddressBookParser -> DeleteCommandParser
CliniCalParser -> DeleteCommandParser
activate DeleteCommandParser

DeleteCommandParser --> AddressBookParser
DeleteCommandParser --> CliniCalParser
deactivate DeleteCommandParser

AddressBookParser -> DeleteCommandParser : parse("1")
CliniCalParser -> DeleteCommandParser : parse("1")
activate DeleteCommandParser

create DeleteCommand
Expand All @@ -36,19 +36,19 @@ activate DeleteCommand
DeleteCommand --> DeleteCommandParser : d
deactivate DeleteCommand

DeleteCommandParser --> AddressBookParser : d
DeleteCommandParser --> CliniCalParser : d
deactivate DeleteCommandParser
'Hidden arrow to position the destroy marker below the end of the activation bar.
DeleteCommandParser -[hidden]-> AddressBookParser
DeleteCommandParser -[hidden]-> CliniCalParser
destroy DeleteCommandParser

AddressBookParser --> LogicManager : d
deactivate AddressBookParser
CliniCalParser --> LogicManager : d
deactivate CliniCalParser

LogicManager -> DeleteCommand : execute()
activate DeleteCommand

DeleteCommand -> Model : deletePerson(1)
DeleteCommand -> Model : deletePatient(1)
activate Model

Model --> DeleteCommand
Expand Down
6 changes: 3 additions & 3 deletions docs/diagrams/LogicClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ package Logic {

package Parser {
Interface Parser <<Interface>>
Class AddressBookParser
Class CliniCalParser
Class XYZCommandParser
Class CliSyntax
Class ParserUtil
Expand All @@ -35,8 +35,8 @@ Class HiddenOutside #FFFFFF
HiddenOutside ..> Logic

LogicManager .up.|> Logic
LogicManager -->"1" AddressBookParser
AddressBookParser .left.> XYZCommandParser: creates >
LogicManager -->"1" CliniCalParser
CliniCalParser .left.> XYZCommandParser: creates >

XYZCommandParser ..> XYZCommand : creates >
XYZCommandParser ..|> Parser
Expand Down
32 changes: 16 additions & 16 deletions docs/diagrams/ModelClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@ skinparam arrowColor MODEL_COLOR
skinparam classBackgroundColor MODEL_COLOR

Package Model <<Rectangle>>{
Interface ReadOnlyAddressBook <<Interface>>
Interface ReadOnlyCliniCal <<Interface>>
Interface Model <<Interface>>
Interface ObservableList <<Interface>>
Class AddressBook
Class ReadOnlyAddressBook
Class CliniCal
Class ReadOnlyCliniCal
Class Model
Class ModelManager
Class UserPrefs
Class ReadOnlyUserPrefs

Package Person {
Class Person
Package Patient {
Class Patient
Class Address
Class Email
Class Name
Class Phone
Class UniquePersonList
Class UniquePatientList
}

Package Tag {
Expand All @@ -32,25 +32,25 @@ Class Tag
Class HiddenOutside #FFFFFF
HiddenOutside ..> Model

AddressBook .up.|> ReadOnlyAddressBook
CliniCal .up.|> ReadOnlyCliniCal

ModelManager .up.|> Model
Model .right.> ObservableList
ModelManager o--> "1" AddressBook
ModelManager o--> "1" CliniCal
ModelManager o-left-> "1" UserPrefs
UserPrefs .up.|> ReadOnlyUserPrefs

AddressBook *--> "1" UniquePersonList
UniquePersonList o--> "*" Person
Person *--> Name
Person *--> Phone
Person *--> Email
Person *--> Address
Person *--> "*" Tag
CliniCal *--> "1" UniquePatientList
UniquePatientList o--> "*" Patient
Patient *--> Name
Patient *--> Phone
Patient *--> Email
Patient *--> Address
Patient *--> "*" Tag

Name -[hidden]right-> Phone
Phone -[hidden]right-> Address
Address -[hidden]right-> Email

ModelManager -->"1" Person : filtered list
ModelManager -->"1" Patient : filtered list
@enduml
14 changes: 7 additions & 7 deletions docs/diagrams/StorageClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ skinparam classBackgroundColor STORAGE_COLOR

Interface Storage <<Interface>>
Interface UserPrefsStorage <<Interface>>
Interface AddressBookStorage <<Interface>>
Interface CliniCalStorage <<Interface>>

Class StorageManager
Class JsonUserPrefsStorage
Class JsonAddressBookStorage
Class JsonCliniCalStorage

StorageManager .left.|> Storage
StorageManager o-right-> UserPrefsStorage
StorageManager o--> AddressBookStorage
StorageManager o--> CliniCalStorage

JsonUserPrefsStorage .left.|> UserPrefsStorage
JsonAddressBookStorage .left.|> AddressBookStorage
JsonAddressBookStorage .down.> JsonSerializableAddressBookStorage
JsonSerializableAddressBookStorage .right.> JsonSerializablePerson
JsonSerializablePerson .right.> JsonAdaptedTag
JsonCliniCalStorage .left.|> CliniCalStorage
JsonCliniCalStorage .down.> JsonSerializableCliniCalStorage
JsonSerializableCliniCalStorage .right.> JsonSerializablePatient
JsonSerializablePatient .right.> JsonAdaptedTag
@enduml
16 changes: 8 additions & 8 deletions docs/diagrams/UiClassDiagram.puml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Class UiManager
Class MainWindow
Class HelpWindow
Class ResultDisplay
Class PersonListPanel
Class PersonCard
Class PatientListPanel
Class PatientCard
Class StatusBarFooter
Class CommandBox
}
Expand All @@ -33,25 +33,25 @@ UiManager -down-> MainWindow
MainWindow --> HelpWindow
MainWindow *-down-> CommandBox
MainWindow *-down-> ResultDisplay
MainWindow *-down-> PersonListPanel
MainWindow *-down-> PatientListPanel
MainWindow *-down-> StatusBarFooter

PersonListPanel -down-> PersonCard
PatientListPanel -down-> PatientCard

MainWindow -left-|> UiPart

ResultDisplay --|> UiPart
CommandBox --|> UiPart
PersonListPanel --|> UiPart
PersonCard --|> UiPart
PatientListPanel --|> UiPart
PatientCard --|> UiPart
StatusBarFooter --|> UiPart
HelpWindow -down-|> UiPart

PersonCard ..> Model
PatientCard ..> Model
UiManager -right-> Logic
MainWindow -left-> Logic

PersonListPanel -[hidden]left- HelpWindow
PatientListPanel -[hidden]left- HelpWindow
HelpWindow -[hidden]left- CommandBox
CommandBox -[hidden]left- ResultDisplay
ResultDisplay -[hidden]left- StatusBarFooter
Expand Down
6 changes: 3 additions & 3 deletions docs/diagrams/UndoRedoState0.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ skinparam ClassBorderColor #000000
title Initial state

package States {
class State1 as "__ab0:AddressBook__"
class State2 as "__ab1:AddressBook__"
class State3 as "__ab2:AddressBook__"
class State1 as "__ab0:CliniCal__"
class State2 as "__ab1:CliniCal__"
class State3 as "__ab2:CliniCal__"
}
State1 -[hidden]right-> State2
State2 -[hidden]right-> State3
Expand Down
6 changes: 3 additions & 3 deletions docs/diagrams/UndoRedoState1.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ skinparam ClassBorderColor #000000
title After command "delete 5"

package States <<rectangle>> {
class State1 as "__ab0:AddressBook__"
class State2 as "__ab1:AddressBook__"
class State3 as "__ab2:AddressBook__"
class State1 as "__ab0:CliniCal__"
class State2 as "__ab1:CliniCal__"
class State3 as "__ab2:CliniCal__"
}

State1 -[hidden]right-> State2
Expand Down
6 changes: 3 additions & 3 deletions docs/diagrams/UndoRedoState2.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ skinparam ClassBorderColor #000000
title After command "add n/David"

package States <<rectangle>> {
class State1 as "__ab0:AddressBook__"
class State2 as "__ab1:AddressBook__"
class State3 as "__ab2:AddressBook__"
class State1 as "__ab0:CliniCal__"
class State2 as "__ab1:CliniCal__"
class State3 as "__ab2:CliniCal__"
}

State1 -[hidden]right-> State2
Expand Down
6 changes: 3 additions & 3 deletions docs/diagrams/UndoRedoState3.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ skinparam ClassBorderColor #000000
title After command "undo"

package States <<rectangle>> {
class State1 as "__ab0:AddressBook__"
class State2 as "__ab1:AddressBook__"
class State3 as "__ab2:AddressBook__"
class State1 as "__ab0:CliniCal__"
class State2 as "__ab1:CliniCal__"
class State3 as "__ab2:CliniCal__"
}

State1 -[hidden]right-> State2
Expand Down
6 changes: 3 additions & 3 deletions docs/diagrams/UndoRedoState4.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ skinparam ClassBorderColor #000000
title After command "list"

package States <<rectangle>> {
class State1 as "__ab0:AddressBook__"
class State2 as "__ab1:AddressBook__"
class State3 as "__ab2:AddressBook__"
class State1 as "__ab0:CliniCal__"
class State2 as "__ab1:CliniCal__"
class State3 as "__ab2:CliniCal__"
}

State1 -[hidden]right-> State2
Expand Down
6 changes: 3 additions & 3 deletions docs/diagrams/UndoRedoState5.puml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ skinparam ClassBorderColor #000000
title After command "clear"

package States <<rectangle>> {
class State1 as "__ab0:AddressBook__"
class State2 as "__ab1:AddressBook__"
class State3 as "__ab3:AddressBook__"
class State1 as "__ab0:CliniCal__"
class State2 as "__ab1:CliniCal__"
class State3 as "__ab3:CliniCal__"
}

State1 -[hidden]right-> State2
Expand Down
Loading

0 comments on commit 1b54c4b

Please sign in to comment.