From 62868cd2b296a72384b6e72500bcaf7db1cd5931 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 1 Sep 2020 11:49:19 +0200
Subject: [PATCH] added note support for recipe import

---
 cookbook/templates/url_import.html | 7 +++++--
 cookbook/views/data.py             | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cookbook/templates/url_import.html b/cookbook/templates/url_import.html
index 040723ca2..f61c2a82f 100644
--- a/cookbook/templates/url_import.html
+++ b/cookbook/templates/url_import.html
@@ -80,7 +80,7 @@
                                         <div class="col-md-1">
                                             <input class="form-control" v-model="i.amount">
                                         </div>
-                                        <div class="col-md-5">
+                                        <div class="col-md-4">
 
                                             <table class="table-layout:fixed">
                                                 <col width="95%"/>
@@ -119,7 +119,7 @@
 
 
                                         </div>
-                                        <div class="col-md-5">
+                                        <div class="col-md-4">
 
                                             <multiselect v-tabindex
                                                          ref="ingredient"
@@ -143,6 +143,9 @@
 
                                             </multiselect>
                                         </div>
+                                        <div class="col-md-2">
+                                            <input type="text" placeholder="{% trans 'Note' %}" class="form-control" v-model="i.note">
+                                        </div>
                                         <div class="col-md-1">
                                             <button class="btn btn-outline-danger btn-lg" type="button"
                                                     @click="deleteIngredient(i)" tabindex="-1"><i
diff --git a/cookbook/views/data.py b/cookbook/views/data.py
index 17879ecf1..102241d59 100644
--- a/cookbook/views/data.py
+++ b/cookbook/views/data.py
@@ -126,6 +126,7 @@ def import_url(request):
             else:
                 u = Unit.objects.get(name=request.user.userpreference.default_unit)
 
+            # TODO properly handl no_amount recipes
             if isinstance(ing['amount'], str):
                 try:
                     ing['amount'] = float(ing['amount'].replace(',', '.'))
@@ -133,7 +134,9 @@ def import_url(request):
                     # TODO return proper error
                     pass
 
-            step.ingredients.add(Ingredient.objects.create(food=f, unit=u, amount=ing['amount']))
+            note = ing['note'] if 'note' in ing else ''
+
+            step.ingredients.add(Ingredient.objects.create(food=f, unit=u, amount=ing['amount'], note=note))
 
         if data['image'] != '':
             response = requests.get(data['image'])