Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add muscle overview list

Roland Geiderff205acdc30c
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index df599e1c2..3cece8c55 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -66,6 +66,7 @@
<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>
+ <li><a href="{% url 'exercise:category:list' %}">{% trans "Categories" %}</a></li>
{% endif %}
</ul>
</li>
diff --git a/wger/exercises/templates/categories/admin-overview.html b/wger/exercises/templates/categories/admin-overview.html
new file mode 100644
index 000000000..a70d03584
--- /dev/null
+++ b/wger/exercises/templates/categories/admin-overview.html
@@ -0,0 +1,45 @@
+{% extends "base.html" %}
+{% load i18n staticfiles wger_extras %}
+
+{% block title %}{% trans "Categories" %}{% endblock %}
+
+
+{% block content %}
+<ul class="list-group">
+ {% for category in exercisecategory_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:category:edit' category.id %}" class="wger-modal-dialog">{% trans 'Edit' %}</a>
+ </li>
+ <li>
+ <a href="{% url 'exercise:category:delete' category.id %}" class="wger-modal-dialog">{% trans 'Delete' %}</a>
+ </li>
+ </ul>
+ </div>
+ {{ category }}
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ {% trans "Nothing found" %}
+ </li>
+ {% endfor %}
+</ul>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+{% if perms.exercises.add_exercisecategory %}
+<p>
+ <a href="{% url 'exercise:category:add' %}" class="btn btn-success btn-sm wger-modal-dialog">
+ {% trans "Add" %}
+ </a>
+</p>
+{% endif %}
+{% endblock %}
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index c910b7810..2788f4995 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -16,14 +16,6 @@
<script>
$(document).ready(function() {
- $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
- var category_id = $(e.target).attr('id').match(/\d+/);
- $(".current-category-name").html($("#category-" + category_id).text());
- $("#current-category-edit").attr("href", "/exercise/category/" + category_id + "/edit/");
- $("#current-category-delete").attr("href", "/exercise/category/" + category_id + "/delete/");
- })
-
-
// Prevent the form from being submited if JavaScript is enabled
$("#exercise_search_form").submit(function() {return false;});
@@ -131,65 +123,17 @@ $(document).ready(function() {
{% endif %}
</p>
-
-{% if perms.exercises %}
- <h4>{% trans "Options" %}</h4>
- {% if exercises %}
- {% with exercise=exercises|first %}
- <p>
- <a href="{% url 'exercise:category:edit' exercise.category.id %}"
- {% auto_link_css flavour "wger-modal-dialog" %}
- 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">{% trans exercise.category.name %}</span>
- </a>
- </p>
-
- <p>
- <a href="{% url 'exercise:category:delete' exercise.category.id %}"
- {% auto_link_css flavour "wger-modal-dialog" %}
- 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">{% trans exercise.category.name %}</span>
- </a>
- </p>
- {% endwith %}
- {% endif %}
-
- <p>
- <a href="{% url 'exercise:category:add' %}"
- {% auto_link_css flavour "wger-modal-dialog" %}>
- <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 %}
-
- <h4>{% trans "Search" %}</h4>
-
- <form action="{% url 'exercise-search' %}"
- method="get"
- id="exercise_search_form">
- {% csrf_token %}
- <input name="term"
- type="search"
- id="exercise-search"
- class="ajax-form-element form-control"
- placeholder="{% trans 'exercise name' %}"
- >
- </form>
+<h4>{% trans "Search" %}</h4>
+
+<form action="{% url 'exercise-search' %}"
+ method="get"
+ id="exercise_search_form">
+ {% csrf_token %}
+ <input name="term"
+ type="search"
+ id="exercise-search"
+ class="ajax-form-element form-control"
+ placeholder="{% trans 'exercise name' %}"
+ >
+</form>
{% endblock %}
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index dcb26ee15..3d84cd8b4 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -24,7 +24,7 @@ from wger.manager.tests.testcase import (
WorkoutManagerTestCase,
WorkoutManagerEditTestCase,
WorkoutManagerAddTestCase,
-)
+ WorkoutManagerAccessTestCase)
class ExerciseCategoryRepresentationTestCase(WorkoutManagerTestCase):
@@ -39,6 +39,26 @@ class ExerciseCategoryRepresentationTestCase(WorkoutManagerTestCase):
self.assertEqual("{0}".format(ExerciseCategory.objects.get(pk=1)), 'Category')
+class CategoryOverviewTestCase(WorkoutManagerAccessTestCase):
+ '''
+ Test that only admins see the edit links
+ '''
+ url = 'exercise:category:list'
+ anonymous_fail = True
+ user_success = 'admin'
+ user_fail = ('manager1',
+ 'manager2'
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5')
+
+
class DeleteExerciseCategoryTestCase(WorkoutManagerDeleteTestCase):
'''
Exercise category delete test case
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index 3da23d196..ca4b04c8c 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -82,6 +82,9 @@ patterns_comment = [
# sub patterns for categories
patterns_category = [
+ url(r'^list$',
+ categories.ExerciseCategoryListView.as_view(),
+ name='list'),
url(r'^(?P<pk>\d+)/edit/$',
categories.ExerciseCategoryUpdateView.as_view(),
name='edit'),
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 8b67bd82f..44f81af5c 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -22,8 +22,8 @@ from django.utils.translation import ugettext_lazy
from django.views.generic import (
DeleteView,
CreateView,
- UpdateView
-)
+ UpdateView,
+ ListView)
from wger.exercises.models import ExerciseCategory
@@ -38,9 +38,14 @@ from wger.utils.language import load_language
logger = logging.getLogger(__name__)
-# ************************
-# Exercise categories
-# ************************
+class ExerciseCategoryListView(WgerPermissionMixin, ListView):
+ '''
+ Overview of all categories, for administration purposes
+ '''
+ model = ExerciseCategory
+ login_required = True
+ permission_required = 'exercises.change_exercisecategory'
+ template_name = 'categories/admin-overview.html'
class ExerciseCategoryAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
@@ -50,7 +55,7 @@ class ExerciseCategoryAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
model = ExerciseCategory
fields = '__all__'
- success_url = reverse_lazy('exercise:exercise:overview')
+ success_url = reverse_lazy('exercise:category:list')
title = ugettext_lazy('Add category')
form_action = reverse_lazy('exercise:category:add')
permission_required = 'exercises.add_exercisecategory'
@@ -67,7 +72,7 @@ class ExerciseCategoryUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin)
model = ExerciseCategory
fields = '__all__'
- success_url = reverse_lazy('exercise:exercise:overview')
+ success_url = reverse_lazy('exercise:category:list')
permission_required = 'exercises.change_exercisecategory'
# Send some additional data to the template
@@ -90,7 +95,7 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixi
'''
model = ExerciseCategory
- success_url = reverse_lazy('exercise:exercise:overview')
+ success_url = reverse_lazy('exercise:category:list')
delete_message = ugettext_lazy('This will also delete all exercises in this category.')
messages = ugettext_lazy('Successfully deleted')
permission_required = 'exercises.delete_exercisecategory'