Finish editing of nutritional information

cookbook/admin.py

@@ -175,7 +175,7 @@ admin.site.register(ShareLink, ShareLinkAdmin)
 
 
 class NutritionInformationAdmin(admin.ModelAdmin):
-    list_display = ('id', 'created_by', 'created_at')
+    list_display = ('id',)
 
 
 admin.site.register(NutritionInformation, NutritionInformationAdmin)

cookbook/migrations/0089_auto_20201117_2222.py

@@ -1,7 +1,6 @@
-# Generated by Django 3.1.1 on 2020-11-06 15:55
+# Generated by Django 3.1.1 on 2020-11-17 21:22
 
 import datetime
-from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -9,16 +8,10 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('cookbook', '0088_shoppinglist_finished'),
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name='invitelink',
-            name='valid_until',
-            field=models.DateField(default=datetime.date(2020, 11, 20)),
-        ),
         migrations.CreateModel(
             name='NutritionInformation',
             fields=[
@@ -28,13 +21,16 @@ class Migration(migrations.Migration):
                 ('proteins', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
                 ('calories', models.DecimalField(decimal_places=16, default=0, max_digits=32)),
                 ('source', models.CharField(blank=True, default='', max_length=512, null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
+        migrations.AlterField(
+            model_name='invitelink',
+            name='valid_until',
+            field=models.DateField(default=datetime.date(2020, 12, 1)),
+        ),
         migrations.AddField(
             model_name='recipe',
             name='nutrition',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.nutritioninformation'),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.nutritioninformation'),
         ),
     ]

cookbook/models.py

@@ -188,9 +188,6 @@ class NutritionInformation(models.Model):
     calories = models.DecimalField(default=0, decimal_places=16, max_digits=32)
     source = models.CharField(max_length=512, default="", null=True, blank=True)
 
-    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
-    created_at = models.DateTimeField(auto_now_add=True)
-
     def __str__(self):
         return f'Nutrition'
 
@@ -208,7 +205,7 @@ class Recipe(models.Model):
     working_time = models.IntegerField(default=0)
     waiting_time = models.IntegerField(default=0)
     internal = models.BooleanField(default=False)
-    nutrition = models.ForeignKey(NutritionInformation, blank=True, null=True, on_delete=models.PROTECT)
+    nutrition = models.ForeignKey(NutritionInformation, blank=True, null=True, on_delete=models.CASCADE)
     created_by = models.ForeignKey(User, on_delete=models.PROTECT)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)

cookbook/serializer.py

@@ -140,13 +140,20 @@ class StepSerializer(WritableNestedModelSerializer):
         fields = ('id', 'name', 'type', 'instruction', 'ingredients', 'time', 'order', 'show_as_header')
 
 
+class NutritionInformationSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = NutritionInformation
+        fields = ('carbohydrates', 'fats', 'proteins', 'calories', 'source')
+
+
 class RecipeSerializer(WritableNestedModelSerializer):
+    nutrition = NutritionInformationSerializer(allow_null=True)
     steps = StepSerializer(many=True)
     keywords = KeywordSerializer(many=True)
 
     class Meta:
         model = Recipe
-        fields = ['id', 'name', 'image', 'keywords', 'steps', 'working_time', 'waiting_time', 'created_by', 'created_at', 'updated_at', 'internal']
+        fields = ['id', 'name', 'image', 'keywords', 'steps', 'working_time', 'waiting_time', 'created_by', 'created_at', 'updated_at', 'internal', 'nutrition']
         read_only_fields = ['image', 'created_by', 'created_at']
 
 
@@ -263,8 +270,3 @@ class ViewLogSerializer(serializers.ModelSerializer):
     class Meta:
         model = ViewLog
         fields = '__all__'
-
-class NutritionInformationSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = NutritionInformation
-        fields = '__all__'

cookbook/templates/forms/edit_internal_recipe.html

@@ -81,6 +81,34 @@
             </div>
         </div>
 
+        <div class="row" v-if="recipe.nutrition" style="margin-top: 1vh">
+            <div class="col-md-12">
+                <div class="card border-grey">
+                    <div class="card-body">
+                        <h4 class="card-title">{% trans 'Nutrition' %}</h4>
+                        <div class="dropdown-menu dropdown-menu-right"
+                        aria-labelledby="dropdownMenuLink">
+                            <button class="dropdown-item" @click="removeStep(step)"><i
+                                    class="fa fa-trash fa-fw"></i> {% trans 'Delete Step' %}</button>
+                      
+                        </div>
+
+                        <label for="id_name"> {% trans 'Calories' %}</label>
+                        <input class="form-control" id="id_calories" v-model="recipe.nutrition.calories">
+
+                        <label for="id_name"> {% trans 'Carbohydrates' %}</label>
+                        <input class="form-control" id="id_carbohydrates" v-model="recipe.nutrition.carbohydrates">
+
+                        <label for="id_name"> {% trans 'Fats' %}</label>
+                        <input class="form-control" id="id_fats" v-model="recipe.nutrition.fats">
+                        <label for="id_name"> {% trans 'Proteins' %}</label>
+                        <input class="form-control" id="id_proteins" v-model="recipe.nutrition.proteins">
+                        <br/>
+                     </div>
+                </div>
+            </div>
+        </div>
+
 
         <draggable :list="recipe.steps" group="steps"
                    :empty-insert-threshold="10" handle=".handle" @sort="sortSteps()">
@@ -335,6 +363,8 @@
                         class="btn btn-info shadow-none">{% trans 'Save' %}</button>
                 <button type="button" @click="addStep()"
                         class="btn btn-primary shadow-none">{% trans 'Add Step' %}</button>
+                <button type="button" @click="addNutrition()"
+                        class="btn btn-primary shadow-none">{% trans 'Add Nutrition' %}</button>
                 <a href="{% url 'view_recipe' recipe.pk %}" @click="addStep()"
                    class="btn btn-secondary shadow-none">{% trans 'View Recipe' %}</a>
                 <a href="{% url 'delete_recipe' recipe.pk %}"
@@ -361,6 +391,9 @@
                 <button type="button" @click="addStep()"
                         class="btn btn-primary btn-block shadow-none">{% trans 'Add Step' %}</button>
 
+                <button type="button" @click="addNutrition()"
+                        class="btn btn-primary btn-block shadow-none">{% trans 'Add Nutrition' %}</button>
+
                 <a href="{% url 'view_recipe' recipe.pk %}"
                    class="btn btn-secondary btn-block shadow-none">{% trans 'View Recipe' %}</a>
                 <a href="{% url 'delete_recipe' recipe.pk %}"
@@ -649,6 +682,12 @@
                 scrollToStep: function (step_index) {
                     document.getElementById('id_step_' + step_index).scrollIntoView({behavior: 'smooth'});
                 },
+                addNutrition: function () {
+                    this.recipe.nutrition = {}
+                },
+                removeNutrition: function() {
+                    this.recipe.nutrition = undefined
+                }
             }
         });
     </script>

cookbook/views/api.py

@@ -28,10 +28,10 @@ from rest_framework.viewsets import ViewSetMixin
 
 from cookbook.helper.permission_helper import group_required, CustomIsOwner, CustomIsAdmin, CustomIsUser, CustomIsGuest, CustomIsShare
 from cookbook.helper.recipe_url_import import get_from_html
-from cookbook.models import Recipe, Sync, Storage, CookLog, MealPlan, MealType, ViewLog, UserPreference, RecipeBook, Ingredient, Food, Step, Keyword, Unit, SyncLog, ShoppingListRecipe, ShoppingList, ShoppingListEntry, NutritionInformation
+from cookbook.models import Recipe, Sync, Storage, CookLog, MealPlan, MealType, ViewLog, UserPreference, RecipeBook, Ingredient, Food, Step, Keyword, Unit, SyncLog, ShoppingListRecipe, ShoppingList, ShoppingListEntry
 from cookbook.provider.dropbox import Dropbox
 from cookbook.provider.nextcloud import Nextcloud
-from cookbook.serializer import NutritionInformationSerializer, MealPlanSerializer, MealTypeSerializer, RecipeSerializer, ViewLogSerializer, UserNameSerializer, UserPreferenceSerializer, RecipeBookSerializer, IngredientSerializer, FoodSerializer, StepSerializer, \
+from cookbook.serializer import MealPlanSerializer, MealTypeSerializer, RecipeSerializer, ViewLogSerializer, UserNameSerializer, UserPreferenceSerializer, RecipeBookSerializer, IngredientSerializer, FoodSerializer, StepSerializer, \
     KeywordSerializer, RecipeImageSerializer, StorageSerializer, SyncSerializer, SyncLogSerializer, UnitSerializer, ShoppingListSerializer, ShoppingListRecipeSerializer, ShoppingListEntrySerializer, ShoppingListEntryCheckedSerializer, \
     ShoppingListAutoSyncSerializer
 
@@ -282,10 +282,6 @@ class ViewLogViewSet(viewsets.ModelViewSet):
         queryset = ViewLog.objects.filter(created_by=self.request.user).all()[:5]
         return queryset
 
-class NutritionInformationViewSet(viewsets.ModelViewSet):
-    queryset = NutritionInformation.objects.all()
-    serializer_class = NutritionInformationSerializer
-
 
 # -------------- non django rest api views --------------------