From 7a89015ac571c09e837b749e44b3f37efcf89147 Mon Sep 17 00:00:00 2001 From: Sebastian Markgraf Date: Fri, 16 Oct 2020 23:59:19 +0200 Subject: [PATCH] Add migrations. --- .../migrations/0089_auto_20201016_2358.py | 70 +++++++++++++++++++ cookbook/templates/recipe_view.html | 3 +- 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 cookbook/migrations/0089_auto_20201016_2358.py diff --git a/cookbook/migrations/0089_auto_20201016_2358.py b/cookbook/migrations/0089_auto_20201016_2358.py new file mode 100644 index 000000000..24a55b3ce --- /dev/null +++ b/cookbook/migrations/0089_auto_20201016_2358.py @@ -0,0 +1,70 @@ +# Generated by Django 3.1.1 on 2020-10-16 21:58 + +import datetime +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('cookbook', '0088_shoppinglist_finished'), + ] + + operations = [ + migrations.CreateModel( + name='NutritionType', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('type', models.CharField(max_length=128)), + ('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, 10, 30)), + ), + migrations.CreateModel( + name='NutritionValue', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('value', models.DecimalField(decimal_places=16, max_digits=32)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.nutritiontype')), + ], + ), + migrations.CreateModel( + name='NutritionUnit', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128)), + ('short', models.CharField(max_length=16)), + ('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.AddField( + model_name='nutritiontype', + name='unit', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.nutritionunit'), + ), + migrations.CreateModel( + name='NutritionInformation', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('nutritions', models.ManyToManyField(to='cookbook.NutritionValue')), + ], + ), + migrations.AddField( + model_name='recipe', + name='nutrition', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='cookbook.nutritioninformation'), + ), + ] diff --git a/cookbook/templates/recipe_view.html b/cookbook/templates/recipe_view.html index f378afcdb..25ff3b6f5 100644 --- a/cookbook/templates/recipe_view.html +++ b/cookbook/templates/recipe_view.html @@ -210,7 +210,7 @@

{% trans 'Nutrition' %}

{% for n in recipe.nutrition.nutritions.all %} - {{ n.type.type }}: {{ n.value|floatformat:2 }} {{ n.type.unit.short }} +
{{ n.type.type }}: {{ n.value|floatformat:2 }} {{ n.type.unit.short }}
{% endfor %} {% endif %} @@ -483,7 +483,6 @@ this.$http.get("{% url 'api:recipe-detail' recipe.pk %}" {% if share %} + "?share={{ share }}"{% endif %}).then((response) => { this.recipe = response.data; - console.log(this.recipe); this.loading = false; for (let step of this.recipe.steps) {