From 27c695a393117b994ecf983a6a96f3779d19d691 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 26 Jun 2022 12:36:37 +0200
Subject: [PATCH] allow disabling of ingredient overview

---
 .../0177_recipe_show_ingredient_overview.py   | 18 +++++++++++++
 cookbook/models.py                            |  1 +
 cookbook/serializer.py                        |  2 +-
 .../apps/RecipeEditView/RecipeEditView.vue    | 26 ++++++++++++++-----
 vue/src/apps/RecipeView/RecipeView.vue        |  2 +-
 vue/src/locales/en.json                       |  2 ++
 vue/src/utils/openapi/api.ts                  |  6 +++++
 7 files changed, 49 insertions(+), 8 deletions(-)
 create mode 100644 cookbook/migrations/0177_recipe_show_ingredient_overview.py

diff --git a/cookbook/migrations/0177_recipe_show_ingredient_overview.py b/cookbook/migrations/0177_recipe_show_ingredient_overview.py
new file mode 100644
index 000000000..a67d75145
--- /dev/null
+++ b/cookbook/migrations/0177_recipe_show_ingredient_overview.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.0.4 on 2022-06-26 10:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0176_alter_searchpreference_icontains_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recipe',
+            name='show_ingredient_overview',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/cookbook/models.py b/cookbook/models.py
index b9347e0f1..8bd2e22c5 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -747,6 +747,7 @@ class Recipe(ExportModelOperationsMixin('recipe'), models.Model, PermissionModel
     waiting_time = models.IntegerField(default=0)
     internal = models.BooleanField(default=False)
     nutrition = models.ForeignKey(NutritionInformation, blank=True, null=True, on_delete=models.CASCADE)
+    show_ingredient_overview = models.BooleanField(default=True)
 
     source_url = models.CharField(max_length=1024, default=None, blank=True, null=True)
     created_by = models.ForeignKey(User, on_delete=models.PROTECT)
diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 124a47bab..e5b5c3963 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -708,7 +708,7 @@ class RecipeSerializer(RecipeBaseSerializer):
         fields = (
             'id', 'name', 'description', 'image', 'keywords', 'steps', 'working_time',
             'waiting_time', 'created_by', 'created_at', 'updated_at', 'source_url',
-            'internal', 'nutrition', 'servings', 'file_path', 'servings_text', 'rating', 'last_cooked',
+            'internal', 'show_ingredient_overview','nutrition', 'servings', 'file_path', 'servings_text', 'rating', 'last_cooked',
         )
         read_only_fields = ['image', 'created_by', 'created_at']
 
diff --git a/vue/src/apps/RecipeEditView/RecipeEditView.vue b/vue/src/apps/RecipeEditView/RecipeEditView.vue
index 2bdbdb514..bc088d349 100644
--- a/vue/src/apps/RecipeEditView/RecipeEditView.vue
+++ b/vue/src/apps/RecipeEditView/RecipeEditView.vue
@@ -19,8 +19,14 @@
                     <label for="id_description">
                         {{ $t("Description") }}
                     </label>
-                    <textarea id="id_description" class="form-control" v-model="recipe.description"
+                    <b-input-group >
+                         <textarea id="id_description" class="form-control" v-model="recipe.description"
                               maxlength="512"></textarea>
+                        <b-input-group-append>
+                            <b-button variant="danger" @click="recipe.description=''"><i class="fas fa-trash-alt"></i></b-button>
+                        </b-input-group-append>
+                    </b-input-group>
+
                 </div>
             </div>
 
@@ -88,6 +94,11 @@
                     >
                         <template v-slot:noOptions>{{ $t("empty_list") }}</template>
                     </multiselect>
+                    <br/>
+                    <label for="id_name"> {{ $t("Ingredient Overview") }}</label>
+                    <b-form-checkbox v-model="recipe.show_ingredient_overview" >{{$t('show_ingredient_overview')}}</b-form-checkbox>
+
+                    <br/>
                 </div>
             </div>
 
@@ -558,7 +569,8 @@
                                 <div class="col-md-12">
                                     <label :for="'id_instruction_' + step.id">{{ $t("Instructions") }}</label>
                                     <mavon-editor v-model="step.instruction" :autofocus="false"
-                                                  style="height: 40vh; z-index: auto" :id="'id_instruction_' + step.id" :language="'en'"
+                                                  style="height: 40vh; z-index: auto" :id="'id_instruction_' + step.id"
+                                                  :language="'en'"
                                                   :toolbars="md_editor_toolbars"/>
 
                                     <!-- TODO markdown DOCS link and markdown editor -->
@@ -608,7 +620,7 @@
                 <div class="col-3 col-md-6 mb-1 mb-md-0 pr-2 pl-2">
                     <a :href="resolveDjangoUrl('delete_recipe', recipe.id)"
                        class="d-block d-md-none btn btn-block btn-danger shadow-none"><i class="fa fa-trash fa-lg"></i></a>
-                     <a :href="resolveDjangoUrl('delete_recipe', recipe.id)"
+                    <a :href="resolveDjangoUrl('delete_recipe', recipe.id)"
                        class="d-none d-md-block btn btn-block btn-danger shadow-none">{{ $t("Delete") }}</a>
                 </div>
                 <div class="col-3 col-md-6 mb-1 mb-md-0 pr-2 pl-2">
@@ -623,11 +635,13 @@
                 </div>
                 <div class="col-3 col-md-6 mb-1 mb-md-0 pr-2 pl-2">
                     <button type="button" @click="updateRecipe(false)" v-b-tooltip.hover
-                            :title="`${$t('Key_Ctrl')} + S`" class="d-block d-md-none btn btn-sm btn-block btn-info shadow-none">
+                            :title="`${$t('Key_Ctrl')} + S`"
+                            class="d-block d-md-none btn btn-sm btn-block btn-info shadow-none">
                         <i class="fa fa-save fa-lg"></i>
                     </button>
-                     <button type="button" @click="updateRecipe(false)" v-b-tooltip.hover
-                            :title="`${$t('Key_Ctrl')} + S`" class="d-none d-md-block btn btn-sm btn-block btn-info shadow-none">
+                    <button type="button" @click="updateRecipe(false)" v-b-tooltip.hover
+                            :title="`${$t('Key_Ctrl')} + S`"
+                            class="d-none d-md-block btn btn-sm btn-block btn-info shadow-none">
                         {{ $t("Save") }}
                     </button>
                 </div>
diff --git a/vue/src/apps/RecipeView/RecipeView.vue b/vue/src/apps/RecipeView/RecipeView.vue
index 41a370765..c2774081c 100644
--- a/vue/src/apps/RecipeView/RecipeView.vue
+++ b/vue/src/apps/RecipeView/RecipeView.vue
@@ -82,7 +82,7 @@
 
             <div class="row">
                 <div class="col-md-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2"
-                     v-if="recipe && ingredient_count > 0">
+                     v-if="recipe && ingredient_count > 0 && (recipe.show_ingredient_overview || recipe.steps.length < 2)">
                     <ingredients-card
                         :recipe="recipe.id"
                         :steps="recipe.steps"
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index e2baea258..5f9535fb6 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -371,6 +371,8 @@
     "ChildInheritFields": "Children Inherit Fields",
     "ChildInheritFields_help": "Children will inherit these fields by default.",
     "InheritFields_help": "The values of these fields will be inherited from parent (Exception: blank shopping categories are not inherited)",
+    "show_ingredient_overview": "Display a list of all ingredients at the start of the recipe.",
+    "Ingredient Overview": "Ingredient Overview",
     "last_viewed": "Last Viewed",
     "created_on": "Created On",
     "updatedon": "Updated On",
diff --git a/vue/src/utils/openapi/api.ts b/vue/src/utils/openapi/api.ts
index b0570fd88..8c1ad9275 100644
--- a/vue/src/utils/openapi/api.ts
+++ b/vue/src/utils/openapi/api.ts
@@ -1851,6 +1851,12 @@ export interface Recipe {
      * @memberof Recipe
      */
     internal?: boolean;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof Recipe
+     */
+    show_ingredient_overview?: boolean;
     /**
      * 
      * @type {RecipeNutrition}