diff --git a/cookbook/migrations/0049_mealtype_created_by.py b/cookbook/migrations/0049_mealtype_created_by.py new file mode 100644 index 000000000..f5e27573a --- /dev/null +++ b/cookbook/migrations/0049_mealtype_created_by.py @@ -0,0 +1,21 @@ +# Generated by Django 3.0.7 on 2020-06-11 13:08 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('cookbook', '0048_auto_20200602_1140'), + ] + + operations = [ + migrations.AddField( + model_name='mealtype', + name='created_by', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/cookbook/migrations/0050_auto_20200611_1509.py b/cookbook/migrations/0050_auto_20200611_1509.py new file mode 100644 index 000000000..7c8413686 --- /dev/null +++ b/cookbook/migrations/0050_auto_20200611_1509.py @@ -0,0 +1,30 @@ +# Generated by Django 3.0.7 on 2020-06-11 13:09 + +from django.db import migrations +from django.db.models import Q + + +def migrate_meal_types(apps, schema_editor): + MealPlan = apps.get_model('cookbook', 'MealPlan') + MealType = apps.get_model('cookbook', 'MealType') + User = apps.get_model('auth', 'User') + + for u in User.objects.all(): + for t in MealType.objects.filter(created_by=None).all(): + user_type = MealType.objects.create( + name=t.name, + created_by=u, + ) + MealPlan.objects.filter(Q(created_by=u) and Q(meal_type=t)).update(meal_type=user_type) + + MealType.objects.filter(created_by=None).delete() + + +class Migration(migrations.Migration): + dependencies = [ + ('cookbook', '0049_mealtype_created_by'), + ] + + operations = [ + migrations.RunPython(migrate_meal_types), + ] diff --git a/cookbook/migrations/0051_auto_20200611_1518.py b/cookbook/migrations/0051_auto_20200611_1518.py new file mode 100644 index 000000000..896ba57c6 --- /dev/null +++ b/cookbook/migrations/0051_auto_20200611_1518.py @@ -0,0 +1,21 @@ +# Generated by Django 3.0.7 on 2020-06-11 13:18 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('cookbook', '0050_auto_20200611_1509'), + ] + + operations = [ + migrations.AlterField( + model_name='mealtype', + name='created_by', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/cookbook/models.py b/cookbook/models.py index f824a5baf..a3609f5c2 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -214,6 +214,7 @@ class RecipeBookEntry(models.Model): class MealType(models.Model): name = models.CharField(max_length=128) order = models.IntegerField(default=0) + created_by = models.ForeignKey(User, on_delete=models.CASCADE) def __str__(self): return self.name diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index 7738fc50d..cb0850747 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -49,6 +49,8 @@ [[d]]
[[formatDateDay(d)]]. + @@ -62,7 +64,7 @@ + :empty-insert-threshold="10" handle=".handle">
@@ -93,7 +95,6 @@
-
{% trans 'New Entry' %} @@ -112,7 +113,7 @@
- [[element.name]] + [[element.name]]
@@ -141,6 +142,36 @@
+
+
+
+ {% trans 'Shopping List' %} +
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+

@@ -192,6 +223,9 @@
+ {% trans 'Edit' %} @@ -229,6 +263,8 @@ default_shared_users: [], user_id_update: [], user_names: {}, + shopping: false, + shopping_list: [], }, mounted: function () { console.log("MOUNTED") @@ -427,6 +463,32 @@ changeWeek: function (change) { this.week = moment(this.week).add(change, 'w').format('YYYY-[W]WW') this.updatePlan(); + }, + getShoppingUrl: function () { + let url = "{% url 'view_shopping' %}" + let first = true + for (let se of this.shopping_list) { + if (first) { + url += `?r=${se.recipe}` + first = false + } else { + url += `&r=${se.recipe}` + } + } + return url + }, + addDayToShopping: function (day) { + let date = moment(this.week).weekday(this.days.indexOf(day)).format('YYYY-MM-DD') + + for (let t of this.meal_types) { + console.log(t.id, date) + for (let i of this.meal_plan[t.id].days[date].items) { + if (!this.shopping_list.includes(i)) { + console.log("adding ", i) + this.shopping_list.push(i) + } + } + } } } }); diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 6b2139ac2..7bfeae588 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -1,5 +1,4 @@ import json -import os import re from annoying.decorators import ajax_request @@ -10,8 +9,8 @@ from django.db.models import Q from django.http import HttpResponse, FileResponse from django.shortcuts import redirect from django.utils.translation import gettext as _ -from rest_framework import viewsets, permissions, serializers -from rest_framework.exceptions import ValidationError, APIException +from rest_framework import viewsets, permissions +from rest_framework.exceptions import APIException from cookbook.helper.permission_helper import group_required from cookbook.models import Recipe, Sync, Storage, CookLog, MealPlan, MealType, ViewLog @@ -57,6 +56,10 @@ class MealTypeViewSet(viewsets.ModelViewSet): serializer_class = MealTypeSerializer permission_classes = [permissions.IsAuthenticated] + def get_queryset(self): + queryset = MealType.objects.filter(created_by=self.request.user).all() + return queryset + class RecipeViewSet(viewsets.ModelViewSet): queryset = Recipe.objects.all() @@ -81,11 +84,12 @@ class ViewLogViewSet(viewsets.ModelViewSet): permission_classes = [permissions.IsAuthenticated] def get_queryset(self): - # TODO user + unique filter - queryset = ViewLog.objects.all()[:5] + queryset = ViewLog.objects.filter(created_by=self.request.user).all()[:5] return queryset +# -------------- non django rest api views -------------------- + def get_recipe_provider(recipe): if recipe.storage.method == Storage.DROPBOX: return Dropbox