Self hosted FLOSS fitness/workout, nutrition and weight tracker
Simplify rendering of exercise overviews
Roland Geider707d309b0d09
diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 663d862cc..1f8707467 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -264,6 +264,8 @@ class Exercise(models.Model):for language in Language.objects.all():delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)+ delete_template_fragment_cache('exercise-overview-mobile', language.id)+ delete_template_fragment_cache('exercise-overview-search', language.id)delete_template_fragment_cache('exercise-detail-header', self.id, language.id)delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)@@ -284,6 +286,8 @@ class Exercise(models.Model):for language in Language.objects.all():delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)+ delete_template_fragment_cache('exercise-overview-mobile', language.id)+ delete_template_fragment_cache('exercise-overview-search', language.id)delete_template_fragment_cache('exercise-detail-header', self.id, language.id)delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)@@ -426,6 +430,8 @@ class ExerciseImage(models.Model):for language in Language.objects.all():delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)+ delete_template_fragment_cache('exercise-overview-mobile', language.id)+ delete_template_fragment_cache('exercise-overview-search', language.id)delete_template_fragment_cache('exercise-detail-header',self.exercise.id,language.id)@@ -445,6 +451,8 @@ class ExerciseImage(models.Model):for language in Language.objects.all():delete_template_fragment_cache('muscle-overview', language.id)delete_template_fragment_cache('exercise-overview', language.id)+ delete_template_fragment_cache('exercise-overview-mobile', language.id)+ delete_template_fragment_cache('exercise-overview-search', language.id)delete_template_fragment_cache('exercise-detail-header', self.exercise.id, language.id)delete_template_fragment_cache('exercise-detail-muscles', self.exercise.id, language.id)diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.htmlindex ed75a9b46..f28e491d4 100644--- a/wger/exercises/templates/exercise/overview.html+++ b/wger/exercises/templates/exercise/overview.html@@ -58,21 +58,25 @@ $(document).ready(function() {Main Content-->{% block content %}+{% cache cache_timeout exercise-overview language.id %}+{% regroup exercises by category as exercise_list %}<div id="tabs"><ul>- {% for category in categories %}- <li id="cat-{{ category.id }}"><a href="#cat{{ category.id }}">{% trans category.name %}</a></li>+ {% for item in exercise_list %}+ <li id="cat-{{ item.grouper.id }}">+ <a href="#cat{{ item.grouper.id }}">{% trans item.grouper.name %}</a>+ </li>{% empty %}<li>{% trans "No categories." %} {% trans "Use link to create one" %}</li>{% endfor %}</ul>- {% for category in categories %}- <div id="cat{{ category.id }}">+ {% for item in exercise_list %}+ <div id="cat{{ item.grouper.id }}"><table class="narrow"><tbody>- {% for exercise in category|get_active_exercises:active_languages %}+ {% for exercise in item.list %}<tr><td style="padding-left:0px;">{% if exercise.main_image %}@@ -95,13 +99,15 @@ $(document).ready(function() {</p></td></tr>- {% endfor %}+ {% endfor %}</tbody></table></div>{% endfor %}</div>{% endcache %}++{% endblock %}@@ -135,10 +141,10 @@ $(document).ready(function() {{% if perms.exercises %}<h3>{% trans "Options" %}</h3>- {% if categories %}+ {% if exercises %}+ {% with exercise=exercises|first %}<p>- {% with category=categories|first %}- <a href="{% url 'exercisecategory-edit' category.id %}"+ <a href="{% url 'exercisecategory-edit' exercise.category.id %}"class="modal-dialog"id="current-category-edit"><img src="{% static 'images/icons/edit.svg' %}"@@ -147,13 +153,12 @@ $(document).ready(function() {alt="{% trans 'Edit category' %}"title="{% trans 'Edit category' %}">{% trans "Edit category" %}:- <span class="current-category-name">{{category.name}}</span>+ <span class="current-category-name">{% trans exercise.category.name %}</span></a></p>- {% endwith %}+<p>- {% with category=categories|first %}- <a href="{% url 'exercisecategory-delete' category.id %}"+ <a href="{% url 'exercisecategory-delete' exercise.category.id %}"class="modal-dialog"id="current-category-delete"><img src="{% static 'images/icons/trash.svg' %}"@@ -162,10 +167,10 @@ $(document).ready(function() {alt="{% trans 'Delete category' %}"title="{% trans 'Delete category' %}">{% trans "Delete category" %}:- <span class="current-category-name">{{category.name}}</span>+ <span class="current-category-name">{% trans exercise.category.name %}</span></a>- {% endwith %}</p>+ {% endwith %}{% endif %}<p>diff --git a/wger/exercises/templates/mobile/exercise/overview.html b/wger/exercises/templates/mobile/exercise/overview.htmlindex 56bb2dc69..a9c3de1f1 100644--- a/wger/exercises/templates/mobile/exercise/overview.html+++ b/wger/exercises/templates/mobile/exercise/overview.html@@ -3,6 +3,7 @@{% load staticfiles %}{% load wger_extras %}{% load thumbnail %}+{% load cache %}<!--Title@@ -14,14 +15,15 @@Main Content-->{% block content %}-+{% cache cache_timeout exercise-overview-mobile language.id %}+{% regroup exercises by category as exercise_list %}<div data-role="collapsible-set" data-theme="c" data-content-theme="c">-{% for category in categories %}+ {% for item in exercise_list %}<div data-role="collapsible">- <h3>{% trans category.name %}</h3>+ <h3>{% trans item.grouper.name %}</h3><ul data-role="listview">- {% for exercise in category|get_active_exercises:active_languages %}+ {% for exercise in item.list %}<li><a href="{{ exercise.get_absolute_url }}" data-ajax="false">{% if exercise.main_image.image %}@@ -29,11 +31,12 @@{% endif %}{{ exercise.name }}</a></li>- {% endfor %}+ {% endfor %}</ul></div>-{% endfor %}+ {% endfor %}</div>+{% endcache %}{% endblock %}@@ -44,6 +47,8 @@<h3>{% trans "Search" %}</h3><br>+{% cache cache_timeout exercise-overview-search language.id %}+{% regroup exercises by category as exercise_list %}<ul data-role="listview"data-theme="c"data-filter="true"@@ -51,8 +56,8 @@data-inset="true"data-filter-placeholder="{% trans 'exercise name' %}"id="exercise_search_form">- {% for category in categories %}- {% for exercise in category|get_active_exercises:active_languages %}+ {% for item in exercise_list %}+ {% for exercise in item.list %}<li><a href="{{ exercise.get_absolute_url }}" data-ajax="false">{% if exercise.main_image.image %}@@ -63,6 +68,7 @@{% endfor %}{% endfor %}</ul>+{% endcache %}<h3>{% trans "Add new exercise" %}</h3>@@ -87,53 +93,4 @@</span>{% endif %}</p>---{% if perms.exercises %}- <h3>{% trans "Options" %}</h3>- {% if categories %}- <p>- {% with category=categories|first %}- <a href="{% url 'exercisecategory-edit' category.id %}"- data-role="button"- id="current-category-edit">- <img src="{% static 'images/icons/edit.svg' %}"- width="32"- height="32"- alt="{% trans 'Edit category' %}"- title="{% trans 'Edit category' %}">- {% trans "Edit category" %}:- <span class="current-category-name">{{category.name}}</span>- </a>- </p>- {% endwith %}- <p>- {% with category=categories|first %}- <a href="{% url 'exercisecategory-delete' category.id %}"- data-role="button"- id="current-category-delete">- <img src="{% static 'images/icons/trash.svg' %}"- width="32"- height="32"- alt="{% trans 'Delete category' %}"- title="{% trans 'Delete category' %}">- {% trans "Delete category" %}:- <span class="current-category-name">{{category.name}}</span>- </a>- {% endwith %}- </p>- {% endif %}-- <p>- <a href="{% url 'exercisecategory-add' %}"- data-role="button">- <img src="{% static 'images/icons/folder-new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add category' %}"- title="{% trans 'Add category' %}">- {% trans "Add category" %}- </a>- </p>-{% endif %}{% endblock %}diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.pyindex 00dbc136b..59ce82e64 100644--- a/wger/exercises/tests/test_exercise.py+++ b/wger/exercises/tests/test_exercise.py@@ -46,13 +46,13 @@ class ExerciseIndexTestCase(WorkoutManagerTestCase):self.assertEqual(response.context['active_tab'], 'exercises')# Correct categories are shown- category_1 = response.context['categories'][0]+ category_1 = response.context['exercises'][0].categoryself.assertEqual(category_1.id, 2)self.assertEqual(category_1.name, "Another category")- category_2 = response.context['categories'][1]- self.assertEqual(category_2.id, 1)- self.assertEqual(category_2.name, "Category")+ category_2 = response.context['exercises'][1].category+ self.assertEqual(category_2.id, 3)+ self.assertEqual(category_2.name, "Yet another category")# Correct exercises in the categoriesexercises_1 = category_1.exercise_set.all()@@ -413,6 +413,12 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):Test that the template cache for the overview is correctly reseted whenperforming certain operations'''+ self.assertFalse(cache.get(cache_mapper.get_exercise_key(2)))+ self.assertFalse(cache.get(cache_mapper.get_exercise_muscle_bg_key(2)))+ self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))+ self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))self.client.get(reverse('exercise-overview'))self.client.get(reverse('exercise-view', kwargs={'id': 2}))diff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex 8f58fd892..98d881400 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -12,7 +12,7 @@ urlpatterns = patterns('wger.exercises.views',# Exercisesurl(r'^overview/$',- exercises.overview,+ exercises.ExerciseListView.as_view(),name='exercise-overview'),url(r'^search/$',diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex b35ada181..748ee74b7 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -63,24 +63,24 @@ from wger.weight.helpers import process_log_entrieslogger = logging.getLogger('wger.custom')-def overview(request):+class ExerciseListView(WgerPermissionMixin, ListView):'''- Overview with all exercises+ Generic view to list all exercises'''- languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)-- template_data = {}- template_data.update(csrf(request))- #logger.debug(languages)- categories = ExerciseCategory.objects.all()-- template_data['categories'] = categories- template_data['active_languages'] = languages+ model = Exercise+ template_name = 'exercise/overview.html'+ context_object_name = 'exercises'- return render_to_response('exercise/overview.html',- template_data,- context_instance=RequestContext(request))+ def get_queryset(self):+ '''+ Filter to only active exercises in the configured languages+ '''+ languages = load_item_languages(LanguageConfig.SHOW_ITEM_EXERCISES)+ return Exercise.objects.filter(status__in=Exercise.EXERCISE_STATUS_OK) \+ .filter(language__in=languages) \+ .order_by('category__id') \+ .select_related()def view(request, id, slug=None):diff --git a/wger/manager/templatetags/wger_extras.py b/wger/manager/templatetags/wger_extras.pyindex 8507c2c9b..bcee280a8 100644--- a/wger/manager/templatetags/wger_extras.py+++ b/wger/manager/templatetags/wger_extras.py@@ -35,15 +35,6 @@ def get_current_settings(exercise, set_id):return exercise.setting_set.filter(set_id=set_id)[email protected](name='get_active_exercises')-def get_active_exercises(category, languages):- '''- Filter out pending exercises and not in the given languages- '''- return category.exercise_set.filter(status__in=Exercise.EXERCISE_STATUS_OK,- language__in=languages)--@register.inclusion_tag('tags/render_day.html')def render_day(day):'''diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.pyindex de8e24a07..d5d6897dd 100644--- a/wger/manager/tests/testcase.py+++ b/wger/manager/tests/testcase.py@@ -67,6 +67,7 @@ class BaseTestCase(object):'test-workout-data','test-schedules')current_user = 'anonymous'+ is_mobile = Falsedef setUp(self):'''@@ -79,6 +80,7 @@ class BaseTestCase(object):# Test the mobile templatesif os.environ.get('TEST_MOBILE') == 'True':django_mobile.set_flavour('mobile')+ self.is_mobile = True# Set logging levellogging.disable(logging.INFO)