Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add contract overview list for a user
Roland Geiderc91eda0d119a
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex 1628ba834..9425e7936 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -297,6 +297,9 @@{% trans "Actions" %} <span class="caret"></span></button><ul class="dropdown-menu" role="menu">+ <li>+ <a href="{% url 'gym:contract:list' current_user.id %}">{% trans "Overview"%}</a>+ </li><li><a href="{% url 'gym:contract:add' current_user.pk %}">{% trans "Add"%}</a></li>diff --git a/wger/gym/templates/contract/list.html b/wger/gym/templates/contract/list.htmlnew file mode 100644index 000000000..30e469ae0--- /dev/null+++ b/wger/gym/templates/contract/list.html@@ -0,0 +1,71 @@+{% extends "base.html" %}+{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}++{% block title %}{% trans "Contracts" %}{% endblock %}+++{% block breadcrumbs %}+ {{ block.super }}++ {% if perms.gym.manage_gyms %}+ {% breadcrumb "Gyms" "gym:gym:list" %}+ {% endif %}+ {% breadcrumb_raw member.userprofile.gym "gym:gym:user-list" member.userprofile.gym_id %}+ {% breadcrumb_raw member|format_username "core:user:overview" member.pk %}+ {% breadcrumb "Contracts" "gym:contract:list" member.pk %}+{% endblock %}+++{% block content %}+<div class="list-group">+ {% for contract in contract_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_contract %}+ <li>+ <a href="{% url 'gym:contract:edit' contract.pk %}">+ {% trans 'Edit' %}+ </a>+ </li>+ <li>+ <a href="{% url 'gym:contract:view' contract.pk %}">+ {% trans 'Show' %}+ </a>+ </li>+ {% endif %}++ </ul>+ </div>+++ <h4 class="list-group-item-heading">+ {{ contract.contract_type.name }}++ <small>+ {{ contract.date_start }}+ {% if contract.date_end %}+ - {{ contract.date_end }}+ {% endif %}+ </small>+ </h4>++ <p class="list-group-item-text">{{ contract.note }}</p>+ </li>+ {% empty %}+ <li class="list-group-item">+ {% trans "Nothing found" %}+ </li>+ {% endfor %}+</div>+{% endblock %}+++++{% block sidebar %}+ <a href="{% url 'gym:contract:add' member.pk %}" class="wger-modal-dialog btn btn-success">{% trans "Add" %}</a>+{% endblock %}diff --git a/wger/gym/templates/contract/view.html b/wger/gym/templates/contract/view.htmlindex 90cd04e7f..0c199daed 100644--- a/wger/gym/templates/contract/view.html+++ b/wger/gym/templates/contract/view.html@@ -12,6 +12,7 @@{% endif %}{% breadcrumb_raw object.member.userprofile.gym "gym:gym:user-list" object.member.userprofile.gym.pk %}{% breadcrumb_raw object.member|format_username "core:user:overview" object.member.pk %}+ {% breadcrumb "Contracts" "gym:contract:list" object.member.pk %}{% breadcrumb "Contract" "gym:contract:view" object.pk %}{% endblock %}diff --git a/wger/gym/tests/test_contracts.py b/wger/gym/tests/test_contracts.pyindex 8e382c650..b88bc36a3 100644--- a/wger/gym/tests/test_contracts.py+++ b/wger/gym/tests/test_contracts.py@@ -64,6 +64,25 @@ class AccessContractTestCase(WorkoutManagerAccessTestCase):'member5')+class AccessContractOverviewTestCase(WorkoutManagerAccessTestCase):+ '''+ Test accessing the contract list page+ '''+ url = reverse('gym:contract:list', kwargs={'user_pk': 4})+ user_success = ('manager1',+ 'manager2')+ user_fail = ('admin',+ 'general_manager1',+ 'manager3',+ 'manager4',+ 'test',+ 'member1',+ 'member2',+ 'member3',+ 'member4',+ 'member5')++class EditContractTestCase(WorkoutManagerEditTestCase):'''Tests editing a contractdiff --git a/wger/gym/urls.py b/wger/gym/urls.pyindex eaebfd4f3..ff90cc5fe 100644--- a/wger/gym/urls.py+++ b/wger/gym/urls.py@@ -129,6 +129,9 @@ patterns_contracts = [url(r'^edit/(?P<pk>\d+)$',contract.UpdateView.as_view(),name='edit'),+ url(r'^list/(?P<user_pk>\d+)$',+ contract.ListView.as_view(),+ name='list'),]# sub patterns for contract typesdiff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.pyindex b10736c89..560717e61 100644--- a/wger/gym/views/contract.py+++ b/wger/gym/views/contract.py@@ -34,8 +34,7 @@ from wger.utils.generic_views import (WgerDeleteMixin,WgerPermissionMixin)-from wger.gym.models import Contract-+from wger.gym.models import Contract, Gymlogger = logging.getLogger(__name__)@@ -165,3 +164,40 @@ class UpdateView(WgerFormMixin, UpdateView):context = super(UpdateView, self).get_context_data(**kwargs)context['title'] = _(u'Edit {0}').format(self.object)return context+++class ListView(WgerPermissionMixin, ListView):+ '''+ Overview of all available admin notes+ '''+ model = Contract+ permission_required = 'gym.add_contract'+ template_name = 'contract/list.html'+ member = None++ def get_queryset(self):+ '''+ Only documents for current user+ '''+ return Contract.objects.filter(member=self.member)++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only list contract types in own gym+ '''+ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ self.member = get_object_or_404(User, id=self.kwargs['user_pk'])+ if request.user.userprofile.gym_id != self.member.userprofile.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['member'] = self.member+ return context