fixed ingredient amount numeric

thanks cazier for pointing out this issue and providing a PR https://github.com/vabene1111/recipes/pull/46

cookbook/migrations/0031_auto_20200407_1841.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-07 16:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0030_recipeingredient_note'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='keyword',
+            name='icon',
+            field=models.CharField(blank=True, max_length=16, null=True),
+        ),
+    ]

cookbook/models.py

@@ -90,7 +90,7 @@ class SyncLog(models.Model):
 
 class Keyword(models.Model):
     name = models.CharField(max_length=64, unique=True)
-    icon = models.CharField(max_length=1, blank=True, null=True)
+    icon = models.CharField(max_length=16, blank=True, null=True)
     description = models.TextField(default="", blank=True)
     created_by = models.IntegerField(default=0)
     created_at = models.DateTimeField(auto_now_add=True)

cookbook/templates/forms/edit_internal_recipe.html

@@ -26,6 +26,7 @@
             </div>
             {% if field.name == 'name' %}
                 <label>{% trans 'Ingredients' %}</label>
+                {{ form.ingredients.errors }}
                 <div id="ingredients-table"></div>
                 <br>
                 <div class="table-controls" style="text-align: center">
@@ -144,7 +145,7 @@
                         validator: "required",
                         editor: select2IngredientEditor
                     },
-                    {title: "{% trans 'Amount' %}", field: "amount", validator: "required", editor: "input"},
+                    {title: "{% trans 'Amount' %}", field: "amount", validator: "required", editor: "number"},
                     {
                         title: "{% trans 'Unit' %}",
                         field: "unit__name",

cookbook/templates/meal_plan.html

@@ -8,6 +8,25 @@
 {% endblock %}
 
 {% block content %}
+    <style>
+        .mealplan-cell .mealplan-add-button{
+            text-align: center;
+            display: block;
+        }
+
+        @media (hover: hover) {
+            .mealplan-cell .mealplan-add-button{
+                visibility: hidden;
+                float: right;
+                display: inline;
+            }
+
+            .mealplan-cell:hover .mealplan-add-button{
+                visibility: initial;
+            }
+        }
+
+    </style>
 
     <h3>
         {% trans 'Meal-Plan' %} <a href="{% url 'new_meal_plan' %}"><i class="fas fa-plus-circle"></i></a>
@@ -53,7 +72,8 @@
                     </tr>
                     <tr>
                         {% for day_key, days_value in plan_value.days.items %}
-                            <td>
+                            <td class="mealplan-cell">
+                                <a class="mealplan-add-button" href="{% url 'new_meal_plan' %}?date={{ day_key|date:'Y-m-d' }}&meal={{ plan_key }}"><i class="fas fa-plus"></i></a>
                                 {% for mp in days_value %}
                                     <a href="{% url 'edit_meal_plan' mp.pk %}"><i class="fas fa-edit"></i></a>
                                     <a href="{% url 'view_recipe' mp.recipe.id %}">{{ mp.recipe.name }}</a><br/>

cookbook/templates/recipe_view.html

@@ -4,7 +4,7 @@
 {% load l10n %}
 {% load custom_tags %}
 
-{% block title %}{% trans 'View' %}{% endblock %}
+{% block title %}{{ recipe.name }}{% endblock %}
 
 {% block extra_head %}
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/pretty-checkbox@3.0/dist/pretty-checkbox.min.css"
@@ -60,6 +60,8 @@
             {% endif %}
             <a class="btn btn-info" href="{% url 'new_meal_plan' %}?recipe={{ recipe.pk }}"><i
                     class="fas fa-calendar"></i></a>
+            <a class="btn btn-light" onclick="window.print()"><i
+                    class="fas fa-print"></i></a>
         </div>
     </div>
 
@@ -98,7 +100,7 @@
 
     <div class="row">
         {% if ingredients %}
-            <div class="col-lg-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2">
+            <div class="col-md-6 order-md-1 col-sm-12 order-sm-2 col-12 order-2">
                 <div class="card">
                     <div class="card-body">
                         <div class="row">
@@ -148,12 +150,16 @@
                                     </td>
                                     <td style="vertical-align: middle!important;">
                                         {% if i.note %}
-                                            <button class="btn btn-light btn-sm" type="button" data-container="body"
+                                            <button class="btn btn-light btn-sm d-print-none" type="button"
+                                                    data-container="body"
                                                     data-toggle="popover"
                                                     data-placement="right" data-html="true" data-trigger="focus"
                                                     data-content="{{ i.note }}">
                                                 <i class="fas fa-info"></i>
                                             </button>
+                                            <div class="d-none d-print-block">
+                                                <i class="far fa-comment-alt"></i> {{ i.note }}
+                                            </div>
                                         {% endif %}
                                     </td>
                                 </tr>
@@ -173,7 +179,7 @@
 
         {% endif %}
         {% if recipe.image %}
-            <div class="col-md-6 order-md-2 col-sm-12 order-sm-1 col-12 order-1 " style="text-align: center">
+            <div class="col-12 order-1 col-sm-12 order-sm-1 col-md-6 order-md-2" style="text-align: center">
                 <img class="img img-fluid rounded" src="{{ recipe.image.url }}" style="max-height: 30vh;"
                      alt="{% trans 'Recipe Image' %}">
                 <br/>
@@ -294,7 +300,8 @@
     <br/>
     <br/>
 
-    <h5><i class="far fa-comments"></i> {% trans 'Comments' %}</h5>
+    <h5 {% if not comments %}class="d-print-none" {% endif %}><i class="far fa-comments"></i> {% trans 'Comments' %}
+    </h5>
     {% for c in comments %}
         <div class="card">
             <div class="card-body">

cookbook/views/edit.py

@@ -98,7 +98,10 @@ def internal_recipe_update(request, pk):
                     recipe_ingredient.ingredient = ingredient
 
                 if isinstance(i['amount'], str):
-                    recipe_ingredient.amount = float(i['amount'].replace(',', '.'))
+                    try:
+                        recipe_ingredient.amount = float(i['amount'].replace(',', '.'))
+                    except ValueError:
+                        form.add_error("ingredients", _('There was an error converting your ingredients amount to a number: ') + i['unit__name'])
                 else:
                     recipe_ingredient.amount = i['amount']
 

cookbook/views/new.py

@@ -1,4 +1,5 @@
 import re
+from datetime import datetime
 
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
@@ -120,6 +121,12 @@ class MealPlanCreate(LoginRequiredMixin, CreateView):
     form_class = MealPlanForm
     success_url = reverse_lazy('view_plan')
 
+    def get_initial(self):
+        return dict(
+            meal=self.request.GET['meal'] if 'meal' in self.request.GET else None,
+            date=datetime.strptime(self.request.GET['date'], '%Y-%m-%d') if 'date' in self.request.GET else None
+        )
+
     def form_valid(self, form):
         obj = form.save(commit=False)
         obj.user = self.request.user