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

Zhong ming branch data base #138

Open
wants to merge 374 commits into
base: master
Choose a base branch
from

Conversation

snowbanana12345
Copy link

updated data base

0xEljh and others added 30 commits October 21, 2020 14:59
FoodEntry child class that supports datetime functionality.
To reduce coupling between Food and Ui class.
The method prints food items in the food list that were recorded during a certain time period.
- add -> full information
- swappable, optional add command
- swappable info command
- catch index error for delete
# Conflicts:
#	src/main/java/seedu/dietbook/Ui.java
#	src/test/java/seedu/dietbook/UiTest.java
This acts as a inbetween between save and load classes and Food List
Add manual test
Passed manual test
* 'master' of https://github.com/AY2021S1-CS2113-T14-4/tp: (46 commits)
  Remove Duke.java
  Rename duke package to dietbook
  change FilePathing to ClassPathing
  fixed calculator
  data printing
  Add new line at the end of the file
  Add ending divider
  Update Expected.TXT with welcome message
  Remove I/O testing
  Change main class in build.gradle
  added back duke
  removed index subtraction
  shortened delete case
  checkstyle fix
  v1.0
  no message
  replace constructor java doc with class java doc
  swap order of assertEquals
  add documentation for food class
  pass gradle checkstyle test
  ...
0xEljh and others added 30 commits October 29, 2020 12:58
Method overload that accepts food object directly. For save-loading and adding from database.
…-4/clean-up-branch

overload addFoodAtDateTime
…ng-Ming-UserGuide-Branch

Zhong ming user guide branch
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.

5 participants