Merge 9a580c4 into 040ee90

wger/nutrition/forms.py

@@ -125,6 +125,12 @@ class MealItemForm(forms.ModelForm):
                                          required=False)
     ingredient = forms.ModelChoiceField(queryset=Ingredient.objects.all(),
                                         widget=forms.HiddenInput)
+    MTYPES = (
+        ('Planned', 'Planned'),
+        ('Consumed', 'Consumed')
+    )
+
+    meal_type = forms.ChoiceField(label='Meal Type', widget=forms.Select, choices=MTYPES)
 
     class Meta:
         model = MealItem

wger/nutrition/migrations/0003_mealitem_meal_type.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.2 on 2019-06-12 18:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('nutrition', '0002_mealitem_time'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mealitem',
+            name='meal_type',
+            field=models.CharField(default='Planned', max_length=15, verbose_name='Type'),
+        ),
+    ]

wger/nutrition/models.py

@@ -601,6 +601,10 @@ class MealItem(models.Model):
                           blank=True,
                           verbose_name=_('Time (approx)'))
 
+    meal_type = models.CharField(max_length=15,
+                                 verbose_name=_('Type'),
+                                 default=('Planned'))
+
     def __str__(self):
         '''
         Return a more human-readable representation

wger/nutrition/templates/meal_item/edit.html

@@ -43,6 +43,7 @@
     </div>
     {% render_form_field form.amount %}
     {% render_form_field form.weight_unit %}
+    {% render_form_field form.meal_type %}
     {% render_form_submit submit_text %}
 </form>
 {% endblock %}