sandyk0105 · sandyk0105 · Oct 25, 2024 · Oct 26, 2024 · Oct 27, 2024 · Oct 28, 2024
diff --git a/build.gradle b/build.gradle
@@ -20,6 +20,10 @@ checkstyle {
     toolVersion = '10.2'
 }
 
+run {
+    enableAssertions = true
+}
+
 test {
     useJUnitPlatform()
     finalizedBy jacocoTestReport
@@ -56,6 +60,10 @@ dependencies {
     implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
     implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
     implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
+    implementation group: 'org.openjfx', name: 'javafx-swing', version: javaFxVersion, classifier: 'win'
+    implementation group: 'org.openjfx', name: 'javafx-swing', version: javaFxVersion, classifier: 'mac'
+    implementation group: 'org.openjfx', name: 'javafx-swing', version: javaFxVersion, classifier: 'linux'
+
 
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
     implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'

diff --git a/docs/AboutUs.md b/docs/AboutUs.md
@@ -5,8 +5,6 @@ title: About Us
 
 We are a team based in the [School of Computing, National University of Singapore](https://www.comp.nus.edu.sg).
 
-You can reach us at the email `seer[at]comp.nus.edu.sg`
-
 ## Project team
 
 ### Sandy Kristian Waluyo
@@ -15,7 +13,6 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 
 [[homepage](http://www.comp.nus.edu.sg/~damithch)]
 [[github](https://github.com/sandyk0105)]
-[[portfolio](team/sandyk0105.md)]
 
 * Role: Developer
 * Responsibilities: Code Quality
@@ -25,7 +22,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 <img src="images/nigeltzy.png" width="200px">
 
 [[github](http://github.com/nigeltzy)]
-[[portfolio](team/nigeltzy.md)]
+[[portfolio](https://www.linkedin.com/in/nigel-teo-zi-you-276a452aa/)]
 
 * Role: Developer
 * Responsibilities: Data
@@ -34,7 +31,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 
 <img src="images/tyxiangs.png" width="200px">
 
-[[github](http://github.com/tyxiangs)] [[portfolio](team/johndoe.md)]
+[[github](http://github.com/tyxiangs)]
 
 * Role: Developer
 * Responsibilities: Data
@@ -44,7 +41,7 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 <img src="images/chengzihao123.png" width="200px">
 
 [[github](http://github.com/chengzihao123)]
-[[portfolio](team/johndoe.md)]
+[[portfolio](https://czhportfolio.netlify.app/)]
 
 * Role: Developer
 * Responsibilities: UI and testing
@@ -54,7 +51,6 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`
 <img src="images/shinichi04.png" width="200px">
 
 [[github](http://github.com/shinichi04)]
-[[portfolio](team/shinichi04.md)]
 
 * Role: Developer
 * Responsibilities: Data

diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/_sass/minima/initialize.scss b/docs/_sass/minima/initialize.scss
@@ -1,9 +1,10 @@
 @charset "utf-8";
+@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap');
 
 // Define defaults for each variable.
 
-$base-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Segoe UI Symbol", "Segoe UI Emoji", "Apple Color Emoji", Roboto, Helvetica, Arial, sans-serif !default;
-$code-font-family: "Menlo", "Inconsolata", "Consolas", "Roboto Mono", "Ubuntu Mono", "Liberation Mono", "Courier New", monospace;
+$base-font-family: 'Roboto', -apple-system, BlinkMacSystemFont, "Segoe UI", "Segoe UI Symbol", "Segoe UI Emoji", "Apple Color Emoji", Helvetica, Arial, sans-serif !default;
+$code-font-family: "Roboto Mono", "Menlo", "Inconsolata", "Consolas", "Ubuntu Mono", "Liberation Mono", "Courier New", monospace;
 $base-font-size:   16px !default;
 $base-font-weight: 400 !default;
 $small-font-size:  $base-font-size * 0.875 !default;

diff --git a/docs/assets/css/style.scss b/docs/assets/css/style.scss
@@ -6,7 +6,34 @@
   "minima/skins/{{ site.minima.skin | default: 'classic' }}",
   "minima/initialize";
 
+@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap');
+
 .icon {
     height: 21px;
     width: 21px
 }
+
+.logo-site-header {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+}
+
+.logo-site-logo img {
+  height: 50px; /* Adjust the logo size as needed */
+}
+
+.logo-site-title {
+  font-size: 2em;
+  margin: 0;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: 'Roboto', sans-serif; /* Example font for headers */
+  color: #F06449;
+}
+
+p, li, a {
+  font-family: 'Roboto', sans-serif; /* Example font for body text */
+}
+
diff --git a/docs/diagrams/ArchitectureSequenceDiagram.puml b/docs/diagrams/ArchitectureSequenceDiagram.puml
@@ -8,13 +8,13 @@ Participant ":Logic" as logic LOGIC_COLOR
 Participant ":Model" as model MODEL_COLOR
 Participant ":Storage" as storage STORAGE_COLOR
 
-user -[USER_COLOR]> ui : "delete 1"
+user -[USER_COLOR]> ui : "delete z/1"
 activate ui UI_COLOR
 
-ui -[UI_COLOR]> logic : execute("delete 1")
+ui -[UI_COLOR]> logic : execute("delete z/1")
 activate logic LOGIC_COLOR
 
-logic -[LOGIC_COLOR]> model : deletePerson(p)
+logic -[LOGIC_COLOR]> model : delete(p)
 activate model MODEL_COLOR
 
 model -[MODEL_COLOR]-> logic

diff --git a/docs/diagrams/BetterModelClassDiagram.puml b/docs/diagrams/BetterModelClassDiagram.puml
@@ -5,17 +5,13 @@ skinparam arrowColor MODEL_COLOR
 skinparam classBackgroundColor MODEL_COLOR
 
 AddressBook *-right-> "1" UniquePersonList
-AddressBook *-right-> "1" UniqueTagList
-UniqueTagList -[hidden]down- UniquePersonList
-UniqueTagList -[hidden]down- UniquePersonList
 
-UniqueTagList -right-> "*" Tag
 UniquePersonList -right-> Person
 
-Person -up-> "*" Tag
-
-Person *--> Name
-Person *--> Phone
-Person *--> Email
-Person *--> Address
+Person *--> "1" Name
+Person *--> "1" Phone
+Person *--> "1" Email
+Person *--> "1" Address
+Person *--> "*" Appointment
+Person *--> "1" ID
 @enduml
diff --git a/docs/diagrams/ClearCommand-Logic.puml b/docs/diagrams/ClearCommand-Logic.puml
@@ -0,0 +1,49 @@
+@startuml
+!include style.puml
+skinparam ArrowFontStyle plain
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant "c:ClearCommand" as ClearCommand LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "a :AddressBook" as AddressBook MODEL_COLOR
+participant ":Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute(clear)
+activate LogicManager
+
+LogicManager -> AddressBookParser : parseCommand(clear)
+activate AddressBookParser
+
+create ClearCommand
+AddressBookParser -> ClearCommand
+activate ClearCommand
+
+ClearCommand --> AddressBookParser
+deactivate ClearCommand
+
+AddressBookParser --> LogicManager : c
+deactivate AddressBookParser
+
+LogicManager -> ClearCommand : execute()
+activate ClearCommand
+
+create AddressBook
+ClearCommand -> AddressBook
+activate AddressBook
+
+AddressBook -> Model : setAddressBook(a)
+deactivate AddressBook
+activate Model
+
+ClearCommand --> LogicManager : result
+deactivate ClearCommand
+deactivate Model
+
+[<-- LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/CreateDoctorCommand-Logic.puml b/docs/diagrams/CreateDoctorCommand-Logic.puml
@@ -0,0 +1,71 @@
+@startuml
+!include style.puml
+skinparam ArrowFontStyle plain
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":CreateDoctorCommandParser" as CreateDoctorCommandParser LOGIC_COLOR
+participant "d:CreateDoctorCommand" as CreateDoctorCommand LOGIC_COLOR
+participant "r:CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "m:Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute("createDoctor XXX")
+activate LogicManager
+
+LogicManager -> AddressBookParser : parseCommand("createDoctor XXX")
+activate AddressBookParser
+
+create CreateDoctorCommandParser
+AddressBookParser -> CreateDoctorCommandParser
+activate CreateDoctorCommandParser
+
+CreateDoctorCommandParser --> AddressBookParser
+deactivate CreateDoctorCommandParser
+
+AddressBookParser -> CreateDoctorCommandParser : parse("XXX")
+activate CreateDoctorCommandParser
+
+create CreateDoctorCommand
+CreateDoctorCommandParser -> CreateDoctorCommand
+activate CreateDoctorCommand
+
+CreateDoctorCommand --> CreateDoctorCommandParser :
+deactivate CreateDoctorCommand
+
+CreateDoctorCommandParser --> AddressBookParser : d
+deactivate CreateDoctorCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+CreateDoctorCommandParser -[hidden]-> AddressBookParser
+destroy CreateDoctorCommandParser
+
+AddressBookParser --> LogicManager : d
+deactivate AddressBookParser
+
+LogicManager -> CreateDoctorCommand : execute(m)
+activate CreateDoctorCommand
+
+CreateDoctorCommand -> Model : addPerson(Doctor)
+activate Model
+
+Model --> CreateDoctorCommand
+deactivate Model
+
+create CommandResult
+CreateDoctorCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> CreateDoctorCommand
+deactivate CommandResult
+
+CreateDoctorCommand --> LogicManager : r
+deactivate CreateDoctorCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
+
diff --git a/docs/diagrams/CreatePatientCommand-Logic.puml b/docs/diagrams/CreatePatientCommand-Logic.puml
@@ -0,0 +1,70 @@
+@startuml
+!include style.puml
+skinparam ArrowFontStyle plain
+
+box Logic LOGIC_COLOR_T1
+participant ":LogicManager" as LogicManager LOGIC_COLOR
+participant ":AddressBookParser" as AddressBookParser LOGIC_COLOR
+participant ":CreatePatientCommandParser" as CreatePatientCommandParser LOGIC_COLOR
+participant "d:CreatePatientCommand" as CreatePatientCommand LOGIC_COLOR
+participant "r:CommandResult" as CommandResult LOGIC_COLOR
+end box
+
+box Model MODEL_COLOR_T1
+participant "m:Model" as Model MODEL_COLOR
+end box
+
+[-> LogicManager : execute("createPatient XXX")
+activate LogicManager
+
+LogicManager -> AddressBookParser : parseCommand("createPatient XXX")
+activate AddressBookParser
+
+create CreatePatientCommandParser
+AddressBookParser -> CreatePatientCommandParser
+activate CreatePatientCommandParser
+
+CreatePatientCommandParser --> AddressBookParser
+deactivate CreatePatientCommandParser
+
+AddressBookParser -> CreatePatientCommandParser : parse("XXX")
+activate CreatePatientCommandParser
+
+create CreatePatientCommand
+CreatePatientCommandParser -> CreatePatientCommand
+activate CreatePatientCommand
+
+CreatePatientCommand --> CreatePatientCommandParser :
+deactivate CreatePatientCommand
+
+CreatePatientCommandParser --> AddressBookParser : d
+deactivate CreatePatientCommandParser
+'Hidden arrow to position the destroy marker below the end of the activation bar.
+CreatePatientCommandParser -[hidden]-> AddressBookParser
+destroy CreatePatientCommandParser
+
+AddressBookParser --> LogicManager : d
+deactivate AddressBookParser
+
+LogicManager -> CreatePatientCommand : execute(m)
+activate CreatePatientCommand
+
+CreatePatientCommand -> Model : addPerson(Patient)
+activate Model
+
+Model --> CreatePatientCommand
+deactivate Model
+
+create CommandResult
+CreatePatientCommand -> CommandResult
+activate CommandResult
+
+CommandResult --> CreatePatientCommand
+deactivate CommandResult
+
+CreatePatientCommand --> LogicManager : r
+deactivate CreatePatientCommand
+
+[<--LogicManager
+deactivate LogicManager
+@enduml
diff --git a/docs/diagrams/DeleteSequenceDiagram.puml → ...iagrams/DeletePatientSequenceDiagram.puml b/docs/diagrams/DeleteSequenceDiagram.puml → ...iagrams/DeletePatientSequenceDiagram.puml
@@ -14,10 +14,10 @@ box Model MODEL_COLOR_T1
 participant "m:Model" as Model MODEL_COLOR
 end box
 
-[-> LogicManager : execute("delete 1")
+[-> LogicManager : execute("delete z/2")
 activate LogicManager
 
-LogicManager -> AddressBookParser : parseCommand("delete 1")
+LogicManager -> AddressBookParser : parseCommand("delete z/2")
 activate AddressBookParser
 
 create DeleteCommandParser
@@ -27,7 +27,7 @@ activate DeleteCommandParser
 DeleteCommandParser --> AddressBookParser
 deactivate DeleteCommandParser
 
-AddressBookParser -> DeleteCommandParser : parse("1")
+AddressBookParser -> DeleteCommandParser : parse("z/2")
 activate DeleteCommandParser
 
 create DeleteCommand
@@ -49,7 +49,7 @@ deactivate AddressBookParser
 LogicManager -> DeleteCommand : execute(m)
 activate DeleteCommand
 
-DeleteCommand -> Model : deletePerson(1)
+DeleteCommand -> Model : deletePerson(patient)
 activate Model
 
 Model --> DeleteCommand

diff --git a/docs/diagrams/LogicClassDiagram.puml b/docs/diagrams/LogicClassDiagram.puml
@@ -39,7 +39,7 @@ LogicManager --> Storage
 Storage --[hidden] Model
 Command .[hidden]up.> Storage
 Command .right.> Model
-note right of XYZCommand: XYZCommand = AddCommand, \nFindCommand, etc
+note right of XYZCommand: XYZCommand = CreatePatientCommand, \nFindCommand, etc
 
 Logic ..> CommandResult
 LogicManager .down.> CommandResult