Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

removed meals from MealLogItemForm

Mohammed Ali Zubair4f6c47cf8267
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 9dbb3f28c..3636f6b1b 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -263,7 +263,6 @@ class MealItemForm(forms.ModelForm):
class MealLogItemForm(MealItemForm):
- meal = forms.ModelChoiceField(queryset=Meal.objects.all(), required=False)
class Meta:
model = LogItem
@@ -271,7 +270,6 @@ class MealLogItemForm(MealItemForm):
'ingredient',
'weight_unit',
'amount',
- 'meal',
]
diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.py
index bc424f750..40ada3260 100644
--- a/wger/nutrition/tests/test_nutrition_diary.py
+++ b/wger/nutrition/tests/test_nutrition_diary.py
@@ -30,7 +30,7 @@ from wger.core.tests.base_testcase import (
)
from wger.nutrition.models import (
LogItem,
- NutritionPlan,
+ NutritionPlan, MealItem,
)
@@ -164,7 +164,7 @@ class NutritionDiaryTestCase(WgerTestCase):
self.user_login('test')
response = self.client.get(reverse('nutrition:log:log_meal', kwargs={"meal_pk": 1}))
self.assertEqual(response.status_code, 302)
- self.assertEqual(LogItem.objects.filter(plan=plan).count(), 3)
+ self.assertEqual(LogItem.objects.filter(plan=plan, meal_id=1).count(), 3)
def test_log_meal_logged_out(self):
"""
@@ -241,21 +241,6 @@ class AddMealItemUnitTestCase(WgerAddTestCase):
'weight_unit': 1,
}
- def test_log_meals(self):
- plan = NutritionPlan.objects.get(pk=1)
- data = {
- "meal": 1,
- **self.data
- }
- plan.logitem_set.all().delete()
- self.assertFalse(plan.logitem_set.exists())
- self.user_login('test')
- response = self.client.post(self.url, data)
- self.assertEqual(response.status_code, 302)
- plan.refresh_from_db()
- log_item_queryset = plan.logitem_set.filter(plan=plan, meal_id=1)
- self.assertEqual(log_item_queryset.count(), 1)
-
class DeleteLogEntryTestCase(WgerDeleteTestCase):
"""