From 2dbf8f0db3ccd0edb8f6bcd25c84023b76e99f99 Mon Sep 17 00:00:00 2001 From: Svn-Sp Date: Wed, 19 Aug 2020 18:23:58 +0200 Subject: [PATCH 001/105] Feature: Bmi on graph at weight overview Issue(#462) --- wger/weight/static/js/weight.js | 34 +++++++++++++++++++++++++++++ wger/weight/templates/overview.html | 4 +++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/wger/weight/static/js/weight.js b/wger/weight/static/js/weight.js index 742024d8a..1fbe75446 100644 --- a/wger/weight/static/js/weight.js +++ b/wger/weight/static/js/weight.js @@ -78,6 +78,40 @@ $(document).ready(function () { chartParams.data = data; MG.data_graphic(chartParams); } + }); + //show bmi lines + $(document.querySelector("#enable_bmi")).click(function(){ + var height = document.querySelector("#height").value / 100; + //kg = bmi * cm² + var max = height*height * 25; + var min = height*height * 20; + var yAxisChildren = document.querySelector("#weight_diagram").querySelector("svg").querySelector(".mg-y-axis").children; + //get index of first text element + for(let i = 0; i - +
+ +
From 93d2e1e9af4d13775dc8bd79172af912677cd439 Mon Sep 17 00:00:00 2001 From: Svn-Sp Date: Wed, 19 Aug 2020 18:31:29 +0200 Subject: [PATCH 002/105] Added Name on AUTHORS.rst --- AUTHORS.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS.rst b/AUTHORS.rst index b9a3585af..6385ad846 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -25,7 +25,7 @@ Developers * Malcolm Jones: https://github.com/DevloperMal * Boniface Mwenda: https://github.com/andela-bmwenda * Scott Peshak: https://github.com/speshak - +* Sven - https://github.com/Svn-Sp Translators ----------- From 5e014d6e506020f483ac4f105734c0001fd16176 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 30 Aug 2020 19:46:22 +0200 Subject: [PATCH 003/105] Remove vary on headers The templates do not depend on the user agent anymore --- wger/core/views/misc.py | 2 -- wger/manager/views/schedule.py | 2 -- wger/manager/views/workout.py | 2 -- 3 files changed, 6 deletions(-) diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py index 8ba59c071..21ea31c86 100644 --- a/wger/core/views/misc.py +++ b/wger/core/views/misc.py @@ -32,7 +32,6 @@ from django.urls import ( reverse_lazy ) from django.utils.translation import ugettext as _ -from django.views.decorators.vary import vary_on_headers from django.views.generic import TemplateView from django.views.generic.edit import FormView @@ -94,7 +93,6 @@ def demo_entries(request): @login_required -@vary_on_headers('User-Agent') def dashboard(request): """ Show the index page, in our case, the last workout and nutritional plan diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py index b1b462f8e..68946a14b 100644 --- a/wger/manager/views/schedule.py +++ b/wger/manager/views/schedule.py @@ -38,7 +38,6 @@ from django.utils.translation import ( ugettext as _, ugettext_lazy ) -from django.views.decorators.vary import vary_on_headers from django.views.generic import ( CreateView, DeleteView, @@ -88,7 +87,6 @@ def overview(request): return render(request, 'schedule/overview.html', template_data) -@vary_on_headers('User-Agent') def view(request, pk): """ Show the workout schedule diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py index a2ca7255c..d9371bad0 100644 --- a/wger/manager/views/workout.py +++ b/wger/manager/views/workout.py @@ -39,7 +39,6 @@ from django.utils.translation import ( ugettext as _, ugettext_lazy ) -from django.views.decorators.vary import vary_on_headers from django.views.generic import ( DeleteView, UpdateView @@ -91,7 +90,6 @@ def overview(request): return render(request, 'workout/overview.html', template_data) -@vary_on_headers('User-Agent') def view(request, pk): """ Show the workout with the given ID From eaeffd2c71111bde40a7b226403c90270fe5a731 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 30 Aug 2020 20:42:06 +0200 Subject: [PATCH 004/105] Fix typo --- wger/core/templates/500.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wger/core/templates/500.html b/wger/core/templates/500.html index e2e839e85..f7431e85e 100644 --- a/wger/core/templates/500.html +++ b/wger/core/templates/500.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n static %} -{% block title %}{% trans "An error occured" %}{% endblock %} +{% block title %}{% trans "An error occurred" %}{% endblock %} {% block content %}

{% trans "Something happened that caused an error." %}

From 7d3ec2d13b89a0edad55cb49b92b8aa40219c33a Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 30 Aug 2020 21:01:17 +0200 Subject: [PATCH 005/105] Add template with no context This can be used for error templates or other that just display a general error message and where the context might not be available. This also has the additional benefit, that there is no unending list of errors during testing when something happens while testing. --- wger/core/templates/403.html | 2 +- wger/core/templates/404.html | 2 +- wger/core/templates/500.html | 2 +- wger/core/templates/template_no_context.html | 98 ++++++++++++++++++++ 4 files changed, 101 insertions(+), 3 deletions(-) create mode 100644 wger/core/templates/template_no_context.html diff --git a/wger/core/templates/403.html b/wger/core/templates/403.html index e0b2ef552..49f6a69db 100644 --- a/wger/core/templates/403.html +++ b/wger/core/templates/403.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "template_no_context.html" %} {% load i18n static %} {% block title %}{% trans "Forbidden!" %}{% endblock %} diff --git a/wger/core/templates/404.html b/wger/core/templates/404.html index aaa39f1b9..064275198 100644 --- a/wger/core/templates/404.html +++ b/wger/core/templates/404.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "template_no_context.html" %} {% load i18n static %} {% block title %}{% trans "Page not found" %}{% endblock %} diff --git a/wger/core/templates/500.html b/wger/core/templates/500.html index f7431e85e..85e7f53a6 100644 --- a/wger/core/templates/500.html +++ b/wger/core/templates/500.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "template_no_context.html" %} {% load i18n static %} {% block title %}{% trans "An error occurred" %}{% endblock %} diff --git a/wger/core/templates/template_no_context.html b/wger/core/templates/template_no_context.html new file mode 100644 index 000000000..69807f876 --- /dev/null +++ b/wger/core/templates/template_no_context.html @@ -0,0 +1,98 @@ + + + +{% load i18n static wger_extras compress django_bootstrap_breadcrumbs %} + + + + + + + + + + + + + + + {% block header %}{% endblock %} + + {% trans "An error occurred" %} + + + +{# #} +{# Navigation #} +{# #} +
+ + + + + +{# #} +{# Main content #} +{# #} +
+
+
+
+

+ {% block title %}{% endblock %} +

+
+
+
+
+
+
+
+ {% block content %}{% endblock %} +
+
+
+
+ + + + + + + + + + + From 6d2108f35b6458839ca5eaecf9674e9899496561 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 30 Aug 2020 21:13:48 +0200 Subject: [PATCH 006/105] Re-add test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hoping this closes #468 🤞 --- wger/manager/tests/test_schedule.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.py index e19bb8458..88aa6d9f7 100644 --- a/wger/manager/tests/test_schedule.py +++ b/wger/manager/tests/test_schedule.py @@ -178,15 +178,12 @@ class ScheduleTestCase(WgerTestCase): self.assertEqual(response.status_code, 200) self.assertNotContains(response, 'This schedule is a loop') - # Commented out since travis was seemingly randomly failing this. See #468 - # - # def test_schedule_detail_page_owner(self): - # """ - # Tests the schedule detail page as the owning user - # """ - # - # self.user_login() - # self.schedule_detail_page() + def test_schedule_detail_page_owner(self): + """ + Tests the schedule detail page as the owning user + """ + self.user_login() + self.schedule_detail_page() def test_schedule_overview(self): """ From 659ca86be0d954824efa5b291c64df6f8148ca2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Aug 2020 05:01:05 +0000 Subject: [PATCH 007/105] Update django-storages requirement from ~=1.9 to ~=1.10 Updates the requirements on [django-storages](https://github.com/jschneier/django-storages) to permit the latest version. - [Release notes](https://github.com/jschneier/django-storages/releases) - [Changelog](https://github.com/jschneier/django-storages/blob/master/CHANGELOG.rst) - [Commits](https://github.com/jschneier/django-storages/compare/1.9...1.10) Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index d8e6055da..bf815098e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ django-crispy-forms~=1.9 django_compressor~=2.4 django_extensions~=3.0 django-sortedm2m~=3.0 -django-storages~=1.9 +django-storages~=1.10 easy-thumbnails~=2.7 icalendar==4.0.6 invoke~=1.4 From 2d0259bf14d9a27918867b94f74877f4f1a6291c Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 31 Aug 2020 23:10:51 +0200 Subject: [PATCH 008/105] Simplify options menu for workout days This is more discoverable on mobile and works on desktop as well. Also, comment the drag and drop handles, they are making a too much trouble and need to be rewritten anyway. --- wger/core/templates/tags/render_day.html | 31 +++++++++++++++--------- wger/manager/templates/workout/view.html | 7 +++--- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.html index d8637b60a..f8ee03a30 100644 --- a/wger/core/templates/tags/render_day.html +++ b/wger/core/templates/tags/render_day.html @@ -34,6 +34,7 @@ $(document).ready(function() { {% trans 'Edit' %} +
{% trans 'Delete' %} @@ -50,23 +51,31 @@ $(document).ready(function() { {% for set in day.set_list %} -

#{{ forloop.counter }}

+ #{{ forloop.counter }} {% if editable %} +
+ +
+ + + {% trans 'Edit' %} + +
+ + + {% trans 'Delete' %} + +
+
+ + {% if false and day.set_list|length > 1 %} - {% if day.set_list|length > 1 %}
- {% endif %} - - -
- - + {% endif %} {% endif %} diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html index 0db8acce9..fe75ba13c 100644 --- a/wger/manager/templates/workout/view.html +++ b/wger/manager/templates/workout/view.html @@ -125,9 +125,9 @@ $(document).ready(function () { application for example google calendar, outlook or iCal. This will create an appointment for each training day with the appropriate exercises.{% endblocktrans %}

- - {% trans "Export calendar file" %} - + + {% trans "Export calendar file" %} +

@@ -227,6 +227,7 @@ an appointment for each training day with the appropriate exercises.{% endblockt {% trans "Make a copy of this workout" %} {% if is_owner %} +
{% trans "Delete" %} From 0fb1a0e885e69485a7903a5ede7518e0344e260e Mon Sep 17 00:00:00 2001 From: snappy45 Date: Fri, 15 Jun 2018 14:56:35 +0300 Subject: [PATCH 009/105] [Feature #157731565] Cache nutritional values for plan in Nutritional Plan: - Add nutritional cache key function for a Nutrition plan - Add signals to listen to saving, editing and deleting of a meal, meal item or nutrion plan - Add tests to test that this functionality works [#157731565] # Conflicts: # .gitignore # wger/nutrition/models.py --- wger/nutrition/models.py | 100 +++++++++++------- wger/nutrition/signals.py | 45 ++++++++ .../nutrition/tests/test_nutritional_cache.py | 87 +++++++++++++++ wger/utils/cache.py | 7 ++ 4 files changed, 200 insertions(+), 39 deletions(-) create mode 100644 wger/nutrition/signals.py create mode 100644 wger/nutrition/tests/test_nutritional_cache.py diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py index 1c9e37933..1aed02a92 100644 --- a/wger/nutrition/models.py +++ b/wger/nutrition/models.py @@ -32,6 +32,8 @@ from django.core.validators import ( MinValueValidator ) from django.db import models +from django.db.models.signals import post_save, post_delete +from django.dispatch import receiver from django.template.loader import render_to_string from django.urls import reverse from django.utils import translation @@ -119,50 +121,53 @@ class NutritionPlan(models.Model): """ Sums the nutritional info of all items in the plan """ - use_metric = self.user.userprofile.use_metric - unit = 'kg' if use_metric else 'lb' - result = {'total': {'energy': 0, - 'protein': 0, - 'carbohydrates': 0, - 'carbohydrates_sugar': 0, - 'fat': 0, - 'fat_saturated': 0, - 'fibres': 0, - 'sodium': 0}, - 'percent': {'protein': 0, - 'carbohydrates': 0, - 'fat': 0}, - 'per_kg': {'protein': 0, - 'carbohydrates': 0, - 'fat': 0}, - } + nutritional_representation = cache.get(cache_mapper.get_nutrition_cache_by_key(self.pk)) + if not nutritional_representation: + use_metric = self.user.userprofile.use_metric + unit = 'kg' if use_metric else 'lb' + result = {'total': {'energy': 0, + 'protein': 0, + 'carbohydrates': 0, + 'carbohydrates_sugar': 0, + 'fat': 0, + 'fat_saturated': 0, + 'fibres': 0, + 'sodium': 0}, + 'percent': {'protein': 0, + 'carbohydrates': 0, + 'fat': 0}, + 'per_kg': {'protein': 0, + 'carbohydrates': 0, + 'fat': 0}, + } - # Energy - for meal in self.meal_set.select_related(): - values = meal.get_nutritional_values(use_metric=use_metric) - for key in result['total'].keys(): - result['total'][key] += values[key] + # Energy + for meal in self.meal_set.select_related(): + values = meal.get_nutritional_values(use_metric=use_metric) + for key in result['total'].keys(): + result['total'][key] += values[key] - energy = result['total']['energy'] + energy = result['total']['energy'] - # In percent - if energy: - for key in result['percent'].keys(): - result['percent'][key] = \ - result['total'][key] * ENERGY_FACTOR[key][unit] / energy * 100 + # In percent + if energy: + for key in result['percent'].keys(): + result['percent'][key] = \ + result['total'][key] * ENERGY_FACTOR[key][unit] / energy * 100 - # Per body weight - weight_entry = self.get_closest_weight_entry() - if weight_entry: - for key in result['per_kg'].keys(): - result['per_kg'][key] = result['total'][key] / weight_entry.weight + # Per body weight + weight_entry = self.get_closest_weight_entry() + if weight_entry: + for key in result['per_kg'].keys(): + result['per_kg'][key] = result['total'][key] / weight_entry.weight - # Only 2 decimal places, anything else doesn't make sense - for key in result.keys(): - for i in result[key]: - result[key][i] = Decimal(result[key][i]).quantize(TWOPLACES) - - return result + # Only 2 decimal places, anything else doesn't make sense + for key in result.keys(): + for i in result[key]: + result[key][i] = Decimal(result[key][i]).quantize(TWOPLACES) + nutritional_representation = result + cache.set(cache_mapper.get_nutrition_cache_by_key(self.pk), nutritional_representation) + return nutritional_representation def get_closest_weight_entry(self): """ @@ -808,3 +813,20 @@ class LogItem(BaseMealItem, models.Model): Returns the object that has owner information """ return self.plan + + +@receiver(post_save, sender=NutritionPlan) +@receiver(post_delete, sender=NutritionPlan) +@receiver(post_save, sender=Meal) +@receiver(post_delete, sender=Meal) +@receiver(post_save, sender=MealItem) +@receiver(post_delete, sender=MealItem) +def reset_nutritional_values_canonical_form(sender, **kwargs): + ''' + Reset the nutrition values canonical form in cache + ''' + sender_instance = kwargs["instance"] + if isinstance(sender_instance, (Meal, MealItem)): + cache.delete(cache_mapper.get_nutrition_cache_by_key(sender_instance.get_owner_object().id)) + elif isinstance(sender_instance, NutritionPlan): + cache.delete(cache_mapper.get_nutrition_cache_by_key(sender_instance.id)) diff --git a/wger/nutrition/signals.py b/wger/nutrition/signals.py new file mode 100644 index 000000000..b146c7944 --- /dev/null +++ b/wger/nutrition/signals.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- + +# This file is part of wger Workout Manager. +# +# wger Workout Manager is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# wger Workout Manager is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License + +# Django +from django.core.cache import cache +from django.db.models.signals import ( + post_save, + post_delete +) + +# wger +from wger.nutrition.models import NutritionPlan, Meal, MealItem +from wger.utils.cache import cache_mapper + + +def reset_nutritional_values_canonical_form(sender, instance, **kwargs): + """ + Reset the nutrition values canonical form in cache + """ + if isinstance(instance, (Meal, MealItem)): + cache.delete(cache_mapper.get_nutrition_cache_by_key(instance.get_owner_object().id)) + elif isinstance(instance, NutritionPlan): + cache.delete(cache_mapper.get_nutrition_cache_by_key(instance.id)) + + +post_save.connect(reset_nutritional_values_canonical_form, sender=NutritionPlan) +post_delete.connect(reset_nutritional_values_canonical_form, sender=NutritionPlan) +post_save.connect(reset_nutritional_values_canonical_form, sender=Meal) +post_delete.connect(reset_nutritional_values_canonical_form, sender=Meal) +post_save.connect(reset_nutritional_values_canonical_form, sender=MealItem) +post_delete.connect(reset_nutritional_values_canonical_form, sender=MealItem) + diff --git a/wger/nutrition/tests/test_nutritional_cache.py b/wger/nutrition/tests/test_nutritional_cache.py new file mode 100644 index 000000000..d5c312b65 --- /dev/null +++ b/wger/nutrition/tests/test_nutritional_cache.py @@ -0,0 +1,87 @@ +from django.contrib.auth.models import User +from django.core.cache import cache +from wger.core.tests.base_testcase import WgerTestCase +from wger.nutrition.models import NutritionPlan, Meal, MealItem +from wger.utils.cache import cache_mapper +from wger.core.models import Language + + +class NutritionaCacheTestCase(WgerTestCase): + + def create_nutrition_plan(self): + ''' + Create a nutrition plan and set dummy attributes that are required + Create meal and set dummy attributes that are required + Create meal item and set dummy attributes that are required + ''' + nutrition_plan = NutritionPlan() + nutrition_plan.user = User.objects.create_user(username='example_user_1') + nutrition_plan.language = Language.objects.get(short_name="en") + nutrition_plan.save() + meal = Meal() + meal.plan = nutrition_plan + meal.order = 1 + meal.save() + meal_item = MealItem() + meal_item.id = 1 + meal_item.meal = meal + meal_item.amount = 1 + meal_item.ingredient_id = 1 + meal_item.order = 1 + test_objects = [nutrition_plan, meal, meal_item] + return test_objects + + def test_cache_setting(self): + ''' + Test that a cache is set once the nutritional instance is created + ''' + nutrition_object = self.create_nutrition_plan()[0] + self.assertFalse(cache.get(cache_mapper.get_nutrition_cache_by_key(nutrition_object))) + nutrition_object.get_nutritional_values() + self.assertTrue(cache.get(cache_mapper.get_nutrition_cache_by_key(nutrition_object))) + + def test_nutrition_save_and_delete(self): + ''' + Test that cache is deleted when a nutrition is created or deleted. + ''' + nutrition_object = self.create_nutrition_plan()[0] + nutrition_object.get_nutritional_values() + self.assertTrue(cache.get(cache_mapper.get_nutrition_cache_by_key(nutrition_object))) + nutrition_object.save() + self.assertFalse(cache.get(cache_mapper.get_nutrition_cache_by_key(nutrition_object))) + nutrition_object.get_nutritional_values() + self.assertTrue(cache.get(cache_mapper.get_nutrition_cache_by_key(nutrition_object))) + nutrition_object.delete() + self.assertFalse(cache.get(cache_mapper.get_nutrition_cache_by_key(nutrition_object))) + + def test_meal_save_delete(self): + ''' + Test that the cache is deleted once a meal undergoes a save or delete operation + ''' + test_object_list = self.create_nutrition_plan() + nutritional_object = test_object_list[0] + meal = test_object_list[1] + nutritional_object.get_nutritional_values() + self.assertTrue(cache.get(cache_mapper.get_nutrition_cache_by_key(nutritional_object))) + meal.save() + self.assertFalse(cache.get(cache_mapper.get_nutrition_cache_by_key(nutritional_object.pk))) + nutritional_object.get_nutritional_values() + self.assertTrue(cache.get(cache_mapper.get_nutrition_cache_by_key(nutritional_object))) + meal.delete() + self.assertFalse(cache.get(cache_mapper.get_nutrition_cache_by_key(nutritional_object))) + + def test_meal_item_save_delete(self): + ''' + Test that the cache is deleted once a meal undergoes a save or delete operation + ''' + test_object_list = self.create_nutrition_plan() + nutritional_object = test_object_list[0] + meal_item = test_object_list[2] + nutritional_object.get_nutritional_values() + self.assertTrue(cache.get(cache_mapper.get_nutrition_cache_by_key(nutritional_object))) + meal_item.save() + self.assertFalse(cache.get(cache_mapper.get_nutrition_cache_by_key(nutritional_object.pk))) + nutritional_object.get_nutritional_values() + self.assertTrue(cache.get(cache_mapper.get_nutrition_cache_by_key(nutritional_object))) + meal_item.delete() + self.assertFalse(cache.get(cache_mapper.get_nutrition_cache_by_key(meal_item))) diff --git a/wger/utils/cache.py b/wger/utils/cache.py index adafa77f1..700fd7398 100644 --- a/wger/utils/cache.py +++ b/wger/utils/cache.py @@ -58,6 +58,7 @@ class CacheKeyMapper(object): INGREDIENT_CACHE_KEY = 'ingredient-{0}' WORKOUT_CANONICAL_REPRESENTATION = 'workout-canonical-representation-{0}' WORKOUT_LOG_LIST = 'workout-log-hash-{0}' + NUTRITION_CACHE_KEY = 'nutrition-cache-log-{0}' def get_pk(self, param): """ @@ -100,5 +101,11 @@ class CacheKeyMapper(object): """ return self.WORKOUT_LOG_LIST.format(hash_value) + def get_nutrition_cache_by_key(self, params): + """ + get nutritional info values canonical representation using primary key. + """ + return self.NUTRITION_CACHE_KEY.format(self.get_pk(params)) + cache_mapper = CacheKeyMapper() From 99905118be29496e0d76686b319a9d8507ce878c Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Mon, 31 Aug 2020 23:43:12 +0200 Subject: [PATCH 010/105] Small refactoring of nutritional values cache logic --- AUTHORS.rst | 1 + docs/changelog.rst | 4 +++ wger/nutrition/__init__.py | 1 + wger/nutrition/apps.py | 26 +++++++++++++++++++ wger/nutrition/models.py | 19 -------------- wger/nutrition/signals.py | 16 ++++++------ .../nutrition/tests/test_nutritional_cache.py | 13 +++++++--- 7 files changed, 50 insertions(+), 30 deletions(-) create mode 100644 wger/nutrition/apps.py diff --git a/AUTHORS.rst b/AUTHORS.rst index b9a3585af..44e463b03 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -25,6 +25,7 @@ Developers * Malcolm Jones: https://github.com/DevloperMal * Boniface Mwenda: https://github.com/andela-bmwenda * Scott Peshak: https://github.com/speshak +* Musanje Louis Michael: https://github.com/louiCoder Translators ----------- diff --git a/docs/changelog.rst b/docs/changelog.rst index d9f378cf0..c0fdf414e 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -32,7 +32,11 @@ Upgrade steps from 1.9: * Updated many libraries to last version (bootstrap, font awesome, etc.) * Use yarn to download CSS/JS libraries * Improvements to documentation (e.g. `#494`_) +* Improved cache handling `#246`_ (thanks `@louiCoder`_) +.. _@louiCoder: https://github.com/louiCoder + +.. _#246: https://github.com/wger-project/wger/issues/246 .. _#284: https://github.com/wger-project/wger/issues/284 .. _#337: https://github.com/wger-project/wger/issues/337 .. _#340: https://github.com/wger-project/wger/issues/340 diff --git a/wger/nutrition/__init__.py b/wger/nutrition/__init__.py index 46a91e9bd..a46a190d3 100644 --- a/wger/nutrition/__init__.py +++ b/wger/nutrition/__init__.py @@ -21,3 +21,4 @@ from wger import get_version VERSION = get_version() +default_app_config = 'wger.nutrition.apps.NutritionConfig' diff --git a/wger/nutrition/apps.py b/wger/nutrition/apps.py new file mode 100644 index 000000000..62f4cbcf7 --- /dev/null +++ b/wger/nutrition/apps.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- + +# This file is part of wger Workout Manager. +# +# wger Workout Manager is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# wger Workout Manager is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License + +# Django +from django.apps import AppConfig + + +class NutritionConfig(AppConfig): + name = 'wger.nutrition' + verbose_name = "Nutrition" + + def ready(self): + import wger.nutrition.signals diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py index 1aed02a92..278cd312c 100644 --- a/wger/nutrition/models.py +++ b/wger/nutrition/models.py @@ -32,8 +32,6 @@ from django.core.validators import ( MinValueValidator ) from django.db import models -from django.db.models.signals import post_save, post_delete -from django.dispatch import receiver from django.template.loader import render_to_string from django.urls import reverse from django.utils import translation @@ -813,20 +811,3 @@ class LogItem(BaseMealItem, models.Model): Returns the object that has owner information """ return self.plan - - -@receiver(post_save, sender=NutritionPlan) -@receiver(post_delete, sender=NutritionPlan) -@receiver(post_save, sender=Meal) -@receiver(post_delete, sender=Meal) -@receiver(post_save, sender=MealItem) -@receiver(post_delete, sender=MealItem) -def reset_nutritional_values_canonical_form(sender, **kwargs): - ''' - Reset the nutrition values canonical form in cache - ''' - sender_instance = kwargs["instance"] - if isinstance(sender_instance, (Meal, MealItem)): - cache.delete(cache_mapper.get_nutrition_cache_by_key(sender_instance.get_owner_object().id)) - elif isinstance(sender_instance, NutritionPlan): - cache.delete(cache_mapper.get_nutrition_cache_by_key(sender_instance.id)) diff --git a/wger/nutrition/signals.py b/wger/nutrition/signals.py index b146c7944..c2b8b8837 100644 --- a/wger/nutrition/signals.py +++ b/wger/nutrition/signals.py @@ -17,12 +17,16 @@ # Django from django.core.cache import cache from django.db.models.signals import ( - post_save, - post_delete + post_delete, + post_save ) # wger -from wger.nutrition.models import NutritionPlan, Meal, MealItem +from wger.nutrition.models import ( + Meal, + MealItem, + NutritionPlan +) from wger.utils.cache import cache_mapper @@ -30,10 +34,7 @@ def reset_nutritional_values_canonical_form(sender, instance, **kwargs): """ Reset the nutrition values canonical form in cache """ - if isinstance(instance, (Meal, MealItem)): - cache.delete(cache_mapper.get_nutrition_cache_by_key(instance.get_owner_object().id)) - elif isinstance(instance, NutritionPlan): - cache.delete(cache_mapper.get_nutrition_cache_by_key(instance.id)) + cache.delete(cache_mapper.get_nutrition_cache_by_key(instance.get_owner_object().id)) post_save.connect(reset_nutritional_values_canonical_form, sender=NutritionPlan) @@ -42,4 +43,3 @@ post_save.connect(reset_nutritional_values_canonical_form, sender=Meal) post_delete.connect(reset_nutritional_values_canonical_form, sender=Meal) post_save.connect(reset_nutritional_values_canonical_form, sender=MealItem) post_delete.connect(reset_nutritional_values_canonical_form, sender=MealItem) - diff --git a/wger/nutrition/tests/test_nutritional_cache.py b/wger/nutrition/tests/test_nutritional_cache.py index d5c312b65..cbd8ad9e7 100644 --- a/wger/nutrition/tests/test_nutritional_cache.py +++ b/wger/nutrition/tests/test_nutritional_cache.py @@ -1,9 +1,16 @@ +# Django from django.contrib.auth.models import User from django.core.cache import cache -from wger.core.tests.base_testcase import WgerTestCase -from wger.nutrition.models import NutritionPlan, Meal, MealItem -from wger.utils.cache import cache_mapper + +# wger from wger.core.models import Language +from wger.core.tests.base_testcase import WgerTestCase +from wger.nutrition.models import ( + Meal, + MealItem, + NutritionPlan +) +from wger.utils.cache import cache_mapper class NutritionaCacheTestCase(WgerTestCase): From 10f9aae484e3d26e598e4956827a0c18569fa4dc Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 1 Sep 2020 01:34:48 +0200 Subject: [PATCH 011/105] Render trained muscles with render_muscles tag For this, a small refactoring for the canonical representation was needed, so that the muscles themselves and not only their IDs are passed on. --- wger/manager/api/serializers.py | 21 ++++++-- wger/manager/models.py | 14 +++--- wger/manager/templates/workout/view.html | 10 +--- wger/manager/tests/test_workout_canonical.py | 50 ++++++++++++++------ wger/manager/views/workout.py | 25 +--------- 5 files changed, 62 insertions(+), 58 deletions(-) diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py index a084aa79a..9d82a9713 100644 --- a/wger/manager/api/serializers.py +++ b/wger/manager/api/serializers.py @@ -24,7 +24,10 @@ from wger.core.api.serializers import ( RepetitionUnitSerializer, WeightUnitSerializer ) -from wger.exercises.api.serializers import ExerciseSerializer +from wger.exercises.api.serializers import ( + ExerciseSerializer, + MuscleSerializer +) from wger.manager.models import ( Day, Schedule, @@ -115,6 +118,16 @@ class SettingSerializer(serializers.ModelSerializer): # # Custom helper serializers for the canonical form of a workout # +class MusclesCanonicalFormSerializer(serializers.Serializer): + """ + Serializer for the muscles in the canonical form of a day/workout + """ + front = serializers.ListField(child=MuscleSerializer()) + back = serializers.ListField(child=MuscleSerializer()) + frontsecondary = serializers.ListField(child=MuscleSerializer()) + backsecondary = serializers.ListField(child=MuscleSerializer()) + + class WorkoutCanonicalFormExerciseListSerializer(serializers.Serializer): """ Serializer for settings in the canonical form of a workout @@ -139,7 +152,7 @@ class WorkoutCanonicalFormExerciseSerializer(serializers.Serializer): exercise_list = WorkoutCanonicalFormExerciseListSerializer(many=True) has_settings = serializers.BooleanField() is_superset = serializers.BooleanField() - muscles = serializers.ReadOnlyField() + muscles = MusclesCanonicalFormSerializer() class DaysOfWeekCanonicalFormSerializer(serializers.Serializer): @@ -159,7 +172,7 @@ class DayCanonicalFormSerializer(serializers.Serializer): obj = DaySerializer() set_list = WorkoutCanonicalFormExerciseSerializer(many=True) days_of_week = DaysOfWeekCanonicalFormSerializer() - muscles = serializers.ReadOnlyField() + muscles = MusclesCanonicalFormSerializer() class WorkoutCanonicalFormSerializer(serializers.Serializer): @@ -167,5 +180,5 @@ class WorkoutCanonicalFormSerializer(serializers.Serializer): Serializer for the canonical form of a workout """ obj = WorkoutSerializer() - muscles = serializers.ReadOnlyField() day_list = DayCanonicalFormSerializer(many=True) + muscles = MusclesCanonicalFormSerializer() diff --git a/wger/manager/models.py b/wger/manager/models.py index 89173baaa..c3402c915 100644 --- a/wger/manager/models.py +++ b/wger/manager/models.py @@ -456,16 +456,16 @@ class Day(models.Model): # Muscles for this set for muscle in exercise.muscles.all(): - if muscle.is_front and muscle.id not in muscles_front: - muscles_front.append(muscle.id) - elif not muscle.is_front and muscle.id not in muscles_back: - muscles_back.append(muscle.id) + if muscle.is_front and muscle not in muscles_front: + muscles_front.append(muscle) + elif not muscle.is_front and muscle not in muscles_back: + muscles_back.append(muscle) for muscle in exercise.muscles_secondary.all(): - if muscle.is_front and muscle.id not in muscles_front: - muscles_front_secondary.append(muscle.id) + if muscle.is_front and muscle not in muscles_front: + muscles_front_secondary.append(muscle) elif not muscle.is_front and muscle.id not in muscles_back: - muscles_back_secondary.append(muscle.id) + muscles_back_secondary.append(muscle) for setting in Setting.objects.filter(set=set_obj, exercise=exercise).order_by('order', 'id'): diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html index fe75ba13c..620e059c1 100644 --- a/wger/manager/templates/workout/view.html +++ b/wger/manager/templates/workout/view.html @@ -98,16 +98,10 @@ $(document).ready(function () {
-
-
+ {% render_muscles muscles.front muscles.frontsecondary %}
-
-
+ {% render_muscles muscles.back muscles.backsecondary %}
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py index 07132ccee..b94a4905a 100644 --- a/wger/manager/tests/test_workout_canonical.py +++ b/wger/manager/tests/test_workout_canonical.py @@ -25,7 +25,10 @@ from wger.core.models import ( WeightUnit ) from wger.core.tests.base_testcase import WgerTestCase -from wger.exercises.models import Exercise +from wger.exercises.models import ( + Exercise, + Muscle +) from wger.manager.models import ( Day, Set, @@ -51,16 +54,21 @@ class WorkoutCanonicalFormTestCase(WgerTestCase): setting_2 = Setting.objects.get(pk=2) repetition_unit = RepetitionUnit.objects.get(pk=1) weight_unit = WeightUnit.objects.get(pk=1) + muscle1 = Muscle.objects.get(pk=1) + muscle2 = Muscle.objects.get(pk=2) self.assertEqual(workout.canonical_representation['muscles'], - {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': [1]}) + {'back': [muscle2], + 'frontsecondary': [muscle1], + 'backsecondary': [muscle1], + 'front': [muscle1]}) self.assertEqual(workout.canonical_representation['obj'], workout) canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=2)], 'text': u'Tuesday'}, - 'muscles': {'back': [2], + 'muscles': {'back': [muscle2], 'frontsecondary': [], 'backsecondary': [], - 'front': [1]}, + 'front': [muscle1]}, 'obj': Day.objects.get(pk=1), 'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=1), 'comment_list': [u'test 123'], @@ -76,17 +84,19 @@ class WorkoutCanonicalFormTestCase(WgerTestCase): weight_unit]}], 'is_superset': False, 'has_settings': True, - 'muscles': {'back': [2], 'frontsecondary': [], + 'muscles': {'back': [muscle2], + 'frontsecondary': [], 'backsecondary': [], - 'front': [1]}, + 'front': [muscle1]}, 'obj': Set.objects.get(pk=1)}]} self.assertEqual(workout.canonical_representation['day_list'][0], canonical_form) canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=4)], 'text': u'Thursday'}, 'obj': Day.objects.get(pk=2), - 'muscles': {'back': [2], - 'frontsecondary': [1], 'backsecondary': [1], + 'muscles': {'back': [muscle2], + 'frontsecondary': [muscle1], + 'backsecondary': [muscle1], 'front': []}, 'set_list': [{'exercise_list': [{'obj': Exercise.objects.get(pk=2), 'comment_list': [u'Foobar'], @@ -109,8 +119,9 @@ class WorkoutCanonicalFormTestCase(WgerTestCase): weight_unit]}], 'is_superset': False, 'has_settings': True, - 'muscles': {'back': [2], - 'frontsecondary': [1], 'backsecondary': [1], + 'muscles': {'back': [muscle2], + 'frontsecondary': [muscle1], + 'backsecondary': [muscle1], 'front': []}, 'obj': Set.objects.get(pk=2)}]} self.assertEqual(workout.canonical_representation['day_list'][1], canonical_form) @@ -118,8 +129,10 @@ class WorkoutCanonicalFormTestCase(WgerTestCase): canonical_form = {'days_of_week': {'day_list': [DaysOfWeek.objects.get(pk=5)], 'text': u'Friday'}, 'obj': Day.objects.get(pk=4), - 'muscles': {'back': [], 'front': [], - 'frontsecondary': [], 'backsecondary': []}, + 'muscles': {'back': [], + 'front': [], + 'frontsecondary': [], + 'backsecondary': []}, 'set_list': []} self.assertEqual(workout.canonical_representation['day_list'][2], canonical_form) @@ -133,10 +146,15 @@ class WorkoutCanonicalFormTestCase(WgerTestCase): weekday2 = DaysOfWeek.objects.get(pk=5) repetition_unit = RepetitionUnit.objects.get(pk=1) weight_unit = WeightUnit.objects.get(pk=1) + muscle1 = Muscle.objects.get(pk=1) + muscle2 = Muscle.objects.get(pk=2) self.assertEqual(day.canonical_representation['days_of_week'], {'day_list': [weekday1, weekday2], 'text': u'Wednesday, Friday'}) self.assertEqual(day.canonical_representation['muscles'], - {'back': [2], 'frontsecondary': [1], 'backsecondary': [1], 'front': []}) + {'back': [muscle2], + 'frontsecondary': [muscle1], + 'backsecondary': [muscle1], + 'front': []}) self.assertEqual(day.canonical_representation['obj'], day) canonical_form = [{'exercise_list': [{'obj': Exercise.objects.get(pk=2), @@ -157,8 +175,10 @@ class WorkoutCanonicalFormTestCase(WgerTestCase): weight_unit]}], 'is_superset': False, 'has_settings': True, - 'muscles': {'back': [2], 'frontsecondary': [1], - 'backsecondary': [1], 'front': []}, + 'muscles': {'back': [muscle2], + 'frontsecondary': [muscle1], + 'backsecondary': [muscle1], + 'front': []}, 'obj': Set.objects.get(pk=3)}] self.assertEqual(day.canonical_representation['set_list'], canonical_form) diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py index d9371bad0..58a9f0a12 100644 --- a/wger/manager/views/workout.py +++ b/wger/manager/views/workout.py @@ -105,31 +105,8 @@ def view(request, pk): canonical = workout.canonical_representation uid, token = make_token(user) - # Create the backgrounds that show what muscles the workout will work on - muscles_front = [] - muscles_back = [] - for i in canonical['muscles']['front']: - if i not in muscles_front: - muscles_front.append('images/muscles/main/muscle-{0}.svg'.format(i)) - for i in canonical['muscles']['back']: - if i not in muscles_back: - muscles_back.append('images/muscles/main/muscle-{0}.svg'.format(i)) - - for i in canonical['muscles']['frontsecondary']: - if i not in muscles_front and i not in canonical['muscles']['front']: - muscles_front.append('images/muscles/secondary/muscle-{0}.svg'.format(i)) - for i in canonical['muscles']['backsecondary']: - if i not in muscles_back and i not in canonical['muscles']['back']: - muscles_back.append('images/muscles/secondary/muscle-{0}.svg'.format(i)) - - # Append the silhouette of the human body as the last entry so the browser - # renders it in the background - muscles_front.append('images/muscles/muscular_system_front.svg') - muscles_back.append('images/muscles/muscular_system_back.svg') - template_data['workout'] = workout - template_data['muscle_backgrounds_front'] = muscles_front - template_data['muscle_backgrounds_back'] = muscles_back + template_data['muscles'] = canonical['muscles'] template_data['uid'] = uid template_data['token'] = token template_data['is_owner'] = is_owner From 4a550a906805858e1dea3b2561ade203f43cbcf3 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 1 Sep 2020 19:24:28 +0200 Subject: [PATCH 012/105] Replace menus in editoptions divs --- wger/manager/templates/calendar/day.html | 18 +++++++-------- wger/manager/templates/calendar/month.html | 22 +++++++++---------- .../calendar/partial_overview_table.html | 7 +++--- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/wger/manager/templates/calendar/day.html b/wger/manager/templates/calendar/day.html index c51a3a77f..c56bb7273 100644 --- a/wger/manager/templates/calendar/day.html +++ b/wger/manager/templates/calendar/day.html @@ -56,18 +56,18 @@ {{log.weight}} {% trans log.weight_unit.name %} {% if is_owner %} - +
-
- {% trans 'Edit' %} - {% trans 'Delete' %} + + {% trans 'Edit' %} + +
+ + {% trans 'Delete' %} +
diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.html index cc4a8cff0..d653c419e 100644 --- a/wger/manager/templates/calendar/month.html +++ b/wger/manager/templates/calendar/month.html @@ -65,7 +65,7 @@ $(document).ready(function() { {{ exercise }}
-
+
diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.py index c622147d1..ec087f8a5 100644 --- a/wger/weight/tests/test_entry.py +++ b/wger/weight/tests/test_entry.py @@ -24,7 +24,8 @@ from wger.core.tests import api_base_test from wger.core.tests.base_testcase import ( WgerAddTestCase, WgerEditTestCase, - WgerTestCase + WgerTestCase, + WgerDeleteTestCase ) from wger.utils.constants import TWOPLACES from wger.weight.models import WeightEntry @@ -112,6 +113,18 @@ class EditWeightEntryTestCase(WgerEditTestCase): user_fail = 'admin' +class DeleteWeightEntryTestCase(WgerDeleteTestCase): + """ + Tests deleting a weight entry + """ + + object_class = WeightEntry + url = 'weight:delete' + pk = 1 + user_success = 'test' + user_fail = 'admin' + + class WeightEntryTestCase(api_base_test.ApiBaseResourceTestCase): """ Tests the weight entry overview resource diff --git a/wger/weight/urls.py b/wger/weight/urls.py index a6a288b92..2e9b99075 100644 --- a/wger/weight/urls.py +++ b/wger/weight/urls.py @@ -33,6 +33,10 @@ urlpatterns = [ login_required(views.WeightUpdateView.as_view()), name='edit'), + url(r'^(?P\d+)/delete/$', + views.WeightDeleteView.as_view(), + name='delete'), + url(r'^export-csv/$', views.export_csv, name='export-csv'), diff --git a/wger/weight/views.py b/wger/weight/views.py index c34ff56dd..39eb90a9e 100644 --- a/wger/weight/views.py +++ b/wger/weight/views.py @@ -38,7 +38,8 @@ from django.utils.translation import ( ) from django.views.generic import ( CreateView, - UpdateView + UpdateView, + DeleteView ) # Third Party @@ -47,7 +48,10 @@ from rest_framework.decorators import api_view from rest_framework.response import Response # wger -from wger.utils.generic_views import WgerFormMixin +from wger.utils.generic_views import ( + WgerFormMixin, + WgerDeleteMixin +) from wger.utils.helpers import check_access from wger.weight import helpers from wger.weight.forms import WeightForm @@ -109,6 +113,28 @@ class WeightUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView): return reverse('weight:overview', kwargs={'username': self.object.user.username}) +class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView): + """ + Generic view to delete a weight entry + """ + + model = WeightEntry + fields = ('weight',) + + messages = ugettext_lazy('Successfully deleted.') + + def get_context_data(self, **kwargs): + context = super(WeightDeleteView, self).get_context_data(**kwargs) + context['title'] = _('Delete weight entry for the %s') % self.object.date + return context + + def get_success_url(self): + """ + Return to overview with username + """ + return reverse('weight:overview', kwargs={'username': self.object.user.username}) + + @login_required def export_csv(request): """ From 2912fca63e4d8cb747a2464e2a013586cb4bfd08 Mon Sep 17 00:00:00 2001 From: beingbiplov Date: Fri, 16 Oct 2020 14:40:44 +0545 Subject: [PATCH 102/105] remove whitespace --- wger/weight/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wger/weight/views.py b/wger/weight/views.py index 39eb90a9e..94d095ef6 100644 --- a/wger/weight/views.py +++ b/wger/weight/views.py @@ -120,7 +120,7 @@ class WeightDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView): model = WeightEntry fields = ('weight',) - + messages = ugettext_lazy('Successfully deleted.') def get_context_data(self, **kwargs): From 5c04646d5954fc7bc3a0c72ba8e7ec7bcdc1ba65 Mon Sep 17 00:00:00 2001 From: beingbiplov Date: Fri, 16 Oct 2020 14:43:49 +0545 Subject: [PATCH 103/105] add to AUTHORS.rst --- AUTHORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS.rst b/AUTHORS.rst index a7fc3f50e..1146adc9e 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -29,6 +29,7 @@ Developers * Kevin Antonio Rateni Iatauro: https://github.com/WalkingPizza * Sven - https://github.com/Svn-Sp * Christopher OConnell - https://github.com/oconnelc +* Biplov - https://github.com/beingbiplov Translators ----------- From 9f2cd270a7885eae6716a8126c726f2537c88aee Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 17 Oct 2020 14:33:03 +0200 Subject: [PATCH 104/105] Update changelog --- docs/changelog.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 8b46aa49c..fc70625f2 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -21,6 +21,7 @@ Upgrade steps from 1.9: `#506`_ (thanks `@oconnelc`_) * Improved user experience, on desktop and mobile `#337`_ * Show BMI on weight graph `#462`_ (thanks `@Svn-Sp`_) +* Allow user to edit and delete body weight entries `#478`_ (thanks `@beingbiplov`_) 🐛 Bug Fixes: @@ -40,12 +41,14 @@ Upgrade steps from 1.9: .. _@louiCoder: https://github.com/louiCoder .. _@WalkingPizza: https://github.com/WalkingPizza .. _@oconnelc: https://github.com/oconnelc +.. _@beingbiplov: https://github.com/beingbiplov .. _#246: https://github.com/wger-project/wger/issues/246 .. _#284: https://github.com/wger-project/wger/issues/284 .. _#337: https://github.com/wger-project/wger/issues/337 .. _#340: https://github.com/wger-project/wger/issues/340 .. _#462: https://github.com/wger-project/wger/issues/462 +.. _#478: https://github.com/wger-project/wger/issues/478 .. _#494: https://github.com/wger-project/wger/issues/494 .. _#499: https://github.com/wger-project/wger/issues/499 .. _#501: https://github.com/wger-project/wger/issues/501 From aefad2bc5bb44d1693ff9c76c3db0b2555ddb6ba Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sat, 17 Oct 2020 14:33:31 +0200 Subject: [PATCH 105/105] Remove icon from dropdown, has too much weight --- wger/weight/templates/overview.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/wger/weight/templates/overview.html b/wger/weight/templates/overview.html index 56202f8c9..b18781338 100644 --- a/wger/weight/templates/overview.html +++ b/wger/weight/templates/overview.html @@ -75,11 +75,9 @@
- -
+
{% trans "Edit weight" %}