From 642224fec9baad162c823e8095598a5bc9ec42ea Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Fri, 26 Jun 2020 15:00:41 +0200
Subject: [PATCH] sorting and ingredient adding

---
 .../migrations/0066_auto_20200626_1455.py     | 26 +++++++++++++++++++
 cookbook/models.py                            |  1 +
 .../templates/forms/edit_internal_recipe.html | 18 +++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 cookbook/migrations/0066_auto_20200626_1455.py

diff --git a/cookbook/migrations/0066_auto_20200626_1455.py b/cookbook/migrations/0066_auto_20200626_1455.py
new file mode 100644
index 000000000..40e043668
--- /dev/null
+++ b/cookbook/migrations/0066_auto_20200626_1455.py
@@ -0,0 +1,26 @@
+# Generated by Django 3.0.7 on 2020-06-26 12:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0065_auto_20200626_1444'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='ingredient',
+            options={'ordering': ['order', 'pk']},
+        ),
+        migrations.AlterModelOptions(
+            name='step',
+            options={'ordering': ['order', 'pk']},
+        ),
+        migrations.AddField(
+            model_name='step',
+            name='name',
+            field=models.CharField(blank=True, default='', max_length=128),
+        ),
+    ]
diff --git a/cookbook/models.py b/cookbook/models.py
index cf95d79d0..b4abeeb93 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -162,6 +162,7 @@ class Ingredient(models.Model):
 class Step(models.Model):
     TEXT = 'TEXT'
 
+    name = models.CharField(max_length=128, default='', blank=True)
     kind = models.CharField(choices=((TEXT, _('Text')),), default=TEXT, max_length=16)
     instruction = models.TextField(blank=True)
     ingredients = models.ManyToManyField(Ingredient, blank=True)
diff --git a/cookbook/templates/forms/edit_internal_recipe.html b/cookbook/templates/forms/edit_internal_recipe.html
index 7c1d6d108..919774ed7 100644
--- a/cookbook/templates/forms/edit_internal_recipe.html
+++ b/cookbook/templates/forms/edit_internal_recipe.html
@@ -70,6 +70,13 @@
                         <h3>Step</h3>
                     </div>
                 </div>
+                <div class="row">
+                    <div class="col-md-12">
+                        <label :for="'id_step_' + step.id + 'name'">{% trans 'Step Name' %}</label>
+                        <input class="form-control" v-model="step.name" :id="'id_step_' + step.id + 'name'">
+                    </div>
+                </div>
+
                 <div class="row">
                     <div class="col-md-12">
                         <draggable :list="step.ingredients" group="ingredients"
@@ -129,6 +136,8 @@
                                 </div>
                             </div>
                         </draggable>
+
+                        <button class="btn btn-success" @click="addIngredient(step)"><i class="fa fa-plus"></i></button>
                     </div>
                 </div>
                 <div class="row">
@@ -209,6 +218,15 @@
                         element.order = index
                     });
                 },
+                addIngredient: function (step) { //TODO see if default can be generated from options request
+                    step.ingredients.push({
+                        'food': undefined,
+                        'unit': undefined,
+                        'amount': 0,
+                        'note': '',
+                    })
+                    this.sortStep(step)
+                },
                 searchKeywords: function (query) {
                     this.keywords_loading = true
                     this.$http.get("{% url 'api:keyword-list' %}" + '?query=' + query + '&limit=10').then((response) => {