Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow gym managers to edit contract types

Roland Geiderc53c806bc91a
diff --git a/wger/gym/fixtures/test-contracts.json b/wger/gym/fixtures/test-contracts.json
index ab4f0a822..b93e23f0c 100644
--- a/wger/gym/fixtures/test-contracts.json
+++ b/wger/gym/fixtures/test-contracts.json
@@ -79,5 +79,14 @@
},
"pk": 3,
"model": "gym.contract"
+ },
+ {
+ "fields": {
+ "name": "Standard contract 12/b",
+ "description": "A variation of the loved standard 12/a",
+ "gym_id": 1
+ },
+ "pk": 1,
+ "model": "gym.contracttype"
}
]
\ No newline at end of file
diff --git a/wger/gym/models.py b/wger/gym/models.py
index e76058e57..e70c43e4f 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -386,6 +386,12 @@ class ContractType(m.Model):
'''
return "{}".format(self.name)
+ def get_owner_object(self):
+ '''
+ Contract type has no owner iformation
+ '''
+ return None
+
@python_2_unicode_compatible
class Contract(m.Model):
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 3378868a4..dd01fad0d 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -242,4 +242,59 @@ $(document).ready( function () {
</td>
</tr>
</table>
+
+
+
+
+{# #}
+{# Contract configuration #}
+{# #}
+{% if perms.gym.change_contracttype %}
+<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_type:add' gym.id %}" class="wger-modal-dialog">{% trans "Add"%}</a>
+ </li>
+ </ul>
+</div>
+
+<h4>{% trans "Contract types" %}</h4>
+<table class="table">
+ {% for contract_type in gym.contracttype_set.all %}
+ <tr>
+ <td>
+ {{ contract_type }}
+ </td>
+ <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>
+ <td>
+ {% trans "Nothing found" %}
+ </td>
+ </tr>
+ {% endfor %}
+</table>
+{% endif %}
{% endblock %}
diff --git a/wger/gym/tests/test_contract_types.py b/wger/gym/tests/test_contract_types.py
new file mode 100644
index 000000000..0983f6d49
--- /dev/null
+++ b/wger/gym/tests/test_contract_types.py
@@ -0,0 +1,89 @@
+# 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 ContractType
+from wger.manager.tests.testcase import (
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase,
+ WorkoutManagerDeleteTestCase)
+
+
+class AddContractTypeTestCase(WorkoutManagerAddTestCase):
+ '''
+ Tests creating a new contract
+ '''
+
+ object_class = ContractType
+ url = reverse('gym:contract_type: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 EditContractTypeTestCase(WorkoutManagerEditTestCase):
+ '''
+ Tests editing a contract type
+ '''
+
+ pk = 1
+ object_class = ContractType
+ url = 'gym:contract_type: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 DeleteContractTypeTestCase(WorkoutManagerDeleteTestCase):
+ '''
+ Tests deleting a contract type
+ '''
+
+ pk = 1
+ object_class = ContractType
+ url = 'gym:contract_type:delete'
+ user_success = ('manager1',
+ 'manager2')
+ user_fail = ('admin',
+ 'general_manager1',
+ 'manager3',
+ 'manager4',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5')
diff --git a/wger/gym/tests/test_contracts.py b/wger/gym/tests/test_contracts.py
index 90af28cd8..91ce6a783 100644
--- a/wger/gym/tests/test_contracts.py
+++ b/wger/gym/tests/test_contracts.py
@@ -13,12 +13,13 @@
# You should have received a copy of the GNU Affero General Public License
from django.core.urlresolvers import reverse
-from wger.gym.models import Contract
-from wger.manager.tests.testcase import WorkoutManagerAccessTestCase, delete_testcase_add_methods
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
+from wger.gym.models import Contract
+from wger.manager.tests.testcase import (
+ WorkoutManagerAccessTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase,
+)
class AddContractTestCase(WorkoutManagerAddTestCase):
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index d760144b4..6c0f2a510 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -16,7 +16,6 @@
from django.conf.urls import (
- patterns,
url,
include
)
@@ -28,7 +27,8 @@ from wger.gym.views import (
user_config,
admin_notes,
document,
- contract
+ contract,
+ contract_type
)
@@ -130,6 +130,19 @@ patterns_contracts = [
name='edit'),
]
+# sub patterns for contract types
+patterns_contract_types = [
+ url(r'^add/(?P<gym_pk>\d+)$',
+ contract_type.AddView.as_view(),
+ name='add'),
+ url(r'^edit/(?P<pk>\d+)$',
+ contract_type.UpdateView.as_view(),
+ name='edit'),
+ url(r'^delete/(?P<pk>\d+)$',
+ contract_type.DeleteView.as_view(),
+ name='delete'),
+]
+
#
# All patterns for this app
#
@@ -141,4 +154,5 @@ urlpatterns = [
url(r'^notes/', include(patterns_admin_notes, namespace="admin_note")),
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")),
]
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
new file mode 100644
index 000000000..2ea198335
--- /dev/null
+++ b/wger/gym/views/contract_type.py
@@ -0,0 +1,153 @@
+# -*- 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.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
+)
+
+from wger.utils.generic_views import WgerFormMixin, WgerDeleteMixin, WgerPermissionMixin
+from wger.gym.models import ContractType
+
+logger = logging.getLogger(__name__)
+
+
+class AddView(WgerFormMixin, CreateView):
+ '''
+ View to add a new contract type
+ '''
+
+ model = ContractType
+ fields = ('name', 'description')
+ title = ugettext_lazy('Add contract type')
+ permission_required = 'gym.add_contracttype'
+ member = None
+
+ def get_success_url(self):
+ '''
+ Redirect back to user page
+ '''
+ return reverse('gym:gym:user-list', kwargs={'pk': self.kwargs['gym_pk']})
+
+ 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_type:add',
+ kwargs={'gym_pk': self.kwargs['gym_pk']})
+ return context
+
+
+class UpdateView(WgerFormMixin, UpdateView):
+ '''
+ View to update an existing contract
+ '''
+
+ model = ContractType
+ fields = ('name', 'description')
+ permission_required = 'gym.change_contracttype'
+ form_action_urlname = 'gym:contract_type: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 gym page
+ '''
+ return reverse('gym:gym:user-list', kwargs={'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 type
+ '''
+
+ model = ContractType
+ permission_required = 'gym.delete_contracttype'
+ form_action_urlname = 'gym:contract_type:delete'
+
+ 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(DeleteView, self).dispatch(request, *args, **kwargs)
+
+ def get_success_url(self):
+ '''
+ Redirect back to gym page
+ '''
+ return reverse('gym:gym:user-list', kwargs={'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