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

166152327 Upgrade nutrition plan to show consumed meals #20

Merged
merged 1 commit into from
Jun 14, 2019

Conversation

Kimaiyo077
Copy link
Contributor

@Kimaiyo077 Kimaiyo077 commented Jun 13, 2019

Title

Clients should now be able to update their nutrition plans with the food they actually consumed during the day and provide a specific

Description

When a user creates a new plan, they should be able to create a meal that is planned and also a meal that was actually consumed during the day. With that, they should be able to compare what they planned to eat and what they had for the day.

Type of change

  • Bug fix (non-breaking change which fixes an issue)

  • New feature (non-breaking change which adds functionality)

  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

  • This change requires a documentation update

How Can This Be Tested?

To be able to test the feature:

  1. Clone this repository on your local machine
  2. Check out the branch story/166152327-upgrade-nutrition-diary
  3. Run the command python manage.py makemigrations, python manage.py migrate and then
    python manage.py runserver.
  4. Log in and head over to create a nutrition plan.
  5. In the plan, you should be able to add meals for the day as planned. To add the consumed meal, hover over the meal you had planned and click on the plus button to add a new meal

Screenshot 2019-06-13 at 15 31 22

6. You should be able to see a menu that adds a new meal, select consumed as the meal type.

Screenshot 2019-06-13 at 14 43 23

Checklist:

  • Update nutrition plan to have data for consumed foods
  • Fix failing tests
  • Format HTML code

PT stories

#166152327

@Kimaiyo077 Kimaiyo077 added the 🚧 Work in Progress When a PR is not yet ready to be reviewed label Jun 13, 2019
@Kimaiyo077 Kimaiyo077 force-pushed the story/166152327-upgrade-nutrition-diary branch 2 times, most recently from 23f1354 to 3fbc3ae Compare June 13, 2019 13:01
- Update nutrition plan to have data for consumed foods
- Fix failing tests
- Format HTML code

[Finishes #166152327]
@Kimaiyo077 Kimaiyo077 force-pushed the story/166152327-upgrade-nutrition-diary branch from 3fbc3ae to 9a580c4 Compare June 13, 2019 16:22
@Kimaiyo077 Kimaiyo077 added 👍 ready Ready for review and removed 🚧 Work in Progress When a PR is not yet ready to be reviewed labels Jun 13, 2019
Copy link
Contributor

@Tevinthuku Tevinthuku left a comment

Choose a reason for hiding this comment

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

Awesome work, I can now enter food that I already ate and I'm not just limited to the food that is planned out with the nutrition plan 👍

Copy link
Contributor

@misocho misocho left a comment

Choose a reason for hiding this comment

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

Works as expected. We can now label and view nutrition plans as consumed. 👍🏾

Copy link
Contributor

@justMuriithi justMuriithi left a comment

Choose a reason for hiding this comment

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

Great job adding the planned and consumed meal options. It gives an improved user experience.

Copy link
Contributor

@martinMutuma martinMutuma left a comment

Choose a reason for hiding this comment

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

Good job updating the Nutrition. I like the minimal implementation of the task using the existing model.

@michael-basweti michael-basweti self-requested a review June 14, 2019 08:13
Copy link
Contributor

@michael-basweti michael-basweti left a comment

Choose a reason for hiding this comment

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

Good job, tested and it works as expected

@michael-basweti michael-basweti merged commit 9a98580 into develop Jun 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
👍 ready Ready for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants