Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add detail view for a contract

Roland Geiderdd9d3ab51e3f
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index cd4814cca..6c6d442d2 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -318,7 +318,7 @@
{{ contract }}
</td>
<td>
- {{ contract.date_start }}
+ <a href="{{ contract.get_absolute_url }}">{{ contract.date_start }}</a>
</td>
<td>
{{ contract.get_contract_type_display }}
diff --git a/wger/gym/models.py b/wger/gym/models.py
index fef1701ad..e76058e57 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -535,6 +535,12 @@ class Contract(m.Model):
'''
return "#{}".format(self.id)
+ def get_absolute_url(self):
+ '''
+ Return the URL for this object
+ '''
+ return reverse('gym:contract:view', kwargs={'pk': self.pk})
+
def get_owner_object(self):
'''
While the model has a user foreign key, this is editable by all
diff --git a/wger/gym/templates/contract/view.html b/wger/gym/templates/contract/view.html
new file mode 100644
index 000000000..47141138b
--- /dev/null
+++ b/wger/gym/templates/contract/view.html
@@ -0,0 +1,93 @@
+{% extends "base.html" %}
+{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}
+
+{% block title %}{% trans 'Contract' %} {{ object }}{% endblock %}
+
+
+{% block breadcrumbs %}
+ {{ block.super }}
+
+ {% if perms.gym.manage_gyms %}
+ {% breadcrumb "Gyms" "gym:gym:list" %}
+ {% 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 "Contract" "gym:contract:view" object.pk %}
+{% endblock %}
+
+
+{% block content %}
+<table class="table">
+ <tr>
+ <th>{% trans 'Name' %}</th>
+ <td>
+ {{ object.member.last_name }},
+ {{ object.member.first_name }}
+ </td>
+ <th>{% trans 'Username' %}</th>
+ <td>{{ object.member }}</td>
+ </tr>
+ {% if object.contract_type %}
+ <tr>
+ <th>{% trans 'Contract type' %}</th>
+ <td colspan="3">{{ object.contract_type.name|default:'-/-' }}</td>
+ </tr>
+ {% endif %}
+ <tr>
+ <th>{% trans 'Amount' %}</th>
+ <td>
+ {{ object.amount|default:'-/-' }}</td>
+ <th>{% trans 'Payment type' %}</th>
+ <td></td>
+ </tr>
+ <tr>
+ <th>{% trans 'Start date' %}</th>
+ <td>{{ object.date_start|default:'-/-' }}</td>
+ <th>{% trans 'End date' %}</th>
+ <td>{{ object.date_end|default:'-/-' }}</td>
+ </tr>
+ <tr>
+ <th>{% trans 'Email' %}</th>
+ <td colspan="3">
+ {% if object.email %}
+ <a href="mailto:{{ object.email }}">{{ object.email }}</a>
+ {% else %}
+ -/-
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <th>{% trans 'Address' %}</th>
+ <td>
+ {{object.zip_code}} {{object.city}}<br>
+ {{object.street}}
+ </td>
+ <th>{% trans 'Phone' %}</th>
+ <td>{{ object.phone }}</td>
+ </tr>
+ <tr>
+ <th>{% trans 'Profession' %}</th>
+ <td colspan="3">{{ object.profession }}</td>
+ </tr>
+ <tr>
+ <th colspan="3">{% trans 'Contract is active' %}</th>
+ <td>
+ {% if object.is_active %}
+ <span class="glyphicon glyphicon-ok"></span>
+ {% else %}
+ <span class="glyphicon glyphicon-remove"></span>
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <th>{% trans 'Note' %}</th>
+ <td colspan="3">{{ object.note }}</td>
+ </tr>
+</table>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+{% endblock %}
diff --git a/wger/gym/tests/test_contracts.py b/wger/gym/tests/test_contracts.py
index 53c1e6ff8..4548ae597 100644
--- a/wger/gym/tests/test_contracts.py
+++ b/wger/gym/tests/test_contracts.py
@@ -21,9 +21,9 @@ from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-class AddDocumentTestCase(WorkoutManagerAddTestCase):
+class AddContractTestCase(WorkoutManagerAddTestCase):
'''
- Tests uploading a new user document
+ Tests creating a new contract
'''
object_class = Contract
@@ -34,6 +34,28 @@ class AddDocumentTestCase(WorkoutManagerAddTestCase):
'manager2')
user_fail = ('admin',
'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5')
+
+
+class AccessContractTestCase(WorkoutManagerAccessTestCase):
+ '''
+ Test accessing the detail page of a contract
+ '''
+ object_class = Contract
+ url = reverse('gym:contract:view', kwargs={'pk': 1})
+ user_success = ('manager1',
+ 'manager2')
+ user_fail = ('admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
'test',
'member1',
'member2',
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 8a754e81c..b11add4a3 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -122,6 +122,9 @@ patterns_contracts = [
url(r'^add/(?P<user_pk>\d+)$',
contract.AddView.as_view(),
name='add'),
+ url(r'^view/(?P<pk>\d+)$',
+ contract.DetailView.as_view(),
+ name='view'),
]
#
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
index 739a031e2..5441c5e23 100644
--- a/wger/gym/views/contract.py
+++ b/wger/gym/views/contract.py
@@ -22,6 +22,7 @@ from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
from django.views.generic import (
+ DetailView,
ListView,
DeleteView,
CreateView,
@@ -85,3 +86,25 @@ class AddView(WgerFormMixin, CreateView):
context['form_action'] = reverse('gym:contract:add',
kwargs={'user_pk': self.kwargs['user_pk']})
return context
+
+
+class DetailView(WgerPermissionMixin, DetailView):
+ '''
+ Detail view of a member's contract
+ '''
+
+ model = Contract
+ template_name = 'contract/view.html'
+ permission_required = 'gym.add_contract'
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Can only see contracts for own gym
+ '''
+ if not request.user.is_authenticated():
+ return HttpResponseForbidden()
+
+ contract = self.get_object()
+ if contract.member.userprofile.gym_id != request.user.userprofile.gym_id:
+ return HttpResponseForbidden()
+ return super(DetailView, self).dispatch(request, *args, **kwargs)