Merge pull request #249 from CFZeon/master

update dg
AY2021S1-CS2113T-F11-1 · Nov 9, 2020 · 5e65c64 · 5e65c64
2 parents 123aec1 + a324a23
commit 5e65c64
Show file tree

Hide file tree

Showing 26 changed files with 143 additions and 92 deletions.
diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
diff --git a/docs/pictures/Shukai/FoodItemAdd.png b/docs/pictures/Shukai/FoodItemAdd.png
diff --git a/docs/pictures/Shukai/FoodItemAdd.puml b/docs/pictures/Shukai/FoodItemAdd.puml
@@ -1,5 +1,6 @@
 @startuml
-@startuml
+!define PLANTUML_HOME %dirpath()/../../umldiagram
+!include ../../umldiagram/style.puml
 actor user
 user -> DietSession : input
 activate DietSession
@@ -16,5 +17,4 @@ FoodItemAdd --> DietSession
 deactivate FoodItemAdd
 
 DietSession --> user : output
-@enduml
 @enduml
diff --git a/docs/pictures/Shukai/FoodItemClear.png b/docs/pictures/Shukai/FoodItemClear.png
diff --git a/docs/pictures/Shukai/FoodItemClear.puml b/docs/pictures/Shukai/FoodItemClear.puml
@@ -1,4 +1,6 @@
 @startuml
+!define PLANTUML_HOME %dirpath()/../../umldiagram
+!include ../../umldiagram/style.puml
 actor user
 user -> DietSession : input
 activate DietSession

diff --git a/docs/pictures/Shukai/FoodItemDelete.png b/docs/pictures/Shukai/FoodItemDelete.png
diff --git a/docs/pictures/Shukai/FoodItemDelete.puml b/docs/pictures/Shukai/FoodItemDelete.puml
@@ -1,4 +1,6 @@
 @startuml
+!define PLANTUML_HOME %dirpath()/../../umldiagram
+!include ../../umldiagram/style.puml
 actor user
 user -> DietSession : input
 activate DietSession

diff --git a/docs/pictures/Shukai/FoodItemHelp.png b/docs/pictures/Shukai/FoodItemHelp.png
diff --git a/docs/pictures/Shukai/FoodItemHelp.puml b/docs/pictures/Shukai/FoodItemHelp.puml
@@ -1,4 +1,6 @@
 @startuml
+!define PLANTUML_HOME %dirpath()/../../umldiagram
+!include ../../umldiagram/style.puml
 actor user
 user -> DietSession : input
 activate DietSession

diff --git a/docs/pictures/Shukai/FoodItemList.png b/docs/pictures/Shukai/FoodItemList.png
diff --git a/docs/pictures/Shukai/FoodItemList.puml b/docs/pictures/Shukai/FoodItemList.puml
@@ -1,4 +1,6 @@
 @startuml
+!define PLANTUML_HOME %dirpath()/../../umldiagram
+!include ../../umldiagram/style.puml
 actor user
 user -> DietSession : input
 activate DietSession

diff --git a/docs/pictures/Shukai/FoodItemSearch.png b/docs/pictures/Shukai/FoodItemSearch.png
diff --git a/docs/pictures/Shukai/FoodItemSearch.puml b/docs/pictures/Shukai/FoodItemSearch.puml
@@ -1,4 +1,6 @@
 @startuml
+!define PLANTUML_HOME %dirpath()/../../umldiagram
+!include ../../umldiagram/style.puml
 actor user
 user -> DietSession : input
 activate DietSession

diff --git a/docs/pictures/Zeon/CreateDietSession.png b/docs/pictures/Zeon/CreateDietSession.png
diff --git a/docs/pictures/Zeon/CreateDietSession.puml b/docs/pictures/Zeon/CreateDietSession.puml
@@ -4,7 +4,7 @@
 actor user
 activate DietManager
 user -> DietManager : "new"
-DietManager -> DietManagerParser : parse()
+DietManager -> DietManagerParser : parse(userInput)
 activate DietManagerParser
 DietManagerParser --> DietManager : commParts[]
 deactivate DietManagerParser

diff --git a/docs/pictures/Zeon/DietSessionClear.png b/docs/pictures/Zeon/DietSessionClear.png
diff --git a/docs/pictures/Zeon/DietSessionClear.puml b/docs/pictures/Zeon/DietSessionClear.puml
@@ -5,7 +5,7 @@
 actor user
 user -> DietManager : "clear"
 activate DietManager
-DietManager -> DietManagerParser : parse()
+DietManager -> DietManagerParser : parse(userInput)
 activate DietManagerParser
 DietManagerParser --> DietManager : commParts[]
 deactivate DietManagerParser

diff --git a/docs/pictures/Zeon/DietSessionDelete.png b/docs/pictures/Zeon/DietSessionDelete.png
diff --git a/docs/pictures/Zeon/DietSessionDelete.puml b/docs/pictures/Zeon/DietSessionDelete.puml
@@ -5,7 +5,7 @@
 actor user
 user -> DietManager : "delete [INDEX]"
 activate DietManager
-DietManager -> DietManagerParser : parse()
+DietManager -> DietManagerParser : parse(userInput)
 activate DietManagerParser
 DietManagerParser --> DietManager : commParts[]
 deactivate DietManagerParser

diff --git a/docs/pictures/Zeon/DietSessionEdit.png b/docs/pictures/Zeon/DietSessionEdit.png
diff --git a/docs/pictures/Zeon/DietSessionEdit.puml b/docs/pictures/Zeon/DietSessionEdit.puml
@@ -4,7 +4,7 @@
 actor user
 user -> DietManager : input
 activate DietManager
-DietManager -> DietManagerParser : parse()
+DietManager -> DietManagerParser : parse(userInput)
 activate DietManagerParser
 DietManagerParser --> DietManager : commParts[]
 deactivate DietManagerParser

diff --git a/docs/pictures/Zeon/DietSessionList.png b/docs/pictures/Zeon/DietSessionList.png
diff --git a/docs/pictures/Zeon/DietSessionList.puml b/docs/pictures/Zeon/DietSessionList.puml
@@ -5,7 +5,7 @@
 actor user
 user -> DietManager : "List"
 activate DietManager
-DietManager -> DietManagerParser : parse()
+DietManager -> DietManagerParser : parse(userInput)
 activate DietManagerParser
 DietManagerParser --> DietManager : commParts[]
 deactivate DietManagerParser

diff --git a/docs/pictures/Zeon/SearchDietSession.png b/docs/pictures/Zeon/SearchDietSession.png
diff --git a/docs/pictures/Zeon/SearchDietSession.puml b/docs/pictures/Zeon/SearchDietSession.puml
@@ -5,7 +5,7 @@
 actor user
 user -> DietManager : "search"
 activate DietManager
-DietManager -> DietManagerParser : parse()
+DietManager -> DietManagerParser : parse(userInput)
 activate DietManagerParser
 DietManagerParser --> DietManager : commParts[]
 deactivate DietManagerParser

diff --git a/src/test/java/saves/ProfileCommandsTest/profileDataFile.json b/src/test/java/saves/ProfileCommandsTest/profileDataFile.json
@@ -1,7 +1,7 @@
 {
   "name": "Schwarzenegger",
-  "height": 200,
+  "height": 188,
   "weight": 113.0,
-  "expectedWeight": 100.0,
+  "expectedWeight": 76.7,
   "calories": 2500.0
 }