Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add views to add contracts to users

Roland Geidereb1f1d984cc1
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.py
index 5145b1143..b88d28f4c 100644
--- a/extras/scripts/filter-fixtures.py
+++ b/extras/scripts/filter-fixtures.py
@@ -63,6 +63,7 @@ filter_dump(data, ('gym.gymadminconfig',), 'gym_adminconfig.json')
filter_dump(data, ('gym.gymuserconfig',), 'gym_userconfig.json')
filter_dump(data, ('gym.adminusernote',), 'gym_admin_user_notes.json')
filter_dump(data, ('gym.userdocument',), 'gym_user_documents.json')
+filter_dump(data, ('gym.contract',), 'gym_contracts.json')
#
# Core
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index ac4785fdf..cd4814cca 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -295,6 +295,46 @@
+{# #}
+{# Contract #}
+{# #}
+{% if perms.gym.add_contract %}
+<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:add' current_user.pk %}">{% trans "Add"%}</a>
+ </li>
+ </ul>
+</div>
+
+<h4>{% trans "Contracts" %}</h4>
+<table class="table">
+ {% for contract in current_user.contract_member.all %}
+ <tr>
+ <td>
+ {{ contract }}
+ </td>
+ <td>
+ {{ contract.date_start }}
+ </td>
+ <td>
+ {{ contract.get_contract_type_display }}
+ </td>
+ </tr>
+ {% empty %}
+ <tr>
+ <td>
+ {% trans "Nothing found" %}
+ </td>
+ </tr>
+ {% endfor %}
+</table>
+{% endif %}
+
+
{# #}
{# Documents #}
{# #}
diff --git a/wger/gym/fixtures/test-contracts.json b/wger/gym/fixtures/test-contracts.json
new file mode 100644
index 000000000..ab4f0a822
--- /dev/null
+++ b/wger/gym/fixtures/test-contracts.json
@@ -0,0 +1,83 @@
+[
+ {
+ "fields": {
+ "date_end": null,
+ "note": "",
+ "profession": "",
+ "amount": "30.00",
+ "contract_type": null,
+ "payment": "5",
+ "timestamp_edited": "2015-10-03T18:48:00.190Z",
+ "zip_code": "00000",
+ "phone": "01234-567890",
+ "city": "The City",
+ "member": [
+ "member2"
+ ],
+ "timestamp_created": "2015-10-03T18:48:00.190Z",
+ "date_start": "2014-09-01",
+ "street": "Gassenstr. 14",
+ "email": "[email protected]",
+ "user": [
+ "trainer1"
+ ],
+ "is_active": true
+ },
+ "pk": 1,
+ "model": "gym.contract"
+ },
+ {
+ "fields": {
+ "date_end": null,
+ "note": "",
+ "profession": "",
+ "amount": "0.00",
+ "contract_type": null,
+ "payment": "3",
+ "timestamp_edited": "2015-10-03T18:48:33.719Z",
+ "zip_code": "1234567890",
+ "phone": "01234-567890",
+ "city": "M\u00fcnster",
+ "member": [
+ "member3"
+ ],
+ "timestamp_created": "2015-10-03T18:48:33.719Z",
+ "date_start": "2015-09-01",
+ "street": "lange str. 1",
+ "email": "[email protected]",
+ "user": [
+ "trainer1"
+ ],
+ "is_active": true
+ },
+ "pk": 2,
+ "model": "gym.contract"
+ },
+ {
+ "fields": {
+ "date_end": "2015-12-31",
+ "note": "",
+ "profession": "",
+ "amount": "0.00",
+ "contract_type": null,
+ "payment": "2",
+ "timestamp_edited": "2015-10-03T21:50:00.706Z",
+ "zip_code": "1234-B",
+ "phone": "+1234 234-56 77/88",
+ "city": "Secret Lair",
+ "member": [
+ "member4"
+ ],
+ "timestamp_created": "2015-10-03T21:50:00.706Z",
+ "date_start": "2015-01-01",
+ "street": "",
+ "email": "",
+ "user": [
+ "trainer2"
+ ],
+ "is_active": true
+ },
+ "pk": 3,
+ "model": "gym.contract"
+ }
+]
\ No newline at end of file
diff --git a/wger/gym/tests/test_contracts.py b/wger/gym/tests/test_contracts.py
new file mode 100644
index 000000000..53c1e6ff8
--- /dev/null
+++ b/wger/gym/tests/test_contracts.py
@@ -0,0 +1,42 @@
+# 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 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
+
+
+class AddDocumentTestCase(WorkoutManagerAddTestCase):
+ '''
+ Tests uploading a new user document
+ '''
+
+ object_class = Contract
+ url = reverse('gym:contract:add', kwargs={'user_pk': 14})
+ data = {'amount': 30,
+ 'payment': '2'}
+ user_success = ('manager1',
+ 'manager2')
+ user_fail = ('admin',
+ 'general_manager1',
+ 'test',
+ 'member1',
+ 'member2',
+ 'member3',
+ 'member4',
+ 'member5')
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 09be3294b..8a754e81c 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -27,7 +27,8 @@ from wger.gym.views import (
admin_config,
user_config,
admin_notes,
- document
+ document,
+ contract
)
@@ -116,6 +117,13 @@ patterns_documents = [
name='delete'),
]
+# sub patterns for contracts
+patterns_contracts = [
+ url(r'^add/(?P<user_pk>\d+)$',
+ contract.AddView.as_view(),
+ name='add'),
+]
+
#
# All patterns for this app
#
@@ -126,4 +134,5 @@ urlpatterns = [
url(r'^user-config/', include(patterns_userconfig, namespace="user_config")),
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")),
]
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
new file mode 100644
index 000000000..739a031e2
--- /dev/null
+++ b/wger/gym/views/contract.py
@@ -0,0 +1,87 @@
+# -*- 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 as _
+from django.utils.translation import ugettext_lazy
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
+
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
+from wger.gym.models import Contract
+
+
+logger = logging.getLogger(__name__)
+
+
+class AddView(WgerFormMixin, CreateView):
+ '''
+ View to add a new document
+ '''
+
+ model = Contract
+ fields = '__all__'
+ title = ugettext_lazy('Add contract')
+ permission_required = 'gym.add_contract'
+ member = None
+
+ def get_success_url(self):
+ '''
+ Redirect back to user page
+ '''
+ return reverse('core:user:overview', kwargs={'pk': self.member.pk})
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Can only add documents to users in own gym
+ '''
+ if not request.user.is_authenticated():
+ return HttpResponseForbidden()
+
+ user = get_object_or_404(User, pk=self.kwargs['user_pk'])
+ self.member = user
+ if user.userprofile.gym_id != request.user.userprofile.gym_id:
+ return HttpResponseForbidden()
+ return super(AddView, self).dispatch(request, *args, **kwargs)
+
+ def form_valid(self, form):
+ '''
+ Set user instances
+ '''
+ form.instance.member = self.member
+ form.instance.user = self.request.user
+ 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:add',
+ kwargs={'user_pk': self.kwargs['user_pk']})
+ return context
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index d21802568..8462e399e 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -98,6 +98,7 @@ class BaseTestCase(object):
'test-gym-userconfig.json',
'test-admin-user-notes',
'test-gym-user-documents',
+ 'test-contracts',
'test-apikeys',
'test-weight-data',
'test-equipment',