Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add foreign key to meals on log
Mohammed Ali Zubair5d875ee2b544
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex 1cd9b2aea..ee656acb8 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -42,7 +42,7 @@ from wger.nutrition.models import (Ingredient,IngredientWeightUnit,LogItem,- MealItem,+ MealItem, Meal,)from wger.utils.widgets import Html5NumberInput@@ -263,6 +263,7 @@ class MealItemForm(forms.ModelForm):class MealLogItemForm(MealItemForm):+ meals = forms.ModelMultipleChoiceField(queryset=Meal.objects.all(), required=False)class Meta:model = LogItem@@ -270,6 +271,7 @@ class MealLogItemForm(MealItemForm):'ingredient','weight_unit','amount',+ 'meals',]diff --git a/wger/nutrition/migrations/0010_meal_log.py b/wger/nutrition/migrations/0010_meal_log.pynew file mode 100644index 000000000..010f39ae0--- /dev/null+++ b/wger/nutrition/migrations/0010_meal_log.py@@ -0,0 +1,19 @@+# Generated by Django 3.2.7 on 2021-10-03 17:27++from django.db import migrations, models+import django.db.models.deletion+++class Migration(migrations.Migration):++ dependencies = [+ ('nutrition', '0009_meal_name'),+ ]++ operations = [+ migrations.AddField(+ model_name='meal',+ name='log',+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='meals', to='nutrition.logitem'),+ ),+ ]diff --git a/wger/nutrition/models/meal.py b/wger/nutrition/models/meal.pyindex e025435f0..0df6eff50 100644--- a/wger/nutrition/models/meal.py+++ b/wger/nutrition/models/meal.py@@ -27,9 +27,9 @@ from wger.utils.constants import TWOPLACESfrom wger.utils.fields import Html5TimeField# Local+from . import LogItemfrom .plan import NutritionPlan-logger = logging.getLogger(__name__)@@ -50,6 +50,13 @@ class Meal(models.Model):editable=False,on_delete=models.CASCADE,)+ log = models.ForeignKey(+ LogItem,+ blank=True,+ null=True,+ on_delete=models.SET_NULL,+ related_name="meals"+ )order = models.IntegerField(verbose_name=_('Order'),blank=True,diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.pyindex 6e5586d53..12bb9b378 100644--- a/wger/nutrition/views/log.py+++ b/wger/nutrition/views/log.py@@ -179,6 +179,7 @@ def _logMealPlan(meals):amount=item.amount)log_item.save()+ log_item.meals.add(meal)class LogCreateView(WgerFormMixin, CreateView):