Self hosted FLOSS fitness/workout, nutrition and weight tracker
More post-merge cleanup
Roland Geidere503c5f83015
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.pyindex 592ace11b..4210b343c 100644--- a/wger/nutrition/api/views.py+++ b/wger/nutrition/api/views.py@@ -15,9 +15,13 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.+# Standard Libraryimport datetime+# Djangofrom django.shortcuts import get_object_or_404++# Third Partyfrom rest_framework import viewsetsfrom rest_framework.decorators import (action,diff --git a/wger/nutrition/migrations/0002_auto_20160510_1140.py b/wger/nutrition/migrations/0002_auto_20160510_1140.pydeleted file mode 100644index 736ed2e09..000000000--- a/wger/nutrition/migrations/0002_auto_20160510_1140.py+++ /dev/null@@ -1,39 +0,0 @@-# -*- coding: utf-8 -*--from __future__ import unicode_literals--from django.db import migrations, models-import wger.nutrition.models-import django.core.validators---class Migration(migrations.Migration):-- dependencies = [- ('nutrition', '0001_initial'),- ]-- operations = [- migrations.CreateModel(- name='LogItem',- fields=[- ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),- ('datetime', models.DateTimeField(auto_now=True)),- ('comment', models.TextField(verbose_name='Comment', blank=True)),- ('amount', models.DecimalField(verbose_name='Amount', max_digits=6, decimal_places=2, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1000)])),- ('ingredient', models.ForeignKey(verbose_name='Ingredient', to='nutrition.Ingredient')),- ('plan', models.ForeignKey(editable=False, to='nutrition.NutritionPlan', verbose_name='Nutrition plan')),- ('weight_unit', models.ForeignKey(verbose_name='Weight unit', blank=True, to='nutrition.IngredientWeightUnit', null=True)),- ],- bases=(wger.nutrition.models.BaseMealItem, models.Model),- ),- migrations.AlterField(- model_name='meal',- name='order',- field=models.IntegerField(verbose_name='Order', editable=False, blank=True),- ),- migrations.AlterField(- model_name='mealitem',- name='order',- field=models.IntegerField(verbose_name='Order', editable=False, blank=True),- ),- ]diff --git a/wger/nutrition/migrations/0003_auto_20160515_1523.py b/wger/nutrition/migrations/0003_auto_20160515_1523.pydeleted file mode 100644index 6576fdb3a..000000000--- a/wger/nutrition/migrations/0003_auto_20160515_1523.py+++ /dev/null@@ -1,24 +0,0 @@-# -*- coding: utf-8 -*--from __future__ import unicode_literals--from django.db import migrations, models---class Migration(migrations.Migration):-- dependencies = [- ('nutrition', '0002_auto_20160510_1140'),- ]-- operations = [- migrations.AlterField(- model_name='ingredient',- name='status',- field=models.CharField(editable=False, default='1', max_length=2, choices=[('1', 'Pending'), ('2', 'Accepted'), ('3', 'Declined'), ('4', 'Submitted by administrator'), ('5', 'System ingredient')]),- ),- migrations.AlterField(- model_name='logitem',- name='comment',- field=models.TextField(blank=True, null=True, verbose_name='Comment'),- ),- ]diff --git a/wger/nutrition/migrations/0005_logitem.py b/wger/nutrition/migrations/0005_logitem.pynew file mode 100644index 000000000..263df1ce8--- /dev/null+++ b/wger/nutrition/migrations/0005_logitem.py@@ -0,0 +1,32 @@+# Generated by Django 3.1 on 2020-08-25 10:29++import django.core.validators+from django.db import migrations, models+import django.db.models.deletion+import wger.nutrition.models+++class Migration(migrations.Migration):++ dependencies = [+ ('nutrition', '0004_auto_20200819_2310'),+ ]++ operations = [+ migrations.CreateModel(+ name='LogItem',+ fields=[+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),+ ('datetime', models.DateTimeField(auto_now=True)),+ ('comment', models.TextField(blank=True, null=True, verbose_name='Comment')),+ ('amount', models.DecimalField(decimal_places=2, max_digits=6, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1000)], verbose_name='Amount')),+ ('ingredient', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='nutrition.ingredient', verbose_name='Ingredient')),+ ('plan', models.ForeignKey(editable=False, on_delete=django.db.models.deletion.CASCADE, to='nutrition.nutritionplan', verbose_name='Nutrition plan')),+ ('weight_unit', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='nutrition.ingredientweightunit', verbose_name='Weight unit')),+ ],+ options={+ 'ordering': ['datetime'],+ },+ bases=(wger.nutrition.models.BaseMealItem, models.Model),+ ),+ ]diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex 2072b961f..fd0c34048 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -16,10 +16,9 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Standard Library-import loggingimport datetime+import loggingfrom decimal import Decimal-from collections import OrderedDict# Djangofrom django.conf import settings@@ -33,10 +32,10 @@ from django.core.validators import (MinValueValidator)from django.db import models-from django.template.defaultfilters import slugify # django.utils.text.slugify in django 1.5!from django.template.loader import render_to_stringfrom django.urls import reversefrom django.utils import translation+from django.utils.text import slugifyfrom django.utils.translation import ugettext_lazy as _# wger@@ -758,7 +757,8 @@ class LogItem(BaseMealItem, models.Model):plan = models.ForeignKey(NutritionPlan,verbose_name=_('Nutrition plan'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)'''The plan this log belongs to'''@@ -775,7 +775,9 @@ class LogItem(BaseMealItem, models.Model):Comment field, for additional information'''- ingredient = models.ForeignKey(Ingredient, verbose_name=_('Ingredient'))+ ingredient = models.ForeignKey(Ingredient,+ verbose_name=_('Ingredient'),+ on_delete=models.CASCADE)'''Ingredient'''@@ -784,7 +786,7 @@ class LogItem(BaseMealItem, models.Model):verbose_name=_('Weight unit'),null=True,blank=True,- )+ on_delete=models.CASCADE)'''Weight unit used (grams, slices, etc.)'''@@ -799,13 +801,13 @@ class LogItem(BaseMealItem, models.Model):'''def __str__(self):- '''+ """Return a more human-readable representation- '''+ """return u"Diary entry for {}, plan {}".format(self.datetime, self.plan.pk)def get_owner_object(self):- '''+ """Returns the object that has owner information- '''+ """return self.plandiff --git a/wger/nutrition/templates/log/detail.html b/wger/nutrition/templates/log/detail.htmlindex 4629d0425..7ef19d0af 100644--- a/wger/nutrition/templates/log/detail.html+++ b/wger/nutrition/templates/log/detail.html@@ -1,5 +1,5 @@{% extends "base.html" %}-{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}+{% load i18n static wger_extras django_bootstrap_breadcrumbs %}{# #}{# Title #}diff --git a/wger/nutrition/templates/log/overview.html b/wger/nutrition/templates/log/overview.htmlindex 15ed68f65..486c2ca1a 100644--- a/wger/nutrition/templates/log/overview.html+++ b/wger/nutrition/templates/log/overview.html@@ -1,5 +1,5 @@{% extends "base.html" %}-{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}+{% load i18n static wger_extras django_bootstrap_breadcrumbs %}{# #}{# Title #}diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.pyindex e1a4128e8..d7a5b61f1 100644--- a/wger/nutrition/tests/test_nutrition_diary.py+++ b/wger/nutrition/tests/test_nutrition_diary.py@@ -13,18 +13,25 @@# You should have received a copy of the GNU Affero General Public License# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.-import logging+# Standard Libraryimport datetime+import loggingfrom decimal import Decimal+# Djangofrom django.core.urlresolvers import reverse-from wger.nutrition.models import NutritionPlan, LogItem+# wgerfrom wger.core.tests.base_testcase import (- WorkoutManagerTestCase,WorkoutManagerAccessTestCase,- WorkoutManagerDeleteTestCase+ WorkoutManagerDeleteTestCase,+ WorkoutManagerTestCase)+from wger.nutrition.models import (+ LogItem,+ NutritionPlan+)+logger = logging.getLogger(__name__)diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.pyindex 7ab4efc6c..1074b6baa 100644--- a/wger/nutrition/urls.py+++ b/wger/nutrition/urls.py@@ -27,12 +27,12 @@ from wger.nutrition.views import (bmi,calculator,ingredient,+ log,meal,meal_item,plan,unit,- unit_ingredient,- log+ unit_ingredient)@@ -198,13 +198,13 @@ patterns_diary = [urlpatterns = [- url(r'^', include(patterns_plan, namespace="plan")),- url(r'^meal/', include(patterns_meal, namespace="meal")),- url(r'^meal/item/', include(patterns_meal_item, namespace="meal_item")),- url(r'^ingredient/', include(patterns_ingredient, namespace="ingredient")),- url(r'^unit/', include(patterns_weight_unit, namespace="weight_unit")),- url(r'^unit-to-ingredient/', include(patterns_unit_ingredient, namespace="unit_ingredient")),- url(r'^calculator/bmi/', include(patterns_bmi, namespace="bmi")),- url(r'^calculator/calories/', include(patterns_calories, namespace="calories")),-url(r'^diary/', include(patterns_diary, namespace="log")),+ url(r'^', include((patterns_plan, "plan"), namespace="plan")),+ url(r'^meal/', include((patterns_meal, "meal"), namespace="meal")),+ url(r'^meal/item/', include((patterns_meal_item, "meal_item"), namespace="meal_item")),+ url(r'^ingredient/', include((patterns_ingredient, "ingredient"), namespace="ingredient")),+ url(r'^unit/', include((patterns_weight_unit, "weight_unit"), namespace="weight_unit")),+ url(r'^unit-to-ingredient/', include((patterns_unit_ingredient, "unit_ingredient"), namespace="unit_ingredient")),+ url(r'^calculator/bmi/', include((patterns_bmi, "bmi"), namespace="bmi")),+ url(r'^calculator/calories/', include((patterns_calories, "calories"), namespace="calories")),+ url(r'^diary/', include((patterns_diary, "log"), namespace="log")),]diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.pyindex 4f243bcab..559114fd1 100644--- a/wger/nutrition/views/log.py+++ b/wger/nutrition/views/log.py@@ -14,37 +14,41 @@## You should have received a copy of the GNU Affero General Public License+# Standard Libraryimport datetimeimport logging-from django.core.urlresolvers import reverse+# Djangofrom django.http import (- HttpResponseRedirect,- HttpResponseForbidden+ HttpResponseForbidden,+ HttpResponseRedirect)from django.shortcuts import (- render,- get_object_or_404+ get_object_or_404,+ render)+from django.urls import reversefrom django.utils.translation import ugettext_lazyfrom django.views.generic import DeleteView+# wgerfrom wger.nutrition.models import (- NutritionPlan,- LogItem+ LogItem,+ NutritionPlan)from wger.utils.generic_views import (WgerDeleteMixin,WgerPermissionMixin)+logger = logging.getLogger(__name__)def overview(request, pk):- '''+ """Shows an overview of diary entries for the given plan- '''+ """# Check read permissionplan = get_object_or_404(NutritionPlan, pk=pk)@@ -71,9 +75,9 @@ def overview(request, pk):def detail(request, pk, year, month, day):- '''+ """Shows an overview of the log for the given date- '''+ """# Check read permissionplan = get_object_or_404(NutritionPlan, pk=pk)@@ -105,18 +109,18 @@ def detail(request, pk, year, month, day):class LogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):- '''+ """Delete a nutrition diary entry- '''+ """model = LogItemtitle = ugettext_lazy('Delete?')form_action_urlname = 'nutrition:log:delete'login_required = Truedef get_success_url(self):- '''+ """Return to the nutrition diary detail page- '''+ """return reverse('nutrition:log:detail', kwargs={'pk': self.object.plan.pk,'year': self.object.datetime.year,'month': self.object.datetime.month,