[CS2113-W14-1] FitNUS #16
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JeffinsonDarmawan
added a commit
to JeffinsonDarmawan/tp
that referenced
this pull request
Mar 14, 2024
…-functionality Added a help command
wenxin-c
reviewed
Mar 24, 2024
Comment on lines
31
to
35
| calories = nutrients[0] * drinkVolume / 100; | ||
| carbs = nutrients[1] * drinkVolume / 100; | ||
| sugar = nutrients[2] * drinkVolume / 100; | ||
| protein = nutrients[3] * drinkVolume / 100; | ||
| fat = nutrients[4] * drinkVolume / 100; |
There was a problem hiding this comment.
Try to avoid magic numbers, you could consider creating a constant for "100" and give it a meaningful name, similar for magic strings as well.
| System.out.println("Sorry that drink is not registered in the database."); | ||
| } catch (UnregisteredMealException e) { | ||
| System.out.println("Sorry that meal is not registered in the database."); | ||
| } catch (invalidIndexException e) { |
There was a problem hiding this comment.
Class name should be in pascal form, i.e. capital i for invalid.
Comment on lines
68
to
126
| public void handleViewCarbohydrates() { | ||
| int carbohydratesCount = 0; | ||
| for (Meal meal: mealList) { | ||
| carbohydratesCount += meal.getCarbs(); | ||
| } | ||
| for (Drink drink: drinkList) { | ||
| carbohydratesCount += drink.getCarbs(); | ||
| } | ||
| System.out.println("Total Carbohydrates: " + carbohydratesCount); | ||
| } | ||
|
|
||
| public void handleViewProteins() { | ||
| int proteinCount = 0; | ||
| for (Meal meal: mealList) { | ||
| proteinCount += meal.getProtein(); | ||
| } | ||
| for (Drink drink: drinkList) { | ||
| proteinCount += drink.getProtein(); | ||
| } | ||
| System.out.println("Total Proteins: " + proteinCount); | ||
| } | ||
|
|
||
| public void handleViewWaterIntake() { | ||
| int waterIntake = 0; | ||
| for (Water water: totalWaterIntake) { | ||
| waterIntake += water.getWater(); | ||
| } | ||
| System.out.println("Total water intake: " + waterIntake + " ml"); | ||
| } | ||
|
|
||
| public static void handleViewFiber() { | ||
| int fibreCount = 0; | ||
| for (Meal meal: mealList) { | ||
| fibreCount += meal.getFiber(); | ||
| } | ||
| System.out.println("Total Fiber: " + fibreCount); | ||
| } | ||
|
|
||
| public void handleViewFat() { | ||
| int fatCount = 0; | ||
| for (Meal meal: mealList) { | ||
| fatCount += meal.getFat(); | ||
| } | ||
| for (Drink drink: drinkList) { | ||
| fatCount += drink.getFat(); | ||
| } | ||
| System.out.println("Total Fat: " + fatCount); | ||
| } | ||
|
|
||
| public void handleViewSugar() { | ||
| int sugarCount = 0; | ||
| for (Meal meal: mealList) { | ||
| sugarCount += meal.getSugar(); | ||
| } | ||
| for (Drink drink: drinkList) { | ||
| sugarCount += drink.getSugar(); | ||
| } | ||
| System.out.println("Total Sugar: " + sugarCount); | ||
| } |
There was a problem hiding this comment.
Instead of repeating the same code with only minor changes in terms of which aspect of the composition you are interested in, you can consider abstracting further by creating a method with parameter being your interested aspect. Similar for the methods below.
| System.out.println("- List entire food intake for the day: listEverything"); | ||
| System.out.println("- Edit an existing meal after inserted: editMeal INDEX s/NEW_SERVING_SIZE"); | ||
| System.out.println("- Edit an existing drink after inserted: editDrink INDEX s/NEW_SERVING_SIZE"); | ||
| //System.out.println("- Edit water intake after inserted: editWater s/TOTAL_WATER_INTAKE"); |
There was a problem hiding this comment.
Remember to remove unused/commented code.
|
|
||
| public static void parseEditMeal(String command) { | ||
| int mealSizePosition = command.indexOf("/"); | ||
| editMealIndex = Integer.parseInt(command.substring(9, mealSizePosition - 2).trim()) - 1; |
There was a problem hiding this comment.
Try to avoid magic numbers and create a constant with a meaninful name instead, e.g. offsetOne
src/main/java/seedu/fitnus/Ui.java
Outdated
| System.out.println("What would you like to track today?"); | ||
| Meal.printAvailableMeals(); | ||
| Drink.printAvailableDrinks(); | ||
| System.out.println(LINE); |
There was a problem hiding this comment.
Consider using the print line method created below instead.
This reverts commit b68111c.
minor fixes to Drink, Meal, Parser, User. Added exercises to exercises csv
Add JUnit for Exercises
Update developer guide
...up to 1.4.8
Edit user guide
added recommendations to view Calories and view Water
Revert "added recommendations to view Calories and view Water"
Update User Guide
...edit existing recommendation feature by Tina
Edit recommendation feature
Update DeveloperGuide
…into DG # Conflicts: # docs/DeveloperGuide.md
Finalise UG, DG and PPP
Update PPP links to page
Edit Storage Class Diagram
Resize sequence diagrams in DG
Regenerate diagrams.png
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
FitNUS helps NUS students keep track of their caloric intake and activities. It is optimized for CLI users so that tracking food can be done faster by typing in commands.