Add migrations.

This commit is contained in:
Sebastian Markgraf
2020-10-16 23:59:19 +02:00
parent 2b1cde2efc
commit 7a89015ac5
2 changed files with 71 additions and 2 deletions

View File

@@ -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'),
),
]

View File

@@ -210,7 +210,7 @@
<hr>
<h3>{% trans 'Nutrition' %}</h3>
{% for n in recipe.nutrition.nutritions.all %}
{{ n.type.type }}: {{ n.value|floatformat:2 }} {{ n.type.unit.short }}
<div>{{ n.type.type }}: {{ n.value|floatformat:2 }} {{ n.type.unit.short }}</div>
{% endfor %}
</div>
{% 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) {