Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add muscle overview list

Roland Geider9ccfa6b680e9
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 0b373047e..df599e1c2 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -65,6 +65,7 @@
<li class="dropdown-header">{% trans "Administration" %}</li>
<li><a href="{% url 'exercise:exercise:pending' %}">{% trans "Exercises pending review" %}</a></li>
<li><a href="{% url 'exercise:equipment:list' %}">{% trans "Equipment" %}</a></li>
+ <li><a href="{% url 'exercise:muscle:admin-list' %}">{% trans "Muscles" %}</a></li>
{% endif %}
</ul>
</li>
diff --git a/wger/exercises/static/js/exercises.js b/wger/exercises/static/js/exercises.js
index 334b5fc93..a2eb5970d 100644
--- a/wger/exercises/static/js/exercises.js
+++ b/wger/exercises/static/js/exercises.js
@@ -26,7 +26,7 @@
/*
* Highlight a muscle in the overview
*/
-function highlight_muscle(element, perms_exercises) {
+function highlight_muscle(element) {
var div_id = $(element).data('target');
var is_front = ($(element).data('isFront') == 'True') ? 'front' : 'back';
var muscle_id = div_id.match(/\d+/);
@@ -40,13 +40,6 @@ function highlight_muscle(element, perms_exercises) {
$(element).removeClass('muscle-inactive');
$(element).addClass('muscle-active');
- if (perms_exercises) {
- $('#muscle-edit-box').show();
- $('.muscle-edit-name').html(muscle_name);
- $('#muscle-edit-edit-link').attr("href", "/exercise/muscle/" + muscle_id + "/edit/");
- $('#muscle-delete-edit-link').attr("href", "/exercise/muscle/" + muscle_id + "/delete/");
- }
-
// Set the corresponding background
$('#muscle-system').css('background-image',
'url(/static/images/muscles/main/muscle-' + muscle_id + '.svg),'
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index 81fd2b671..c910b7810 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -106,8 +106,6 @@ $(document).ready(function() {
</div>
{% endfor %}
</div>
-
-
{% endcache %}
diff --git a/wger/exercises/templates/muscles/admin-overview.html b/wger/exercises/templates/muscles/admin-overview.html
new file mode 100644
index 000000000..86aaa3efe
--- /dev/null
+++ b/wger/exercises/templates/muscles/admin-overview.html
@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+{% load i18n staticfiles wger_extras %}
+
+{% block title %}{% trans "Muscle overview" %}{% endblock %}
+
+
+{% block content %}
+<ul class="list-group">
+ {% for muscle in muscle_list %}
+ <li class="list-group-item ">
+ <div class="btn-group pull-right">
+ <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
+ <span class="glyphicon glyphicon-cog"></span>
+ </button>
+ <ul class="dropdown-menu" role="menu">
+ <li>
+ <a href="{% url 'exercise:muscle:edit' muscle.id %}" class="wger-modal-dialog">{% trans 'Edit' %}</a>
+ </li>
+ <li>
+ <a href="{% url 'exercise:muscle:delete' muscle.id %}" class="wger-modal-dialog">{% trans 'Delete' %}</a>
+ </li>
+ </ul>
+ </div>
+ {{ muscle }}
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ {% trans "Nothing found" %}
+ </li>
+ {% endfor %}
+</ul>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+{% if perms.exercises.add_equipment %}
+<p>
+ <a href="{% url 'exercise:muscle:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
+ {% trans "Add muscle" %}
+ </a>
+</p>
+
+<p>{% blocktrans %}<strong>Important:</strong> After adding a muscle, you need
+to create a new SVG image with the contours of the muscle and place it in the
+folder <em>images/muscles</em>.{% endblocktrans %}</p>
+{% endif %}
+{% endblock %}
diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.html
index 5c923db0b..41c0ff75e 100644
--- a/wger/exercises/templates/muscles/overview.html
+++ b/wger/exercises/templates/muscles/overview.html
@@ -25,7 +25,7 @@ $(document).ready(function() {
// Highlight on hover
$('.muscle').hover(function(e) {
e.preventDefault();
- highlight_muscle(this, {% if perms.exercises %}true{% else %}false{% endif %});
+ highlight_muscle(this);
});
// Highlight on click
@@ -95,45 +95,6 @@ $(document).ready(function() {
</div>
</div>
{% endcache %}
-
-{% if perms.exercises %}
-
-<p>
- <a href="{% url 'exercise:muscle:add' %}" class="btn btn-success btn-sm">
- {% trans "Add muscle" %}
- </a>
-</p>
-
-<p>{% blocktrans %}<strong>Important:</strong> After adding a muscle, you need
-to create a new SVG image with the contours of the muscle and place it in the
-folder <em>images/muscles</em>.{% endblocktrans %}</p>
-
-
-<h4>{% trans "Options" %}</h4>
-<div id="muscle-edit-box" style="display:none;">
-<p>
- <a href="{% url 'exercise:muscle:edit' 1 %}"
- {% auto_link_css flavour "wger-modal-dialog" %}
- id="muscle-edit-edit-link">
- <img src="{% static 'images/icons/edit.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Edit muscle' %}"
- title="{% trans 'Edit muscle' %}">{% trans 'Edit muscle' %}: <span class="muscle-edit-name"></span></a>
-</p>
-<p>
- <a href="{% url 'exercise:muscle:delete' 1 %}"
- {% auto_link_css flavour "wger-modal-dialog" %}
- id="muscle-edit-delete-link">
- <img src="{% static 'images/icons/trash.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Delete muscle' %}"
- title="{% trans 'Delete muscle' %}">{% trans 'Delete muscle' %}: <span class="muscle-edit-name"></span></a>
-</p>
-</div>
-{% endif %}
-
{% endblock %}
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index 38656f607..7bec0e3bf 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -24,7 +24,7 @@ from wger.manager.tests.testcase import (
WorkoutManagerDeleteTestCase,
WorkoutManagerEditTestCase,
WorkoutManagerAddTestCase,
-)
+ WorkoutManagerAccessTestCase)
from wger.utils.cache import get_template_cache_name
@@ -40,6 +40,26 @@ class MuscleRepresentationTestCase(WorkoutManagerTestCase):
self.assertEqual("{0}".format(Muscle.objects.get(pk=1)), 'Anterior testoid')
+class MuscleAdminOverviewTest(WorkoutManagerAccessTestCase):
+ '''
+ Tests the admin muscle overview page
+ '''
+ url = 'exercise:muscle:admin-list'
+ anonymous_fail = True
+ user_success = 'admin'
+ user_fail = ('manager1',
+ 'manager2'
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5')
+
+
class MusclesShareButtonTestCase(WorkoutManagerTestCase):
'''
Test that the share button is correctly displayed and hidden
@@ -109,29 +129,13 @@ class MuscleCacheTestCase(WorkoutManagerTestCase):
self.assertTrue(cache.get(get_template_cache_name('muscle-overview', 2)))
-class MuscleOverviewTestCase(WorkoutManagerTestCase):
+class MuscleOverviewTestCase(WorkoutManagerAccessTestCase):
'''
Test that only admins see the edit links
'''
-
- def test_overview(self):
- '''
- Test that only admins see the edit links
- '''
-
- self.user_login('admin')
- response = self.client.get(reverse('exercise:muscle:overview'))
- self.assertContains(response, 'Edit muscle')
- self.assertContains(response, 'Delete muscle')
- self.assertContains(response, 'Add muscle')
- self.assertContains(response, 'After adding a muscle')
-
- self.user_logout()
- response = self.client.get(reverse('exercise:muscle:overview'))
- self.assertNotContains(response, 'Edit muscle')
- self.assertNotContains(response, 'Delete muscle')
- self.assertNotContains(response, 'Add muscle')
- self.assertNotContains(response, 'After adding a muscle')
+ url = 'exercise:muscle:overview'
+ anonymous_fail = False
+ user_fail = []
class MuscleApiTestCase(api_base_test.ApiBaseResourceTestCase):
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index 3a3c12521..3da23d196 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -34,6 +34,9 @@ patterns_muscle = [
url(r'^overview/$',
muscles.MuscleListView.as_view(),
name='overview'),
+ url(r'^admin-overview/$',
+ muscles.MuscleAdminListView.as_view(),
+ name='admin-list'),
url(r'^add/$',
muscles.MuscleAddView.as_view(),
name='add'),
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 3a377a530..41df62304 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -57,6 +57,16 @@ class MuscleListView(ListView):
return context
+class MuscleAdminListView(WgerPermissionMixin, MuscleListView):
+ '''
+ Overview of all muscles, for administration purposes
+ '''
+ permission_required = 'exercises.change_muscle'
+ login_required = True
+ queryset = Muscle.objects.order_by('name')
+ template_name = 'muscles/admin-overview.html'
+
+
class MuscleAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
Generic view to add a new muscle
@@ -64,7 +74,7 @@ class MuscleAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
model = Muscle
fields = '__all__'
- success_url = reverse_lazy('exercise:muscle:overview')
+ success_url = reverse_lazy('exercise:muscle:admin-list')
title = ugettext_lazy('Add muscle')
form_action = reverse_lazy('exercise:muscle:add')
permission_required = 'exercises.add_muscle'
@@ -77,7 +87,7 @@ class MuscleUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
model = Muscle
fields = '__all__'
- success_url = reverse_lazy('exercise:muscle:overview')
+ success_url = reverse_lazy('exercise:muscle:admin-list')
permission_required = 'exercises.change_muscle'
def get_context_data(self, **kwargs):