Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add overview page for contract types

Roland Geiderfa544f37c51f
diff --git a/wger/gym/templates/contract_type/list.html b/wger/gym/templates/contract_type/list.html
new file mode 100644
index 000000000..db52636c9
--- /dev/null
+++ b/wger/gym/templates/contract_type/list.html
@@ -0,0 +1,67 @@
+{% extends "base.html" %}
+{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}
+
+{% block title %}{% trans "Contract types" %}{% endblock %}
+
+
+{% block breadcrumbs %}
+ {{ block.super }}
+
+ {% if perms.gym.manage_gyms %}
+ {% breadcrumb "Gyms" "gym:gym:list" %}
+ {% endif %}
+ {% breadcrumb_raw gym "gym:gym:user-list" gym.pk %}
+ {% breadcrumb "Contract types" "gym:contract_type:list" gym.pk %}
+{% endblock %}
+
+
+{% block content %}
+
+<ul class="list-group">
+ {% for contract_type in contracttype_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">
+ {% if perms.gym.change_contracttype %}
+ <li>
+ <a href="{% url 'gym:contract_type:edit' contract_type.pk %}">
+ {% trans 'Edit' %}
+ </a>
+ </li>
+ {% endif %}
+
+ {% if perms.gym.delete_contracttype %}
+ <li>
+ <a href="{% url 'gym:contract_type:delete' contract_type.pk %}" class="wger-modal-dialog">
+ {% trans 'Delete' %}
+ </a>
+ </li>
+ {% endif %}
+
+ </ul>
+ </div>
+
+
+ <h4 class="list-group-item-heading">
+ {{ contract_type.name }}
+ </h4>
+
+ <p class="list-group-item-text" style="white-space: pre-line;">{{ contract_type.description }}</p>
+ </li>
+ {% empty %}
+ <li class="list-group-item">
+ {% trans "Nothing found" %}
+ </li>
+ {% endfor %}
+</ul>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+ <a href="{% url 'gym:contract_type:add' gym.id %}" class="wger-modal-dialog btn btn-success">{% trans "Add" %}</a>
+{% endblock %}
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 2166c2ca5..43093687c 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -259,7 +259,10 @@ $(document).ready( function () {
</button>
<ul class="dropdown-menu" role="menu">
<li>
- <a href="{% url 'gym:contract_type:add' gym.id %}" class="wger-modal-dialog">{% trans "Add"%}</a>
+ <a href="{% url 'gym:contract_type:list' gym.id %}">{% trans "Overview" %}</a>
+ </li>
+ <li>
+ <a href="{% url 'gym:contract_type:add' gym.id %}" class="wger-modal-dialog">{% trans "Add" %}</a>
</li>
</ul>
</div>
@@ -274,21 +277,6 @@ $(document).ready( function () {
<td>
{{ contract_type.description|truncatewords:15 }}
</td>
- <td>
- <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 'gym:contract_type:edit' contract_type.id %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
- </li>
- <li>
- <a href="{% url 'gym:contract_type:delete' contract_type.id %}" class="wger-modal-dialog">{% trans "Delete"%}</a>
- </li>
- </ul>
- </div>
- </td>
</tr>
{% empty %}
<tr>
diff --git a/wger/gym/tests/test_contract_types.py b/wger/gym/tests/test_contract_types.py
index 0983f6d49..81239f510 100644
--- a/wger/gym/tests/test_contract_types.py
+++ b/wger/gym/tests/test_contract_types.py
@@ -19,7 +19,9 @@ from wger.gym.models import ContractType
from wger.manager.tests.testcase import (
WorkoutManagerEditTestCase,
WorkoutManagerAddTestCase,
- WorkoutManagerDeleteTestCase)
+ WorkoutManagerDeleteTestCase,
+ WorkoutManagerAccessTestCase,
+ delete_testcase_add_methods)
class AddContractTypeTestCase(WorkoutManagerAddTestCase):
@@ -87,3 +89,24 @@ class DeleteContractTypeTestCase(WorkoutManagerDeleteTestCase):
'member3',
'member4',
'member5')
+
+delete_testcase_add_methods(DeleteContractTypeTestCase)
+
+
+class AccessContractTypeOverviewTestCase(WorkoutManagerAccessTestCase):
+ '''
+ Test accessing the contract list page
+ '''
+ url = reverse('gym:contract_type:list', kwargs={'gym_pk': 1})
+ user_success = ('manager1',
+ 'manager2')
+ user_fail = ('admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5')
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 525bb2c36..eaebfd4f3 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -142,6 +142,9 @@ patterns_contract_types = [
url(r'^delete/(?P<pk>\d+)$',
contract_type.DeleteView.as_view(),
name='delete'),
+ url(r'^list/(?P<gym_pk>\d+)$',
+ contract_type.ListView.as_view(),
+ name='list'),
]
# sub patterns for exports
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index 2ea198335..94a1d83ca 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -13,21 +13,25 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
+
import logging
from django.core.urlresolvers import reverse
-from django.contrib.auth.models import User
from django.http.response import HttpResponseForbidden
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy, ugettext as _
from django.views.generic import (
CreateView,
UpdateView,
- DeleteView
-)
+ DeleteView,
+ ListView)
-from wger.utils.generic_views import WgerFormMixin, WgerDeleteMixin, WgerPermissionMixin
-from wger.gym.models import ContractType
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
+from wger.gym.models import ContractType, Gym
logger = logging.getLogger(__name__)
@@ -45,9 +49,9 @@ class AddView(WgerFormMixin, CreateView):
def get_success_url(self):
'''
- Redirect back to user page
+ Redirect back to overview page
'''
- return reverse('gym:gym:user-list', kwargs={'pk': self.kwargs['gym_pk']})
+ return reverse('gym:contract_type:list', kwargs={'gym_pk': self.object.gym_id})
def dispatch(self, request, *args, **kwargs):
'''
@@ -103,9 +107,9 @@ class UpdateView(WgerFormMixin, UpdateView):
def get_success_url(self):
'''
- Redirect back to gym page
+ Redirect back to overview page
'''
- return reverse('gym:gym:user-list', kwargs={'pk': self.object.gym_id})
+ return reverse('gym:contract_type:list', kwargs={'gym_pk': self.object.gym_id})
def get_context_data(self, **kwargs):
'''
@@ -140,9 +144,9 @@ class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
def get_success_url(self):
'''
- Redirect back to gym page
+ Redirect back to overview page
'''
- return reverse('gym:gym:user-list', kwargs={'pk': self.object.gym_id})
+ return reverse('gym:contract_type:list', kwargs={'gym_pk': self.object.gym_id})
def get_context_data(self, **kwargs):
'''
@@ -151,3 +155,40 @@ class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
context = super(DeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}').format(self.object)
return context
+
+
+class ListView(WgerPermissionMixin, ListView):
+ '''
+ Overview of all available admin notes
+ '''
+ model = ContractType
+ permission_required = 'gym.add_contracttype'
+ template_name = 'contract_type/list.html'
+ gym = None
+
+ def get_queryset(self):
+ '''
+ Only documents for current user
+ '''
+ return ContractType.objects.filter(gym=self.gym)
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Can only list contract types in own gym
+ '''
+ if not request.user.is_authenticated():
+ return HttpResponseForbidden()
+
+ self.gym = get_object_or_404(Gym, id=self.kwargs['gym_pk'])
+ if request.user.userprofile.gym_id != self.gym.id:
+ return HttpResponseForbidden()
+
+ return super(ListView, self).dispatch(request, *args, **kwargs)
+
+ def get_context_data(self, **kwargs):
+ '''
+ Send some additional data to the template
+ '''
+ context = super(ListView, self).get_context_data(**kwargs)
+ context['gym'] = self.gym
+ return context