Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add edit views for gym admin configurations

Roland Geider9e5e4ef177bd
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.py
index 5368ce491..690789aa8 100644
--- a/extras/scripts/filter-fixtures.py
+++ b/extras/scripts/filter-fixtures.py
@@ -59,6 +59,7 @@ filter_dump(data, ('exercises.equipment', 'exercises.equipment',), 'equipment.js
#
filter_dump(data, ('gym.gym',), 'gyms.json')
filter_dump(data, ('gym.gymconfig',), 'gyms_config.json')
+filter_dump(data, ('gym.gymadminconfig',), 'gym_adminconfig.json')
#
# Core
diff --git a/extras/scripts/make_testuser_passwords.py b/extras/scripts/make_testuser_passwords.py
new file mode 100644
index 000000000..1f208ec80
--- /dev/null
+++ b/extras/scripts/make_testuser_passwords.py
@@ -0,0 +1,93 @@
+# -*- 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
+
+'''
+Simple script that creates passwords for the users used in the test
+'''
+
+import json
+
+from django.contrib.auth.hashers import make_password
+
+out = []
+out_profile = []
+
+for i in range(1, 12):
+
+ pk = 13 + i
+ gym = 1
+ if pk in (19, 20):
+ gym = 2
+ elif gym in (21, 22, 23, 24):
+ gym = 3
+ else:
+ gym = 1
+
+ username = 'member{}'.format(i)
+ password = make_password('{0}{0}'.format(username))
+ #print "User: {}\tpassword: {}".format(username, password)
+ out.append({
+ "pk": pk,
+ "model": "auth.user",
+ "fields": {
+ "username": "member{}".format(i),
+ "first_name": "",
+ "last_name": "",
+ "is_active": True,
+ "is_superuser": False,
+ "is_staff": False,
+ "last_login": "2013-03-30T00:23:21.592Z",
+ "groups": [],
+ "user_permissions": [],
+ "password": "{}".format(password),
+ "email": "{}@example.com".format(username),
+ "date_joined": "2013-03-30T00:23:21.592Z"
+ }
+ })
+
+ out_profile.append({
+ "pk": pk,
+ "model": "core.userprofile",
+ "fields": {
+ "is_temporary": False,
+ "show_comments": False,
+ "show_english_ingredients": False,
+ "user": pk,
+ "gender": "1",
+ "age": 30,
+ "sport_intensity": "3",
+ "calories": 3500,
+ "height": 180,
+ "sport_hours": 6,
+ "sleep_hours": 7,
+ "work_intensity": "1",
+ "freetime_intensity": "1",
+ "work_hours": 8,
+ "freetime_hours": 8,
+ "workout_reminder_active": False,
+ "workout_reminder": 20,
+ "workout_duration": 8,
+ "notification_language": 1,
+ "timer_active": True,
+ "timer_pause": 90,
+ "gym": gym
+ }
+ })
+
+
+with open('tmp.txt', 'w') as the_file:
+ the_file.write(json.dumps(out, indent=4))
+
diff --git a/wger/gym/fixtures/test-gym-adminconfig.json b/wger/gym/fixtures/test-gym-adminconfig.json
new file mode 100644
index 000000000..3530d0b2c
--- /dev/null
+++ b/wger/gym/fixtures/test-gym-adminconfig.json
@@ -0,0 +1,218 @@
+[
+ {
+ "pk": 1,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 1,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 2,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 2,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 3,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 2,
+ "user": 3,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 4,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 4,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 5,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 5,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 6,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 6,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 7,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 2,
+ "user": 7,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 8,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 2,
+ "user": 8,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 9,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 9,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 10,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 10,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 11,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 2,
+ "user": 11,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 12,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 12,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 13,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 2,
+ "user": 13,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 14,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 14,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 15,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 15,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 16,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 16,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 17,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 17,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 18,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 1,
+ "user": 18,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 19,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 2,
+ "user": 19,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 20,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 2,
+ "user": 20,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 21,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 3,
+ "user": 21,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 22,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 3,
+ "user": 22,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 23,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 3,
+ "user": 23,
+ "overview_inactive": true
+ }
+ },
+ {
+ "pk": 24,
+ "model": "gym.gymadminconfig",
+ "fields": {
+ "gym": 3,
+ "user": 24,
+ "overview_inactive": true
+ }
+ }
+]
diff --git a/wger/gym/migrations/0006_auto__chg_field_gymadminconfig_gym__del_unique_gymadminconfig_gym.py b/wger/gym/migrations/0006_auto__chg_field_gymadminconfig_gym__del_unique_gymadminconfig_gym.py
new file mode 100644
index 000000000..e632da396
--- /dev/null
+++ b/wger/gym/migrations/0006_auto__chg_field_gymadminconfig_gym__del_unique_gymadminconfig_gym.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Removing unique constraint on 'GymAdminConfig', fields ['gym']
+ db.delete_unique(u'gym_gymadminconfig', ['gym_id'])
+
+
+ # Changing field 'GymAdminConfig.gym'
+ db.alter_column(u'gym_gymadminconfig', 'gym_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['gym.Gym']))
+
+ def backwards(self, orm):
+
+ # Changing field 'GymAdminConfig.gym'
+ db.alter_column(u'gym_gymadminconfig', 'gym_id', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['gym.Gym'], unique=True))
+ # Adding unique constraint on 'GymAdminConfig', fields ['gym']
+ db.create_unique(u'gym_gymadminconfig', ['gym_id'])
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'auth.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ u'gym.gym': {
+ 'Meta': {'ordering': "['name']", 'object_name': 'Gym'},
+ 'city': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '60'}),
+ 'owner': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
+ 'phone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}),
+ 'street': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}),
+ 'zip_code': ('django.db.models.fields.IntegerField', [], {'max_length': '5', 'null': 'True', 'blank': 'True'})
+ },
+ u'gym.gymadminconfig': {
+ 'Meta': {'unique_together': "(('gym', 'user'),)", 'object_name': 'GymAdminConfig'},
+ 'gym': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['gym.Gym']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'overview_inactive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'})
+ },
+ u'gym.gymconfig': {
+ 'Meta': {'object_name': 'GymConfig'},
+ 'gym': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'config'", 'unique': 'True', 'to': u"orm['gym.Gym']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'weeks_inactive': ('django.db.models.fields.PositiveIntegerField', [], {'default': '4', 'max_length': '2'})
+ }
+ }
+
+ complete_apps = ['gym']
\ No newline at end of file
diff --git a/wger/gym/models.py b/wger/gym/models.py
index 5013c1937..2c291a186 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -140,8 +140,8 @@ class AbstractGymUserConfigModel(m.Model):
class Meta:
abstract = True
- gym = m.OneToOneField(Gym,
- editable=False)
+ gym = m.ForeignKey(Gym,
+ editable=False)
'''
Gym this configuration belongs to
'''
@@ -164,8 +164,15 @@ class GymAdminConfig(AbstractGymUserConfigModel, m.Model):
Only one entry per user and gym
'''
- overview_inactive = m.BooleanField(verbose_name=_('Receive overview of inactive members'),
+ overview_inactive = m.BooleanField(verbose_name=_('Overview inactive members'),
+ help_text=_('Receive email overviews of inactive members'),
default=True)
'''
Reminder inactive members
'''
+
+ def get_owner_object(self):
+ '''
+ Returns the object that has owner information
+ '''
+ return self
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 57661d77c..2029a8280 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -177,7 +177,7 @@ $(document).ready( function () {
</div>
{% endif %}
-<h4>{% trans "Configuration" %}</h4>
+<h4>{% trans "Gym configuration" %}</h4>
<table class="table">
<tr>
<th>{% trans "Inactive members" %}</th>
@@ -188,6 +188,37 @@ $(document).ready( function () {
+{# #}
+{# Admin configuration #}
+{# #}
+<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:admin_config:edit' user.gymadminconfig.id %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
+ </li>
+ </ul>
+</div>
+
+<h4>{% trans "My configuration" %}</h4>
+<table class="table">
+ <tr>
+ <th>{% trans "Overview inactive members" %}</th>
+ <td>
+ {% if user.gymadminconfig.overview_inactive %}
+ <span class="glyphicon glyphicon-ok"></span>
+ {% else %}
+ <span class="glyphicon glyphicon-remove"></span>
+ {% endif %}
+ </td>
+ </tr>
+</table>
+
+
+
+
+
{# #}
{# Other options #}
{# #}
diff --git a/wger/gym/tests/test_admin_config.py b/wger/gym/tests/test_admin_config.py
new file mode 100644
index 000000000..bc75bc64b
--- /dev/null
+++ b/wger/gym/tests/test_admin_config.py
@@ -0,0 +1,36 @@
+# 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 datetime
+
+from django.core.urlresolvers import reverse
+
+from wger.manager.tests.testcase import WorkoutManagerTestCase
+from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
+from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+
+from wger.gym.models import GymAdminConfig
+
+
+class EditConfigTestCase(WorkoutManagerEditTestCase):
+ '''
+ Tests editing an admin config
+ '''
+
+ object_class = GymAdminConfig
+ url = 'gym:admin_config:edit'
+ pk = 1
+ user_success = 'admin'
+ user_fail = 'trainer2'
+ data = {'overview_inactive': False}
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index 86e3b2ba4..6e589153f 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -36,6 +36,7 @@ class GymAddUserTestCase(WorkoutManagerTestCase):
Helper function to add users
'''
count_before = User.objects.all().count()
+ GymAdminConfig.objects.all().delete()
response = self.client.get(reverse('gym:gym:add-user', kwargs={'gym_pk': 1}))
self.assertEqual(GymAdminConfig.objects.all().count(), 0)
if fail:
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index ada271004..bf2123c5e 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -19,6 +19,8 @@ from django.conf.urls import patterns, url, include
from wger.gym.views import gym
from wger.gym.views import config
+from wger.gym.views import admin_config
+
# 'sub patterns' for gyms
patterns_gym = patterns('',
@@ -50,16 +52,25 @@ patterns_gym = patterns('',
# 'sub patterns' for gym config
patterns_gymconfig = patterns('',
- url(r'^config/(?P<pk>\d+)/edit$',
+ url(r'^(?P<pk>\d+)/edit$',
config.GymConfigUpdateView.as_view(),
name='edit'),
)
+
+# 'sub patterns' for gym admin config
+patterns_adminconfig = patterns('',
+ url(r'^(?P<pk>\d+)/edit$',
+ admin_config.ConfigUpdateView.as_view(),
+ name='edit'),
+)
+
#
# All patterns for this app
#
urlpatterns = patterns('',
url(r'^', include(patterns_gym, namespace="gym")),
- url(r'^', include(patterns_gymconfig, namespace="config")),
-)
\ No newline at end of file
+ url(r'^config/', include(patterns_gymconfig, namespace="config")),
+ url(r'^admin-config/', include(patterns_adminconfig, namespace="admin_config")),
+)
diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.py
new file mode 100644
index 000000000..af142d7c1
--- /dev/null
+++ b/wger/gym/views/admin_config.py
@@ -0,0 +1,51 @@
+# -*- 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.utils.translation import ugettext as _
+from django.views.generic import UpdateView
+
+from wger.gym.models import GymAdminConfig
+from wger.utils.generic_views import WgerFormMixin
+
+
+logger = logging.getLogger('wger.custom')
+
+
+class ConfigUpdateView(WgerFormMixin, UpdateView):
+ '''
+ View to update an existing admin gym configuration
+ '''
+
+ model = GymAdminConfig
+ permission_required = 'gym.change_gymadminconfig'
+
+ def get_success_url(self):
+ '''
+ Return to the gym user overview
+ '''
+ return reverse('gym:gym:user-list', kwargs={'pk': self.object.gym.pk})
+
+ def get_context_data(self, **kwargs):
+ '''
+ Send some additional data to the template
+ '''
+ context = super(ConfigUpdateView, self).get_context_data(**kwargs)
+ context['form_action'] = reverse('gym:admin_config:edit', kwargs={'pk': self.object.id})
+ context['title'] = _('Configuration')
+ return context
diff --git a/wger/manager/fixtures/test-user-data.README b/wger/manager/fixtures/test-user-data.README
index d77c18680..60af45cf5 100644
--- a/wger/manager/fixtures/test-user-data.README
+++ b/wger/manager/fixtures/test-user-data.README
@@ -15,7 +15,8 @@ Gym 1 - Test 123
#4 trainer1
#5 trainer2
#6 trainer3
-#9 manager1#10 manager2
+#9 manager1
+#10 manager2
#12 general_manager1
#14 member1
#15 member2
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index f1e877930..aab326cad 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -58,6 +58,7 @@ class BaseTestCase(object):
'test-gyms',
'test-gymsconfig',
'test-user-data',
+ 'test-gym-adminconfig.json',
'test-apikeys',
'test-weight-data',
'test-equipment',