Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add options to contracts
Roland Geiderb961a2b20922
diff --git a/wger/core/fixtures/groups.json b/wger/core/fixtures/groups.jsonindex 01955af4d..3654cb568 100644--- a/wger/core/fixtures/groups.json+++ b/wger/core/fixtures/groups.json@@ -332,6 +332,21 @@"gym","contracttype"],+ [+ "add_contractoption",+ "gym",+ "contractoption"+ ],+ [+ "change_contractoption",+ "gym",+ "contractoption"+ ],+ [+ "delete_contractoption",+ "gym",+ "contractoption"+ ],["change_gym","gym",diff --git a/wger/gym/fixtures/test-contracts.json b/wger/gym/fixtures/test-contracts.jsonindex b93e23f0c..e620545b9 100644--- a/wger/gym/fixtures/test-contracts.json+++ b/wger/gym/fixtures/test-contracts.json@@ -88,5 +88,32 @@},"pk": 1,"model": "gym.contracttype"+ },+ {+ "fields": {+ "name": "Personally known to the owner",+ "description": "A friend of the owner, special privileges",+ "gym_id": 1+ },+ "pk": 1,+ "model": "gym.contractoption"+ },+ {+ "fields": {+ "name": "Pays cash",+ "description": "Member pays in cash",+ "gym_id": 1+ },+ "pk": 2,+ "model": "gym.contractoption"+ },+ {+ "fields": {+ "name": "Protein flatrate",+ "description": "Member has a flatrate for protein shakes",+ "gym_id": 1+ },+ "pk": 3,+ "model": "gym.contractoption"}]\ No newline at end of filediff --git a/wger/gym/migrations/0005_auto_20151023_1522.py b/wger/gym/migrations/0005_auto_20151023_1522.pynew file mode 100644index 000000000..3726cb293--- /dev/null+++ b/wger/gym/migrations/0005_auto_20151023_1522.py@@ -0,0 +1,35 @@+# -*- coding: utf-8 -*-+from __future__ import unicode_literals++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ('gym', '0004_auto_20151003_2357'),+ ]++ operations = [+ migrations.CreateModel(+ name='ContractOption',+ fields=[+ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),+ ('name', models.CharField(max_length=25, verbose_name='Name')),+ ('description', models.TextField(null=True, verbose_name='Description', blank=True)),+ ('gym', models.ForeignKey(editable=False, to='gym.Gym')),+ ],+ options={+ 'ordering': ['name'],+ },+ ),+ migrations.AlterModelOptions(+ name='contracttype',+ options={'ordering': ['name']},+ ),+ migrations.AddField(+ model_name='contract',+ name='options',+ field=models.ManyToManyField(to='gym.ContractOption', verbose_name='Options'),+ ),+ ]diff --git a/wger/gym/models.py b/wger/gym/models.pyindex 7e4e7b7cb..1a02ae0b6 100644--- a/wger/gym/models.py+++ b/wger/gym/models.py@@ -397,11 +397,60 @@ class ContractType(m.Model):'''Return a more human-readable representation'''- return "{}".format(self.name)+ return u"{}".format(self.name)def get_owner_object(self):'''- Contract type has no owner iformation+ Contract type has no owner information+ '''+ return None+++@python_2_unicode_compatible+class ContractOption(m.Model):+ '''+ Model for a contract Option++ A contract option is a user-editable way of enhancing the contract to+ specify options, such as e.g. 'cash', 'bank withdrawal', etc. The+ difference with a contract type is that a contract can only be of one+ type but can have different options.+ '''++ class Meta:+ '''+ Order by name+ '''+ ordering = ["name", ]++ gym = m.ForeignKey(Gym,+ editable=False)+ '''+ The gym this contract option belongs to+ '''++ name = m.CharField(verbose_name=_('Name'),+ max_length=25)+ '''+ The contract options short name+ '''++ description = m.TextField(verbose_name=_('Description'),+ blank=True,+ null=True)+ '''+ Free text field for additional information+ '''++ def __str__(self):+ '''+ Return a more human-readable representation+ '''+ return u"{}".format(self.name)++ def get_owner_object(self):+ '''+ Contract type has no owner information'''return None@@ -466,6 +515,12 @@ class Contract(m.Model):Optional type of contract'''+ options = m.ManyToManyField(ContractOption,+ verbose_name=_('Options'))+ '''+ Options for the contract+ '''+amount = m.DecimalField(verbose_name=_('Amount'),decimal_places=2,max_digits=12,diff --git a/wger/gym/templates/contract/view.html b/wger/gym/templates/contract/view.htmlindex dd675b9dd..815c14692 100644--- a/wger/gym/templates/contract/view.html+++ b/wger/gym/templates/contract/view.html@@ -35,6 +35,17 @@<td colspan="3">{{ object.contract_type.name|default:'-/-' }}</td></tr>{% endif %}++ {% if object.options %}+ <tr>+ <th>{% trans "Options" %}</th>+ <td colspan="3">+ {% for option in object.options.all %}+ {{ option }}<br>+ {% endfor %}+ </td>+ </tr>+ {% endif %}<tr><th>{% trans 'Name' %}</th><td>diff --git a/wger/gym/templates/contract_option/list.html b/wger/gym/templates/contract_option/list.htmlnew file mode 100644index 000000000..8875de383--- /dev/null+++ b/wger/gym/templates/contract_option/list.html@@ -0,0 +1,67 @@+{% extends "base.html" %}+{% load i18n staticfiles wger_extras django_bootstrap_breadcrumbs %}++{% block title %}{% trans "Options" %}{% 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 "Options" "gym:contract-option:list" gym.pk %}+{% endblock %}+++{% block content %}++<ul class="list-group">+ {% for option in contractoption_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-option:edit' option.pk %}" class="wger-modal-dialog">+ {% trans 'Edit' %}+ </a>+ </li>+ {% endif %}++ {% if perms.gym.delete_contracttype %}+ <li>+ <a href="{% url 'gym:contract-option:delete' option.pk %}" class="wger-modal-dialog">+ {% trans 'Delete' %}+ </a>+ </li>+ {% endif %}++ </ul>+ </div>+++ <h4 class="list-group-item-heading">+ {{ option.name }}+ </h4>++ <p class="list-group-item-text" style="white-space: pre-line;">{{ option.description }}</p>+ </li>+ {% empty %}+ <li class="list-group-item">+ {% trans "Nothing found" %}+ </li>+ {% endfor %}+</ul>+{% endblock %}+++++{% block sidebar %}+ <a href="{% url 'gym:contract-option: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.htmlindex 870c61ff5..c0617bda1 100644--- a/wger/gym/templates/gym/member_list.html+++ b/wger/gym/templates/gym/member_list.html@@ -289,6 +289,43 @@ $(document).ready( function () {{% endif %}+{% if perms.gym.change_contractoption %}+<div class="btn-group pull-right">+ <button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">+ {% trans "Actions" %} <span class="caret"></span>+ </button>+ <ul class="dropdown-menu" role="menu">+ <li>+ <a href="{% url 'gym:contract-option:list' gym.id %}">{% trans "Overview" %}</a>+ </li>+ <li>+ <a href="{% url 'gym:contract-option:add' gym.id %}" class="wger-modal-dialog">{% trans "Add" %}</a>+ </li>+ </ul>+</div>++<h4>{% trans "Options" %}</h4>+<table class="table">+ {% for option in gym.contractoption_set.all %}+ <tr>+ <td>+ {{ option }}+ </td>+ <td>+ {{ option.description|truncatewords:15 }}+ </td>+ </tr>+ {% empty %}+ <tr>+ <td>+ {% trans "Nothing found" %}+ </td>+ </tr>+ {% endfor %}+</table>+{% endif %}++{# #}{# Email lists #}diff --git a/wger/gym/tests/test_contract_options.py b/wger/gym/tests/test_contract_options.pynew file mode 100644index 000000000..36fe079e7--- /dev/null+++ b/wger/gym/tests/test_contract_options.py@@ -0,0 +1,112 @@+# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License++from django.core.urlresolvers import reverse+++from wger.gym.models import ContractOption+from wger.manager.tests.testcase import (+ WorkoutManagerEditTestCase,+ WorkoutManagerAddTestCase,+ WorkoutManagerDeleteTestCase,+ WorkoutManagerAccessTestCase,+ delete_testcase_add_methods)+++class AddContractOptionTestCase(WorkoutManagerAddTestCase):+ '''+ Tests creating a new contract option+ '''++ object_class = ContractOption+ url = reverse('gym:contract-option:add', kwargs={'gym_pk': 1})+ data = {'name': 'Some name'}+ user_success = ('manager1',+ 'manager2')+ user_fail = ('admin',+ 'general_manager1',+ 'manager3',+ 'manager4',+ 'test',+ 'member1',+ 'member2',+ 'member3',+ 'member4',+ 'member5')+++class EditContractOptionTestCase(WorkoutManagerEditTestCase):+ '''+ Tests editing a contract option+ '''++ pk = 1+ object_class = ContractOption+ url = 'gym:contract-option:edit'+ user_success = ('manager1',+ 'manager2')+ user_fail = ('admin',+ 'general_manager1',+ 'manager3',+ 'manager4',+ 'test',+ 'member1',+ 'member2',+ 'member3',+ 'member4',+ 'member5')+ data = {'name': 'Standard contract 16-Gj'}+++class DeleteContractOptionTestCase(WorkoutManagerDeleteTestCase):+ '''+ Tests deleting a contract option+ '''++ pk = 1+ object_class = ContractOption+ url = 'gym:contract-option:delete'+ user_success = ('manager1',+ 'manager2')+ user_fail = ('admin',+ 'general_manager1',+ 'manager3',+ 'manager4',+ 'test',+ 'member1',+ 'member2',+ 'member3',+ 'member4',+ 'member5')++delete_testcase_add_methods(DeleteContractOptionTestCase)+++class AccessContractOptionOverviewTestCase(WorkoutManagerAccessTestCase):+ '''+ Test accessing the contract option page+ '''+ url = reverse('gym:contract-option: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.pyindex ff90cc5fe..7e0afbcc3 100644--- a/wger/gym/urls.py+++ b/wger/gym/urls.py@@ -29,6 +29,7 @@ from wger.gym.views import (document,contract,contract_type,+ contract_option,export)@@ -150,6 +151,22 @@ patterns_contract_types = [name='list'),]+# sub patterns for contract options+patterns_contract_options = [+ url(r'^add/(?P<gym_pk>\d+)$',+ contract_option.AddView.as_view(),+ name='add'),+ url(r'^edit/(?P<pk>\d+)$',+ contract_option.UpdateView.as_view(),+ name='edit'),+ url(r'^delete/(?P<pk>\d+)$',+ contract_option.DeleteView.as_view(),+ name='delete'),+ url(r'^list/(?P<gym_pk>\d+)$',+ contract_option.ListView.as_view(),+ name='list'),+]+# sub patterns for exportspatterns_export = [url(r'^users/(?P<gym_pk>\d+)$',@@ -169,5 +186,6 @@ urlpatterns = [url(r'^document/', include(patterns_documents, namespace="document")),url(r'^contract/', include(patterns_contracts, namespace="contract")),url(r'^contract-type/', include(patterns_contract_types, namespace="contract_type")),+ url(r'^contract-option/', include(patterns_contract_options, namespace="contract-option")),url(r'^export/', include(patterns_export, namespace="export")),]diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.pynew file mode 100644index 000000000..5a153ada1--- /dev/null+++ b/wger/gym/views/contract_option.py@@ -0,0 +1,194 @@+# -*- coding: utf-8 -*-++# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# 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.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,+ ListView)++from wger.utils.generic_views import (+ WgerFormMixin,+ WgerDeleteMixin,+ WgerPermissionMixin+)+from wger.gym.models import ContractOption, Gym++logger = logging.getLogger(__name__)+++class AddView(WgerFormMixin, CreateView):+ '''+ View to add a new contract option+ '''++ model = ContractOption+ fields = ('name', 'description')+ title = ugettext_lazy('Add option')+ permission_required = 'gym.add_contractoption'+ member = None++ def get_success_url(self):+ '''+ Redirect back to overview page+ '''+ return reverse('gym:contract-option:list', kwargs={'gym_pk': self.object.gym_id})++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only add contract types in own gym+ '''+ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ if request.user.userprofile.gym_id != int(self.kwargs['gym_pk']):+ return HttpResponseForbidden()++ return super(AddView, self).dispatch(request, *args, **kwargs)++ def form_valid(self, form):+ '''+ Set the foreign key to the gym object+ '''+ form.instance.gym_id = self.kwargs['gym_pk']+ return super(AddView, self).form_valid(form)++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(AddView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('gym:contract-option:add',+ kwargs={'gym_pk': self.kwargs['gym_pk']})+ return context+++class UpdateView(WgerFormMixin, UpdateView):+ '''+ View to update an existing contract option+ '''++ model = ContractOption+ fields = ('name', 'description')+ permission_required = 'gym.change_contractoption'+ form_action_urlname = 'gym:contract-option:edit'++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only add contract types in own gym+ '''+ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ contract_type = self.get_object()+ if request.user.userprofile.gym_id != contract_type.gym_id:+ return HttpResponseForbidden()++ return super(UpdateView, self).dispatch(request, *args, **kwargs)++ def get_success_url(self):+ '''+ Redirect back to overview page+ '''+ return reverse('gym:contract-option:list', kwargs={'gym_pk': self.object.gym_id})++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(UpdateView, self).get_context_data(**kwargs)+ context['title'] = _(u'Edit {0}').format(self.object)+ return context+++class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):+ '''+ View to delete an existing contract option+ '''++ model = ContractOption+ permission_required = 'gym.delete_contractoption'+ form_action_urlname = 'gym:contract-option:delete'++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only add contract option in own gym+ '''+ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ contract_type = self.get_object()+ if request.user.userprofile.gym_id != contract_type.gym_id:+ return HttpResponseForbidden()++ return super(DeleteView, self).dispatch(request, *args, **kwargs)++ def get_success_url(self):+ '''+ Redirect back to overview page+ '''+ return reverse('gym:contract-option:list', kwargs={'gym_pk': self.object.gym_id})++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ 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 contract options+ '''+ model = ContractOption+ permission_required = 'gym.add_contractoption'+ template_name = 'contract_option/list.html'+ gym = None++ def get_queryset(self):+ '''+ Only documents for current user+ '''+ return ContractOption.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