diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md index 6746a3d659..41baa0faae 100644 --- a/docs/DeveloperGuide.md +++ b/docs/DeveloperGuide.md @@ -380,7 +380,7 @@ When the user attempts to delete an added profile, the ProfileSession, Ui, Profi 1. User executes `delete` 1. `ProfileSession` calls `Ui.getUserCommand()` to receive user input. - 1. ProfileSession` calls `ProfileParser.parseCommand()` to parse user input into a string array. + 1. `ProfileSession` calls `ProfileParser.parseCommand()` to parse user input into a string array. 1. Creating `ProfileDelete` object. 1. Based on the parsed input, `ProfileSession` calls `CommandLib` to return the correct Command Object `ProfileDelete`. 1. Executing command. @@ -421,16 +421,20 @@ This command lists out all help commands in a typed list that indicates to the u **Implementation** When the user types `help` in a Diet Manager instance, the following sequence occurs. -1. The user keys in `help`. - - 1. A `DietSessionUi` component will call `dietSessionUI.getInput()`. - 1. Input will be parsed in `processCommand()`. - -2. Creation of `DietSessionHelp` command object from input - 1. This will create a `DietSessionHelp()` instantiation of which the method `execute()` is called. + +1. User executes `help` + 1. `DietManager` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietManager` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionHelp` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionHelp`. +1. Executing command. + 1. `DietManager` calls `DietSessionHelp.execute()` with the rest of parsed input. + 1. `DietSessionHelp` appends onto a string builder a list of typed help commands. + 1. `DietSessionHelp` returns a CommandResult object with the help message. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. -3. Executing Command - 1. The execute() method will call print out the list of commands onto the console with printHelpFormatter() from static CommonUi.java. ↑ Return to Top #### 4.3.2. Start recording diet data: `new` @@ -438,16 +442,20 @@ The feature allows users to start recording diet data. **Implementation** When the user types `new ` the following sequence occurs. -1. The user keys in `new /d 2020-05-04 /t breakfast`. - - 1. A `DietSessionUi` component will call `dietSessionUI.getInput()`. - 1. Input will be parsed in `processCommand()`, which splits the input into the `command` and the `input`. - -2. Creation of command object from input - 1. This will create an instantiation DietSessionCreate() command object of which the method execute() is called. - -3. Executing Command - 1. The newly created object will then create an instantiation of a `DietSession`, and call the `start()` method. + +1. User executes `new /d 2020-05-04 /t breakfast` + 1. `DietManager` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietManager` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionHelp` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionCreate`. +1. Executing command. + 1. `DietManager` calls `DietSessionCreate.execute()` with the rest of parsed input. + 1. `DietSessionCreate` calls the `start()` method within an instantiated DietSession created with the parsed input. + 1. `DietSession` then proceeds to completion until the user types "end", saving after every command with `DietStorage`. + 1. `DietSessionHelp` returns a CommandResult object with the help message of the diet manager. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. The sequence diagram below summarizes how creating new diet session works: @@ -461,15 +469,17 @@ This command lists out all help commands in a typed list that indicates to the u **Implementation** When the user types `help` the following sequence occurs. 1. The user keys in `help`. - - 1. A `DietSessionUi` instantiation calls `dietSessionUI.getInput()`. - 1. Input will be parsed in `processCommand()`. - -2. Creation of command object from input - 1. This will create a `FoodItemHelp()` instantiation of which the method `execute()` is called. - -3. Executing Command - 1. The newly created object will then print out the list of commands onto the console with printHelpFormatter() from static CommonUi.java. + 1. `DietSession` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietSession` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionHelp` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionHelp`. +1. Executing command. + 1. `DietSession` calls `FoodItemHelp.execute()`. + 1. `DietSessionHelp` appends onto a string builder a list of typed help commands. + 1. `DietSessionHelp` returns a CommandResult object with the help message. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. ↑ Return to Top @@ -516,6 +526,8 @@ When the user types `list` the following sequence occurs. 1. The total calories of the current meal is also printed. ![Load Data Sequence Diagram](pictures/Shukai/FoodItemList.png) + +↑ Return to Top #### 4.3.2.4. Deleting data from the current diet session: `delete` @@ -535,6 +547,8 @@ When the user types `delete [INDEX_OF_FOOD]` the following sequence occurs. 1. The Food ID according to the index based on the ArrayList is deleted. ![Load Data Sequence Diagram](pictures/Shukai/FoodItemDelete.png) + +↑ Return to Top #### 4.3.2.5. Clearing all data from the current diet session `clear` @@ -554,6 +568,8 @@ When the user types `clear` the following sequence occurs. 1. The ArrayList Clear method is called and removes all Food entries from the ArrayList. ![Load Data Sequence Diagram](pictures/Shukai/FoodItemClear.png) + +↑ Return to Top #### 4.3.2.6. Stopping the recording of diet session data: `end` @@ -568,6 +584,8 @@ When the user types `end` the following sequence occurs. 2. Exiting of inputLoop() The inputLoop() exits when userInput.equals("end"). + +↑ Return to Top #### 4.3.3. List all past diet sessions: `list` The feature allows users to view all past created diet sessions. @@ -575,19 +593,26 @@ The feature allows users to view all past created diet sessions. **Implementation** When the user types `list` in a diet manager instance the following sequence occurs. 1. The user keys in `list`. - - 1. A `DietSessionUi` component will call `dietSessionUI.getInput()`. - 1. Input will be parsed in `processCommand()`. - -2. Creation of command object from input - 1. This will create a FoodItemList() instantiation of which the method execute() is called. - -3. Executing Command - 1. A for loop iterates through the entire ArrayList and prints out every item with their calories. + 1. `DietManager` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietManager` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionList` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionList`. +1. Executing command. + 1. `DietManager` calls `DietSessionList.execute()` with the rest of parsed input. + 1. The execute method opens a directed save folder on the drive then assigns it to a File array. + 1. `DietSessionList` then calls the `formatList()` method which takes the File Array and converts it into an ArrayList. + 1. `DietSessionList` then calls the `formatRow()` method from within formatList() which converts the files into a formatted table output. + 1. `DietSessionList` returns a CommandResult object with the entire table message of the diet sessions. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. The sequence diagram below summarizes how listing past Diet sessions work: ![Load Data Sequence Diagram](pictures/Zeon/DietSessionList.png) + +↑ Return to Top + #### 4.3.4. Edit a past diet session: `edit` The feature allows users to edit previously created diet sessions. @@ -595,20 +620,20 @@ The feature allows users to edit previously created diet sessions. **Implementation** When the user types `edit [INDEX_OF_SESSION]` the following sequence occurs. 1. The user keys in `edit 1`. + 1. `DietManager` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietManager` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionEdit` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionEdit`. +1. Executing command. + 1. `DietManager` calls `DietSessionEdit.execute()` with the rest of parsed input. + 1. The execute method then calls `readDietSession()` from DietStorage which returns a dietSession instance. + 1. `DietSessionEdit` then calls the `start()` method within an instantiated DietSession created with the parsed input. + 1. `DietSession` then proceeds to completion until the user types "end", saving after every command with `DietStorage`. + 1. `DietSessionHelp` returns a CommandResult object with the help message of the diet manager. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. - 1. A `DietSessionUi` component will call `dietSessionUI.getInput()`. - 1. Input will be parsed in `processCommand()`. - -2. Creation of `DietSessionEdit` command object from input - 1. A `DietSessionEdit()` command class instantiation is created and the execute() method is called. - -3. Executing Command - 1. This will call `readDietSession()` from `workoutSessionStorage.diet.DietStorage` and it reads the file stored at `saves/diet`. - 1. The `start()` method is then called in the diet session, starting a diet session instance. - -4. After Execution - 1. The diet session instance is then saved by calling `writeToStorageDietSession()` from `DietStorage` - The sequence diagram below summarizes how editing Diet session works: ![Load Data Sequence Diagram](pictures/Zeon/DietSessionEdit.png) @@ -625,6 +650,8 @@ Saving of the user’s Diet sessions: - Pros: The files will still be saved even if a crash occurs. - Cons: Saving often might be taxing on the user's computer especially on slower models. + +↑ Return to Top #### 4.3.5. Delete a previously created diet session: `delete` @@ -633,20 +660,24 @@ The feature allows users to delete previously created diet sessions. **Implementation** When the user types `delete [INDEX_OF_SESSION]` from a Diet manager instance the following sequence occurs. 1. The user keys in `delete 1`. - - 1. A `DietSessionUi` component will call `dietSessionUI.getInput()`. - 1. The input is then parsed in `processCommand()` which splits the input into a command portion and the input parameters. - -2. Creation of `DietSessionDelete()` command object from input - 1. The `CommandLib` is referenced to find information on `DietSessionDelete()`. - 2. A `DietSessionDelete()` command class instantiation is created and the `execute()` method is called. - -3. Executing Command - 1. `DietSessionDelete()` will then delete the diet session at index `1` based on the `list` command. + 1. `DietManager` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietManager` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionDelete` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionDelete`. +1. Executing command. + 1. `DietManager` calls `DietSessionDelete.execute()` with the rest of parsed input. + 1. The execute method then deletes the file at the indicated index `1` if a file was present there. + 1. `DietSessionDelete` returns a CommandResult object with the delete confirmation message from DietmanagerUi. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. The sequence diagram below summarizes how Diet sessions are deleted: ![Delete_Diet_Session_Sequence_Diagram](pictures/Zeon/DietSessionDelete.png) + +↑ Return to Top + #### 4.3.6. Clear all past diet session: `clear` The feature allows users to clear all previously created diet sessions at once. @@ -654,20 +685,24 @@ The feature allows users to clear all previously created diet sessions at once. **Implementation** When the user types `clear` the following sequence occurs. 1. The user keys in `clear`. - - 1. A `DietSessionUi` component will call `dietSessionUI.getInput()`. - 1. Input will be parsed in `processCommand()`. - -2. Creation of `DietSessionClear()` command object from input - 1. The `CommandLib` is referenced to find information on `DietSessionClear()`. - 2. A `DietSessionClear()` command class instantiation is created and the `execute()` method is called. - -3. Executing Command - 1. This will iterate through every file in saves/diet/ and delete it. + 1. `DietManager` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietManager` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionClear` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionClear`. +1. Executing command. + 1. `DietManager` calls `DietSessionDelete.execute()` with the rest of parsed input. + 1. The execute method then deletes the file at the indicated index `1` if a file was present there. + 1. `DietSessionDelete` returns a CommandResult object with the delete confirmation message from DietmanagerUi. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. The sequence diagram below summarizes how Diet sessions are all cleared: ![Delete_Diet_Session_Sequence_Diagram](pictures/Zeon/DietSessionClear.png) + +↑ Return to Top + #### 4.3.7. Search for past diet session: `search` The feature allows users to search for previously created diet sessions within a date range or with a specified tag. @@ -675,20 +710,26 @@ The feature allows users to search for previously created diet sessions within a **Implementation** When the user types `search /s 2020-11-01 /e 2020-11-03 /t breakfast` the following sequence occurs. 1. The user keys in `search /s 2020-11-01 /e 2020-11-03 /t breakfast`. - - 1. A `DietSessionUi` component will call `dietSessionUI.getInput()`. - 1. Input will be parsed in `processCommand()`. - -2. Creation of `DietSessionSearch()` command object from input - 1. The `CommandLib` is referenced to find information on `DietSessionSearch()`. - 2. A `DietSessionSearch()` command class instantiation is created and the `execute()` method is called. - -3. Executing Command - 1. This will look for saved Diet Sessions within the date range specified for 1st November 2020 and 3rd November 2020 with the tag "breakfast" and print them all out on a list. + 1. `DietManager` calls `dietManagerUi.getCommand()` to receive user input. + 1. `DietManager` calls `DietManagerParser.parseCommand()` to parse user input into a string array. +1. Creating `DietSessionSearch` object. + 1. Based on the parsed input, `DietManager` calls `CommandLib` to return the correct Command Object `DietSessionSearch`. +1. Executing command. + 1. `DietManager` calls `DietSessionSearch.execute()` with the rest of parsed input. + 1. The execute method then iterates through the entire folder and looks for empty tags and folders with the methods `checkEmptyTag()` and `checkEmptyFolder`. + 1. `DietSessionSearch` calls the `addToSearchResult()` method which from within calls the `addRow()` method that converts the file output into a table format. + 1. `DietSessionSearch` returns a `CommandResult` object with the search results. + 1. If the starting search date is after the ending search date, the method will return with an exception which is then returned with the `CommandResult` message. +1. Prompting result to user. + 1. `DietManager` calls `CommandResult.getFeedbackMessage()` to get the execution feedback message. + 1. `CommandResult` calls `Ui.showToUser()` to show result to the user. The sequence diagram below summarizes how Diet sessions is searched: -![Search_Diet_Session_Sequence_Diagram](pictures/Zeon/DietSessionSearch.png) +![Search_Diet_Session_Sequence_Diagram](pictures/Zeon/SearchDietSession.png) + +↑ Return to Top + #### 4.3.8. Exit the Diet manager: `end` The function returns the user back to the main menu of The Schwarzenegger. diff --git a/docs/pictures/Shukai/FoodItemAdd.png b/docs/pictures/Shukai/FoodItemAdd.png index 3f67515251..163c855adb 100644 Binary files a/docs/pictures/Shukai/FoodItemAdd.png and b/docs/pictures/Shukai/FoodItemAdd.png differ diff --git a/docs/pictures/Shukai/FoodItemAdd.puml b/docs/pictures/Shukai/FoodItemAdd.puml index 82881f9101..68b10282e9 100644 --- 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 \ No newline at end of file diff --git a/docs/pictures/Shukai/FoodItemClear.png b/docs/pictures/Shukai/FoodItemClear.png index 84e1387f89..143dcb0eaf 100644 Binary files a/docs/pictures/Shukai/FoodItemClear.png and b/docs/pictures/Shukai/FoodItemClear.png differ diff --git a/docs/pictures/Shukai/FoodItemClear.puml b/docs/pictures/Shukai/FoodItemClear.puml index da5fa4553e..f6440fae42 100644 --- 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 index d5f9a00c42..3d2fcab267 100644 Binary files a/docs/pictures/Shukai/FoodItemDelete.png and b/docs/pictures/Shukai/FoodItemDelete.png differ diff --git a/docs/pictures/Shukai/FoodItemDelete.puml b/docs/pictures/Shukai/FoodItemDelete.puml index 0bb5cf53f6..ca0ad5d384 100644 --- 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 index ff68a186fc..a8b480af5e 100644 Binary files a/docs/pictures/Shukai/FoodItemHelp.png and b/docs/pictures/Shukai/FoodItemHelp.png differ diff --git a/docs/pictures/Shukai/FoodItemHelp.puml b/docs/pictures/Shukai/FoodItemHelp.puml index 5c65824685..1997d661d5 100644 --- 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 index ac2df3c8d6..fe3e3e9294 100644 Binary files a/docs/pictures/Shukai/FoodItemList.png and b/docs/pictures/Shukai/FoodItemList.png differ diff --git a/docs/pictures/Shukai/FoodItemList.puml b/docs/pictures/Shukai/FoodItemList.puml index 495082f783..1a74adff4a 100644 --- 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 index dac99c5780..6a1fac998b 100644 Binary files a/docs/pictures/Shukai/FoodItemSearch.png and b/docs/pictures/Shukai/FoodItemSearch.png differ diff --git a/docs/pictures/Shukai/FoodItemSearch.puml b/docs/pictures/Shukai/FoodItemSearch.puml index 72bdbe023c..8c5c013462 100644 --- 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 index 1b0fea39fa..17948c9e68 100644 Binary files a/docs/pictures/Zeon/CreateDietSession.png and b/docs/pictures/Zeon/CreateDietSession.png differ diff --git a/docs/pictures/Zeon/CreateDietSession.puml b/docs/pictures/Zeon/CreateDietSession.puml index 3f00cc286b..6af387b169 100644 --- 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 index b80000b50a..8f827effa2 100644 Binary files a/docs/pictures/Zeon/DietSessionClear.png and b/docs/pictures/Zeon/DietSessionClear.png differ diff --git a/docs/pictures/Zeon/DietSessionClear.puml b/docs/pictures/Zeon/DietSessionClear.puml index 69fe4e77dc..4f54f4d3d0 100644 --- 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 index bc4a774cd1..1b472573a2 100644 Binary files a/docs/pictures/Zeon/DietSessionDelete.png and b/docs/pictures/Zeon/DietSessionDelete.png differ diff --git a/docs/pictures/Zeon/DietSessionDelete.puml b/docs/pictures/Zeon/DietSessionDelete.puml index db6b193b93..3b380c311b 100644 --- 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 index 2c759ec5e6..195670d0c1 100644 Binary files a/docs/pictures/Zeon/DietSessionEdit.png and b/docs/pictures/Zeon/DietSessionEdit.png differ diff --git a/docs/pictures/Zeon/DietSessionEdit.puml b/docs/pictures/Zeon/DietSessionEdit.puml index 9bb700bddd..008e436168 100644 --- 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 index 2e3b68f0d5..ffff41e4ba 100644 Binary files a/docs/pictures/Zeon/DietSessionList.png and b/docs/pictures/Zeon/DietSessionList.png differ diff --git a/docs/pictures/Zeon/DietSessionList.puml b/docs/pictures/Zeon/DietSessionList.puml index e6dc794002..c4f0df36b5 100644 --- 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 index bde24ef6de..a69611c636 100644 Binary files a/docs/pictures/Zeon/SearchDietSession.png and b/docs/pictures/Zeon/SearchDietSession.png differ diff --git a/docs/pictures/Zeon/SearchDietSession.puml b/docs/pictures/Zeon/SearchDietSession.puml index 1f4a1d7ec7..7ac820d0c6 100644 --- 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 index a7fab60481..7a6e58f9b4 100644 --- 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 } \ No newline at end of file