Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove calorie command #121

Merged

Conversation

wayne987
Copy link

remove a certain calorie from a particular day
example: remove tp/out d/2020-10-23 i/2
removes a calorie output from day:2020-10-23 with the index of 2

Wayne added 8 commits October 20, 2020 00:07
* master:
  Edit error message for calorie command
  Make edit accordingly to the review, and fix calorie command giving wrong error messages
  Add calorie command to be able to specify which date to add to
  Add CalorieManager Test
  Add CalorieManager
* master:
  Fix missing heading for UG
  Update storage and model DG
  Edit introduction of the DG
  Edit the logic component in DG
  Change intakes to inputs
  Update Ug and Dg
  Update ui diagrams
  Add stats functionality and other minor edits to the DG
  Fix checkstyle errors
  Add stats functionality to UG
* master:
  resolve merge conflicts
  Sort CI fix
  Sort Day and CalorieManager
@wayne987 wayne987 added this to the v1.3 milestone Oct 23, 2020
@wayne987 wayne987 linked an issue Oct 23, 2020 that may be closed by this pull request
@codecov-io
Copy link

codecov-io commented Oct 23, 2020

Codecov Report

Merging #121 into master will decrease coverage by 1.13%.
The diff coverage is 24.28%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master     #121      +/-   ##
============================================
- Coverage     56.76%   55.63%   -1.14%     
- Complexity      467      476       +9     
============================================
  Files            93       95       +2     
  Lines          1811     1882      +71     
  Branches        191      202      +11     
============================================
+ Hits           1028     1047      +19     
- Misses          700      748      +48     
- Partials         83       87       +4     
Impacted Files Coverage Δ Complexity Δ
...a/seedu/address/logic/commands/CalorieCommand.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
...va/seedu/address/logic/commands/RemoveCommand.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
...edu/address/logic/parser/CalorieCommandParser.java 0.00% <ø> (ø) 0.00 <0.00> (ø)
...edu/address/logic/parser/MyFitnessBuddyParser.java 75.00% <0.00%> (-3.95%) 11.00 <0.00> (ø)
...in/java/seedu/address/logic/parser/ParserUtil.java 32.46% <0.00%> (-5.42%) 10.00 <0.00> (ø)
...eedu/address/logic/parser/RemoveCommandParser.java 0.00% <0.00%> (ø) 0.00 <0.00> (?)
...main/java/seedu/address/model/calorie/Calorie.java 100.00% <ø> (ø) 3.00 <0.00> (?)
...java/seedu/address/model/calorie/CalorieCount.java 100.00% <ø> (ø) 3.00 <0.00> (?)
...ain/java/seedu/address/model/calorie/Exercise.java 66.66% <ø> (ø) 3.00 <0.00> (?)
...rc/main/java/seedu/address/model/calorie/Food.java 66.66% <ø> (ø) 3.00 <0.00> (?)
... and 16 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e41bbeb...a7ef05a. Read the comment docs.

@junhui-phoon junhui-phoon self-requested a review October 23, 2020 10:02
Copy link

@junhui-phoon junhui-phoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add missing Javadocs header to the classes under model/calorie package

import seedu.address.model.calorie.CalorieManager;
import seedu.address.model.day.Day;


Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javadocs header

import seedu.address.model.calorie.Food;
import seedu.address.model.calorie.Input;
import seedu.address.model.calorie.Output;
import seedu.address.model.calorie.Time;


Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javadocs header

import seedu.address.commons.core.index.Index;
import seedu.address.logic.commands.RemoveCommand;
import seedu.address.logic.parser.exceptions.ParseException;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javadocs header


import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;

import seedu.address.commons.core.LogsCenter;
import seedu.address.commons.core.index.Index;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Javadocs header

Wayne added 2 commits October 24, 2020 21:03
* master:
  Update version release number
  Fix checkstyle errors
  Change to BarChart for CalorieStats
  Add assertions to these classes
  removed additional assertions statement
  add sorting to daylist
  Enable assertions
  Fix checkstyle errors
  Add Dark Theme to Line Charts
  Fix bug where line charts are not updated
  Fix compilation errors caused by new CalorieManager
  Add functionality to show Calorie Stats
  Add functionality to show Weight Stats
Wayne added 3 commits October 24, 2020 23:43
* master:
  Fix bug where calorie data reset to 0 after editing
@wayne987 wayne987 self-assigned this Oct 24, 2020
Copy link

@ethanso56 ethanso56 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

@ethanso56 ethanso56 merged commit f09257f into AY2021S1-CS2103T-W11-3:master Oct 24, 2020
@wayne987 wayne987 deleted the Remove-Calorie-Command branch October 25, 2020 01:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Remove a certain calorie
4 participants