Merge remote-tracking branch into refactor-edit

NereusWB922 · Nov 13, 2023 · 84f82f6 · 84f82f6
2 parents a1d3baf + 971e49a
commit 84f82f6
Show file tree

Hide file tree

Showing 37 changed files with 1,738 additions and 740 deletions.
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/diagrams/ProfBookClassDiagram.puml b/docs/diagrams/ProfBookClassDiagram.puml
@@ -5,10 +5,10 @@ skinparam arrowColor MODEL_COLOR
 skinparam classBackgroundColor MODEL_COLOR
 
 Package ProfBook as ProfBookPackage <<Rectangle>>{
-Class "ChildrenManager" as ChildrenManager
+Class "ChildManager" as ChildrenManager
 Class "<<interface>>\nIChildElement" as IChildElement
 Class "<<interface>>\nIChildManager" as IChildManager
-Class "{abstract}\nChildrenAndTaskListManager" as ChildrenAndTaskListManager
+Class "{abstract}\nChildAndTaskListManager" as ChildrenAndTaskListManager
 Class Root
 Class Group
 Class Student

diff --git a/docs/images/beforeaftercd.png b/docs/images/beforeaftercd.png
diff --git a/docs/images/listimage.png b/docs/images/listimage.png
diff --git a/docs/images/markcommand.png b/docs/images/markcommand.png
diff --git a/docs/images/touchcommand.png b/docs/images/touchcommand.png
diff --git a/docs/sample/addTodo.json b/docs/sample/addTodo.json
@@ -0,0 +1,127 @@
+{
+  "groups" : [ {
+    "name" : "Group One",
+    "id" : "GRP-001",
+    "students" : [ {
+      "name" : "Tejas",
+      "phone" : "67352798",
+      "email" : "[email protected]",
+      "address" : "170 Ghim Moh Road Ncss Centre",
+      "id" : "0001Y",
+      "tasks" : [ {
+        "type" : "ToDo",
+        "description" : "Assignment One",
+        "isDone" : "false"
+      } ]
+    }, {
+      "name" : "Jackie",
+      "phone" : "65341488",
+      "email" : "[email protected]",
+      "address" : "1 Park Road 03-K78 People's Park Complex",
+      "id" : "0002Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Raman",
+      "phone" : "64755838",
+      "email" : "[email protected]",
+      "address" : "3Rd Floor, 80 Raffles Place, Uob Plaza 2",
+      "id" : "0003Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Yarn Meng",
+      "phone" : "65467742",
+      "email" : "[email protected]",
+      "address" : "480 Lorong 6 Toa Payoh Atrium 4th Storey HDB Hub",
+      "id" : "0004Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Kiat Win",
+      "phone" : "62102572",
+      "email" : "[email protected]",
+      "address" : "4 Loyang Walk Loyang Industrial Estate",
+      "id" : "0005Y",
+      "tasks" : [ ]
+    } ],
+    "tasks" : [ ]
+  }, {
+    "name" : "Best Group in CS2103T",
+    "id" : "GRP-002",
+    "students" : [ {
+      "name" : "Ming Yuan",
+      "phone" : "64380137",
+      "email" : "[email protected]",
+      "address" : "Woodlands, Malaysia",
+      "id" : "0006Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Zann",
+      "phone" : "62924352",
+      "email" : "[email protected]",
+      "address" : "Somewhere in bedok",
+      "id" : "0007Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Nereus",
+      "phone" : "63365480",
+      "email" : "[email protected]",
+      "address" : "Muar, Johor, Malaysia",
+      "id" : "0008Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Gary",
+      "phone" : "67792128",
+      "email" : "[email protected]",
+      "address" : "Somewhere in Malaysia",
+      "id" : "0009Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Nidhish",
+      "phone" : "63480398",
+      "email" : "[email protected]",
+      "address" : "Somewhere in Sinagpore",
+      "id" : "0010Y",
+      "tasks" : [ ]
+    } ],
+    "tasks" : [ {
+      "type" : "ToDo",
+      "description" : "Task 0",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 1",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 2",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 3",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 4",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 5",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 6",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 7",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 8",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 9",
+      "isDone" : "false"
+    } ]
+  } ]
+}
diff --git a/docs/sample/empty.json b/docs/sample/empty.json
@@ -0,0 +1,3 @@
+{
+  "groups" : [ ]
+}
diff --git a/docs/sample/removeTejas.json b/docs/sample/removeTejas.json
@@ -0,0 +1,116 @@
+{
+  "groups" : [ {
+    "name" : "Group One",
+    "id" : "GRP-001",
+    "students" : [ {
+      "name" : "Jackie",
+      "phone" : "65341488",
+      "email" : "[email protected]",
+      "address" : "1 Park Road 03-K78 People's Park Complex",
+      "id" : "0002Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Raman",
+      "phone" : "64755838",
+      "email" : "[email protected]",
+      "address" : "3Rd Floor, 80 Raffles Place, Uob Plaza 2",
+      "id" : "0003Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Yarn Meng",
+      "phone" : "65467742",
+      "email" : "[email protected]",
+      "address" : "480 Lorong 6 Toa Payoh Atrium 4th Storey HDB Hub",
+      "id" : "0004Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Kiat Win",
+      "phone" : "62102572",
+      "email" : "[email protected]",
+      "address" : "4 Loyang Walk Loyang Industrial Estate",
+      "id" : "0005Y",
+      "tasks" : [ ]
+    } ],
+    "tasks" : [ ]
+  }, {
+    "name" : "Best Group in CS2103T",
+    "id" : "GRP-002",
+    "students" : [ {
+      "name" : "Ming Yuan",
+      "phone" : "64380137",
+      "email" : "[email protected]",
+      "address" : "Woodlands, Malaysia",
+      "id" : "0006Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Zann",
+      "phone" : "62924352",
+      "email" : "[email protected]",
+      "address" : "Somewhere in bedok",
+      "id" : "0007Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Nereus",
+      "phone" : "63365480",
+      "email" : "[email protected]",
+      "address" : "Muar, Johor, Malaysia",
+      "id" : "0008Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Gary",
+      "phone" : "67792128",
+      "email" : "[email protected]",
+      "address" : "Somewhere in Malaysia",
+      "id" : "0009Y",
+      "tasks" : [ ]
+    }, {
+      "name" : "Nidhish",
+      "phone" : "63480398",
+      "email" : "[email protected]",
+      "address" : "Somewhere in Sinagpore",
+      "id" : "0010Y",
+      "tasks" : [ ]
+    } ],
+    "tasks" : [ {
+      "type" : "ToDo",
+      "description" : "Task 0",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 1",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 2",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 3",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 4",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 5",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 6",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 7",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 8",
+      "isDone" : "false"
+    }, {
+      "type" : "ToDo",
+      "description" : "Task 9",
+      "isDone" : "false"
+    } ]
+  } ]
+}