andela / wg-rogue-one

92%

master: 92%

LAST BUILD ON BRANCH ft-upgrade-nutritional-plan-#157731619

branch: ft-upgrade-nutritional-plan-#157731619

CHANGE BRANCH

x

Reset

• ft-upgrade-nutritional-plan-#157731619
• ch-change-to-import-heading-158625992
• ch-deploy-to-heroku-157842572
• ch-implement-python-coding-style-157731607
• ch-improve-social-login-buttons-#158256637
• ch-improve-social-login-buttons-158256637
• ch-run-autopep8-develop-158427352
• ch-slack-intergration-157731608
• develop
• ft-add-fitbit-support-157731613
• ft-add-meals-157731623
• ft-allow-comparison-157731618
• ft-allow-managers-delete/deactivate-trainers-157731627
• ft-authors-field-should-be-fk-157731625
• ft-cache-nutritional-plan-157731610
• ft-create-users-via-api-157731612
• ft-dropset-support-#157731614
• ft-enable-social-logins-157731629
• ft-exercise-cache-157731615
• ft-exercise-readonly-endpoint-#157731611
• ft-exercises-endpoint-#157731611
• ft-exercises-muscle-hover-#157731630
• ft-export-workouts-157731622
• ft-filter-exercise-and-ingredients-based-on-language-157731616
• ft-landing-page-value-#157731628
• ft-present-deactivated-users-157731609
• ft-proprietary-software-157731620
• ft-relation-workoutlog-and-session-157731617
• ft-support-macrocycle-mesocycle-157731626
• ft-translate-exercises-and-ingredients-157731616
• ft-update-muscle-list-157731621
• test

feat(upgrade-nutrition-plan) Upgrade nutrition plans

This commit adds a feature that allows a user to add a meal that he/she has
already eaten in addition to adding the meals he/she plans to eat.

Add meal_category options to MealItem model in `wger/nutrition/models.py`
Add migrations file `0005_mealitem_meal_category.py`
Add meal_category select element to `wger/nutrition/templates/meal_item/edit.html`
Update `test_meal_item` and `test_meal`
Add meal time validation to `wager-core.js`

[Delivers #157731619]