shopping list basics

cookbook/migrations/0075_shoppinglist_shoppinglistentry_shoppinglistrecipe.py

@@ -0,0 +1,49 @@
+# Generated by Django 3.0.7 on 2020-08-11 10:14
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('cookbook', '0074_remove_keyword_created_by'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ShoppingListRecipe',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('multiplier', models.IntegerField(default=1)),
+                ('recipe', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.Recipe')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ShoppingListEntry',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('amount', models.IntegerField(default=1)),
+                ('order', models.IntegerField(default=0)),
+                ('checked', models.BooleanField(default=False)),
+                ('food', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cookbook.Food')),
+                ('list_recipe', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.ShoppingListRecipe')),
+                ('unit', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='cookbook.Unit')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ShoppingList',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('uuid', models.UUIDField(default=uuid.uuid4)),
+                ('note', models.TextField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('recipes', models.ManyToManyField(blank=True, to='cookbook.ShoppingListRecipe')),
+                ('shared', models.ManyToManyField(blank=True, related_name='list_share', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

cookbook/models.py

@@ -265,6 +265,29 @@ class MealPlan(models.Model):
         return f'{self.get_label()} - {self.date} - {self.meal_type.name}'
 
 
+class ShoppingListRecipe(models.Model):
+    recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE, null=True, blank=True)
+    multiplier = models.IntegerField(default=1)
+
+
+class ShoppingListEntry(models.Model):
+    list_recipe = models.ForeignKey(ShoppingListRecipe, on_delete=models.CASCADE, null=True, blank=True)
+    food = models.ForeignKey(Food, on_delete=models.CASCADE)
+    unit = models.ForeignKey(Unit, on_delete=models.CASCADE, null=True, blank=True)
+    amount = models.IntegerField(default=1)
+    order = models.IntegerField(default=0)
+    checked = models.BooleanField(default=False)
+
+
+class ShoppingList(models.Model):
+    uuid = models.UUIDField(default=uuid.uuid4)
+    note = models.TextField(blank=True, null=True)
+    recipes = models.ManyToManyField(ShoppingListRecipe, blank=True)
+    shared = models.ManyToManyField(User, blank=True, related_name='list_share')
+    created_by = models.ForeignKey(User, on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True)
+
+
 class ShareLink(models.Model):
     recipe = models.ForeignKey(Recipe, on_delete=models.CASCADE)
     uuid = models.UUIDField(default=uuid.uuid4)

cookbook/tables.py

@@ -108,6 +108,15 @@ class RecipeImportTable(tables.Table):
         fields = ('id', 'name', 'file_path')
 
 
+class ShoppingListTable(tables.Table):
+    id = tables.LinkColumn('edit_storage', args=[A('id')])
+
+    class Meta:
+        model = ShoppingList
+        template_name = 'generic/table_template.html'
+        fields = ('id', 'created_by', 'created_at')
+
+
 class ViewLogTable(tables.Table):
     recipe = tables.LinkColumn('view_recipe', args=[A('recipe_id')])
 

cookbook/templates/base.html

@@ -72,7 +72,7 @@
                     <a class="dropdown-item" href="{% url 'view_plan' %}"><i
                             class="fas fa-calendar fa-fw"></i> {% trans 'Meal-Plan' %}
                     </a>
-                    <a class="dropdown-item" href="{% url 'view_shopping' %}"><i
+                    <a class="dropdown-item" href="{% url 'list_shopping_list' %}"><i
                             class="fas fa-shopping-cart fa-fw"></i> {% trans 'Shopping' %}
                     </a>
                     <a class="dropdown-item" href="{% url 'list_food' %}"><i

cookbook/templates/shopping_list.html

@@ -4,61 +4,14 @@
 {% load static %}
 {% load i18n %}
 
-{% block title %}{% trans "Cookbook" %}{% endblock %}
+{% block title %}{% trans "Shopping List" %}{% endblock %}
 
 {% block extra_head %}
-    {{ form.media }}
+
 {% endblock %}
 
 {% block content %}
 
-    <h2><i class="fas fa-shopping-cart"></i> {% trans 'Shopping List' %}</h2>
 
-    <form action="{% url 'view_shopping' %}" method="post">
-        {% csrf_token %}
-        {{ form|crispy }}
-        <button class="btn btn-success" type="submit"><i class="fas fa-sync-alt"></i> {% trans 'Load' %}</button>
-    </form>
-
-    <br/>
-    <br/>
-
-    <div class="row">
-        <div class="col col-md-12">
-            <!--// @formatter:off-->
-            <textarea id="id_list" class="form-control" rows="{{ ingredients|length|add:1 }}">{% for i in ingredients %}{% if markdown_format %}- [ ] {% endif %}{{ i.amount.normalize }} {{ i.unit }} {{ i.food.name }}&#13;&#10;{% endfor %}</textarea>
-            <!--// @formatter:on-->
-        </div>
-    </div>
-    <br/>
-    <div class="row">
-        <div class="col col-md-12 text-center">
-            <button class="btn btn-success" onclick="copy()" style="width: 15vw" data-toggle="tooltip"
-                    data-placement="right" title="{% trans 'Copy list to clipboard' %}" id="id_btn_copy" onmouseout="resetTooltip()"><i
-                    class="far fa-copy"></i></button>
-        </div>
-    </div>
-
-    <script type="text/javascript">
-        function copy() {
-            let list = $('#id_list');
-
-            list.select();
-
-            $('#id_btn_copy').attr('data-original-title','{% trans 'Copied!' %}').tooltip('show');
-
-            document.execCommand("copy");
-        }
-
-        function resetTooltip() {
-            setTimeout(function () {
-                $('#id_btn_copy').attr('data-original-title','{% trans 'Copy list to clipboard' %}');
-            }, 300);
-        }
-
-        $(function () {
-            $('[data-toggle="tooltip"]').tooltip()
-        })
-    </script>
 
 {% endblock %}

cookbook/urls.py

@@ -89,7 +89,7 @@ urlpatterns = [
 
 ]
 
-generic_models = (Recipe, RecipeImport, Storage, RecipeBook, MealPlan, SyncLog, Sync, Comment, RecipeBookEntry, Keyword, Food)
+generic_models = (Recipe, RecipeImport, Storage, RecipeBook, MealPlan, SyncLog, Sync, Comment, RecipeBookEntry, Keyword, Food, ShoppingList)
 
 for m in generic_models:
     py_name = get_model_name(m)

cookbook/views/lists.py

@@ -6,8 +6,8 @@ from django_tables2 import RequestConfig
 
 from cookbook.filters import IngredientFilter
 from cookbook.helper.permission_helper import group_required
-from cookbook.models import Keyword, SyncLog, RecipeImport, Storage, Food
+from cookbook.models import Keyword, SyncLog, RecipeImport, Storage, Food, ShoppingList
-from cookbook.tables import KeywordTable, ImportLogTable, RecipeImportTable, StorageTable, IngredientTable
+from cookbook.tables import KeywordTable, ImportLogTable, RecipeImportTable, StorageTable, IngredientTable, ShoppingListTable
 
 
 @group_required('user')
@@ -45,6 +45,14 @@ def food(request):
     return render(request, 'generic/list_template.html', {'title': _("Ingredients"), 'table': table, 'filter': f})
 
 
+@group_required('user')
+def shopping_list(request):
+    table = ShoppingListTable(ShoppingList.objects.filter(created_by=request.user).all())
+    RequestConfig(request, paginate={'per_page': 25}).configure(table)
+
+    return render(request, 'generic/list_template.html', {'title': _("Shopping Lists"), 'table': table, 'create_url': 'new_storage'})
+
+
 @group_required('admin')
 def storage(request):
     table = StorageTable(Storage.objects.all())