Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add configuration table for individual gyms

Roland Geider4643e01b3835
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.py
index 2ff11a119..5368ce491 100644
--- a/extras/scripts/filter-fixtures.py
+++ b/extras/scripts/filter-fixtures.py
@@ -58,6 +58,7 @@ filter_dump(data, ('exercises.equipment', 'exercises.equipment',), 'equipment.js
# Gym
#
filter_dump(data, ('gym.gym',), 'gyms.json')
+filter_dump(data, ('gym.gymconfig',), 'gyms_config.json')
#
# Core
diff --git a/wger/core/fixtures/groups.json b/wger/core/fixtures/groups.json
index 4ecd46176..dd59b7205 100644
--- a/wger/core/fixtures/groups.json
+++ b/wger/core/fixtures/groups.json
@@ -169,21 +169,26 @@
"delete_gym",
"gym",
"gym"
- ],
+ ],
[
- "manage_gyms",
- "gym",
+ "gym_trainer",
+ "gym",
"gym"
- ],
+ ],
[
- "manage_gym",
- "gym",
+ "manage_gym",
+ "gym",
"gym"
- ],
+ ],
[
- "gym_trainer",
- "gym",
+ "manage_gyms",
+ "gym",
"gym"
+ ],
+ [
+ "change_gymconfig",
+ "gym",
+ "gymconfig"
]
]
}
@@ -247,6 +252,11 @@
"manage_gym",
"gym",
"gym"
+ ],
+ [
+ "change_gymuserconfig",
+ "gym",
+ "gymuserconfig"
]
]
}
diff --git a/wger/core/models.py b/wger/core/models.py
index d53d2dfcb..5506a22e4 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -25,6 +25,7 @@ from django.core.urlresolvers import reverse
from django.core.exceptions import ValidationError
from django.core.validators import MinValueValidator, MaxValueValidator
from django.utils.translation import ugettext_lazy as _
+from wger.gym.models import Gym
from wger.utils.helpers import disable_for_loaddata
from wger.utils.constants import TWOPLACES
@@ -99,7 +100,7 @@ class UserProfile(models.Model):
The user
'''
- gym = models.ForeignKey('Gym',
+ gym = models.ForeignKey(Gym,
editable=False,
null=True,
blank=True)
@@ -480,81 +481,3 @@ class License(models.Model):
License has no owner information
'''
return None
-
-
-class Gym(models.Model):
- '''
- Model for a gym
- '''
-
- class Meta:
- permissions = (
- ("gym_trainer", _("Trainer, can see the users for a gym")),
- ("manage_gym", _("Admin, can manage users for a gym")),
- ("manage_gyms", _("Admin, can administrate the different gyms")),
- )
- ordering = ["name", ]
-
- name = models.CharField(max_length=60,
- verbose_name=_('Name'))
- '''Gym name'''
-
- phone = models.CharField(verbose_name=_('Phone'),
- max_length=20,
- blank=True,
- null=True)
- '''Phone number'''
-
- email = models.EmailField(verbose_name=_('Email'),
- blank=True,
- null=True)
- '''Email'''
-
- owner = models.CharField(verbose_name=_('Owner'),
- max_length=100,
- blank=True,
- null=True)
- '''Gym owner'''
-
- zip_code = models.IntegerField(_(u'ZIP code'),
- max_length=5,
- blank=True,
- null=True)
- '''ZIP code'''
-
- city = models.CharField(_(u'City'),
- max_length=30,
- blank=True,
- null=True)
- '''City'''
-
- street = models.CharField(_(u'Street'),
- max_length=30,
- blank=True,
- null=True)
- '''Street'''
-
- def __unicode__(self):
- '''
- Return a more human-readable representation
- '''
- return self.name
-
- def delete(self, using=None):
- '''
- Make sure that there are no users with this gym in their profiles
- '''
- UserProfile.objects.filter(gym=self).update(gym=None)
- super(Gym, self).delete(using)
-
- def get_absolute_url(self):
- '''
- Return the URL for this object
- '''
- return reverse('core:gym:user-list', kwargs={'pk': self.pk})
-
- def get_owner_object(self):
- '''
- Gym has no owner information
- '''
- return None
diff --git a/wger/gym/fixtures/test-gymsconfig.json b/wger/gym/fixtures/test-gymsconfig.json
new file mode 100644
index 000000000..37db12af8
--- /dev/null
+++ b/wger/gym/fixtures/test-gymsconfig.json
@@ -0,0 +1,26 @@
+[
+ {
+ "pk": 1,
+ "model": "gym.gymconfig",
+ "fields": {
+ "gym": 1,
+ "weeks_inactive": 7
+ }
+ },
+ {
+ "pk": 2,
+ "model": "gym.gymconfig",
+ "fields": {
+ "gym": 3,
+ "weeks_inactive": 4
+ }
+ },
+ {
+ "pk": 3,
+ "model": "gym.gymconfig",
+ "fields": {
+ "gym": 2,
+ "weeks_inactive": 2
+ }
+ }
+]
\ No newline at end of file
diff --git a/wger/gym/migrations/0003_auto__add_gymconfig__add_gymuserconfig__add_unique_gymuserconfig_gym_u.py b/wger/gym/migrations/0003_auto__add_gymconfig__add_gymuserconfig__add_unique_gymuserconfig_gym_u.py
new file mode 100644
index 000000000..7b290340f
--- /dev/null
+++ b/wger/gym/migrations/0003_auto__add_gymconfig__add_gymuserconfig__add_unique_gymuserconfig_gym_u.py
@@ -0,0 +1,106 @@
+# -*- 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):
+ # Adding model 'GymConfig'
+ db.create_table(u'gym_gymconfig', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('gym', self.gf('django.db.models.fields.related.OneToOneField')(related_name='config', unique=True, to=orm['gym.Gym'])),
+ ('weeks_inactive', self.gf('django.db.models.fields.PositiveIntegerField')(default=4, max_length=2)),
+ ))
+ db.send_create_signal(u'gym', ['GymConfig'])
+
+ # Adding model 'GymUserConfig'
+ db.create_table(u'gym_gymuserconfig', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('gym', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['gym.Gym'], unique=True)),
+ ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
+ ('overview_inactive', self.gf('django.db.models.fields.BooleanField')(default=True)),
+ ))
+ db.send_create_signal(u'gym', ['GymUserConfig'])
+
+ # Adding unique constraint on 'GymUserConfig', fields ['gym', 'user']
+ db.create_unique(u'gym_gymuserconfig', ['gym_id', 'user_id'])
+
+
+ def backwards(self, orm):
+ # Removing unique constraint on 'GymUserConfig', fields ['gym', 'user']
+ db.delete_unique(u'gym_gymuserconfig', ['gym_id', 'user_id'])
+
+ # Deleting model 'GymConfig'
+ db.delete_table(u'gym_gymconfig')
+
+ # Deleting model 'GymUserConfig'
+ db.delete_table(u'gym_gymuserconfig')
+
+
+ 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.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'})
+ },
+ u'gym.gymuserconfig': {
+ 'Meta': {'unique_together': "(('gym', 'user'),)", 'object_name': 'GymUserConfig'},
+ 'gym': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['gym.Gym']", 'unique': 'True'}),
+ 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'})
+ }
+ }
+
+ complete_apps = ['gym']
\ No newline at end of file
diff --git a/wger/gym/migrations/0004_gym_config.py b/wger/gym/migrations/0004_gym_config.py
new file mode 100644
index 000000000..e283272d1
--- /dev/null
+++ b/wger/gym/migrations/0004_gym_config.py
@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+
+class Migration(DataMigration):
+
+ def forwards(self, orm):
+ "Write your forwards methods here."
+ # Note: Don't use "from appname.models import ModelName".
+ # Use orm.ModelName to refer to models in this application,
+ # and orm['appname.ModelName'] for models in other applications.
+
+ # Create a gym config for all existing gyms
+ for gym in orm.Gym.objects.all():
+ config = orm.GymConfig()
+ config.gym = gym
+ config.save()
+
+ def backwards(self, orm):
+ "Write your backwards methods here."
+
+ 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.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'})
+ },
+ u'gym.gymuserconfig': {
+ 'Meta': {'unique_together': "(('gym', 'user'),)", 'object_name': 'GymUserConfig'},
+ 'gym': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['gym.Gym']", 'unique': 'True'}),
+ 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'})
+ }
+ }
+
+ complete_apps = ['gym']
+ symmetrical = True
diff --git a/wger/gym/models.py b/wger/gym/models.py
index 57e8d56c4..5e55d0b29 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -15,13 +15,14 @@
# You should have received a copy of the GNU Affero General Public License
-from django.db import models
+from django.db import models as m
from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext
-class Gym(models.Model):
+class Gym(m.Model):
'''
Model for a gym
'''
@@ -34,43 +35,43 @@ class Gym(models.Model):
)
ordering = ["name", ]
- name = models.CharField(max_length=60,
- verbose_name=_('Name'))
+ name = m.CharField(max_length=60,
+ verbose_name=_('Name'))
'''Gym name'''
- phone = models.CharField(verbose_name=_('Phone'),
- max_length=20,
- blank=True,
- null=True)
+ phone = m.CharField(verbose_name=_('Phone'),
+ max_length=20,
+ blank=True,
+ null=True)
'''Phone number'''
- email = models.EmailField(verbose_name=_('Email'),
- blank=True,
- null=True)
+ email = m.EmailField(verbose_name=_('Email'),
+ blank=True,
+ null=True)
'''Email'''
- owner = models.CharField(verbose_name=_('Owner'),
- max_length=100,
- blank=True,
- null=True)
+ owner = m.CharField(verbose_name=_('Owner'),
+ max_length=100,
+ blank=True,
+ null=True)
'''Gym owner'''
- zip_code = models.IntegerField(_(u'ZIP code'),
- max_length=5,
- blank=True,
- null=True)
+ zip_code = m.IntegerField(_(u'ZIP code'),
+ max_length=5,
+ blank=True,
+ null=True)
'''ZIP code'''
- city = models.CharField(_(u'City'),
- max_length=30,
- blank=True,
- null=True)
+ city = m.CharField(_(u'City'),
+ max_length=30,
+ blank=True,
+ null=True)
'''City'''
- street = models.CharField(_(u'Street'),
- max_length=30,
- blank=True,
- null=True)
+ street = m.CharField(_(u'Street'),
+ max_length=30,
+ blank=True,
+ null=True)
'''Street'''
def __unicode__(self):
@@ -101,3 +102,61 @@ class Gym(models.Model):
Gym has no owner information
'''
return None
+
+
+class GymConfig(m.Model):
+ '''
+ Configuration options for a gym
+ '''
+
+ gym = m.OneToOneField(Gym,
+ related_name='config',
+ editable=False)
+ '''
+ Gym this configuration belongs to
+ '''
+
+ weeks_inactive = m.PositiveIntegerField(verbose_name=_('Reminder inactive members'),
+ help_text=_('Number of weeks since the last time a '
+ 'user logged his presence to be considered inactive'),
+ default=4,
+ max_length=2)
+ '''
+ Reminder inactive members
+ '''
+
+ def __unicode__(self):
+ '''
+ Return a more human-readable representation
+ '''
+ return ugettext(u'Configuration for {}'.format(self.gym.name))
+
+
+class GymUserConfig(m.Model):
+ '''
+ User (actually administrator/trainer) configuration options for a specific gym
+ '''
+
+ class Meta:
+ unique_together = ('gym', 'user')
+ '''
+ Only one entry per user and gym
+ '''
+
+ gym = m.OneToOneField(Gym,
+ editable=False)
+ '''
+ Gym this configuration belongs to
+ '''
+
+ user = m.OneToOneField(User,
+ editable=False)
+ '''
+ User this configuration belongs to
+ '''
+
+ overview_inactive = m.BooleanField(verbose_name=_('Receive overview of inactive members'),
+ default=True)
+ '''
+ Reminder inactive members
+ '''
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index fc7861751..57661d77c 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -107,7 +107,9 @@ $(document).ready( function () {
{% block sidebar %}
-
+{# #}
+{# Gym details #}
+{# #}
{% if perms.core.change_gym %}
<div class="btn-group pull-right">
<button type="button" class="btn btn-default dropdown-toggle btn-xs" data-toggle="dropdown">
@@ -158,6 +160,37 @@ $(document).ready( function () {
</tr>
</table>
+
+{# #}
+{# Gym configuration #}
+{# #}
+{% if perms.core.change_gym %}
+<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:config:edit' gym.config.id %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
+ </li>
+ </ul>
+</div>
+{% endif %}
+
+<h4>{% trans "Configuration" %}</h4>
+<table class="table">
+ <tr>
+ <th>{% trans "Inactive members" %}</th>
+ <td>{{gym.config.weeks_inactive}} {% trans 'weeks' %}</td>
+ </tr>
+</table>
+
+
+
+
+{# #}
+{# Other options #}
+{# #}
{% if perms.gym.manage_gym %}
<h4>{% trans "Options" %}</h4>
<p>
diff --git a/wger/gym/tests/test_config.py b/wger/gym/tests/test_config.py
new file mode 100644
index 000000000..49db8f31b
--- /dev/null
+++ b/wger/gym/tests/test_config.py
@@ -0,0 +1,29 @@
+# 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
+# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+
+from wger.gym.models import GymConfig
+
+from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+
+
+class EditGymConfigTestCase(WorkoutManagerEditTestCase):
+ '''
+ Test editing a gym configuration
+ '''
+
+ pk = 1
+ object_class = GymConfig
+ url = 'gym:config:edit'
+ data = {'weeks_inactive': 10}
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 8733a8e7e..ada271004 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -18,6 +18,7 @@
from django.conf.urls import patterns, url, include
from wger.gym.views import gym
+from wger.gym.views import config
# 'sub patterns' for gyms
patterns_gym = patterns('',
@@ -47,10 +48,18 @@ patterns_gym = patterns('',
name='delete'),
)
+# 'sub patterns' for gym config
+patterns_gymconfig = patterns('',
+ url(r'^config/(?P<pk>\d+)/edit$',
+ config.GymConfigUpdateView.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
diff --git a/wger/gym/views/config.py b/wger/gym/views/config.py
new file mode 100644
index 000000000..0c10780ba
--- /dev/null
+++ b/wger/gym/views/config.py
@@ -0,0 +1,77 @@
+# -*- 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 csv
+import datetime
+import logging
+
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import Group
+from django.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+from django.core.urlresolvers import reverse_lazy
+from django.http.response import HttpResponseForbidden, HttpResponse, HttpResponseRedirect
+from django.shortcuts import render, get_object_or_404
+from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy
+from django.views.generic import ListView
+from django.views.generic import DeleteView
+from django.views.generic import CreateView
+from django.views.generic import UpdateView
+
+from wger.core.forms import GymUserAddForm
+from wger.core.helpers import get_user_last_activity
+from wger.gym.models import Gym, GymConfig
+from wger.utils.generic_views import WgerFormMixin
+from wger.utils.generic_views import WgerDeleteMixin
+from wger.utils.generic_views import WgerPermissionMixin
+from wger.utils.helpers import password_generator
+
+
+logger = logging.getLogger('wger.custom')
+
+
+class GymConfigUpdateView(WgerFormMixin, UpdateView):
+ '''
+ View to update an existing gym configuration
+ '''
+
+ model = GymConfig
+ permission_required = 'gym.change_gymconfig'
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Only managers for this gym can add new members
+ '''
+ if request.user.has_perm('gym.change_gymconfig'):
+ gym_id = request.user.userprofile.gym_id
+ if gym_id != int(self.kwargs['pk']):
+ return HttpResponseForbidden()
+ return super(GymConfigUpdateView, self).dispatch(request, *args, **kwargs)
+
+ 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(GymConfigUpdateView, self).get_context_data(**kwargs)
+ context['form_action'] = reverse('gym:config:edit', kwargs={'pk': self.object.id})
+ context['title'] = _(u'Edit {0}').format(self.object)
+ return context
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index ecbe66aab..dd7d8ed9a 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -33,7 +33,7 @@ from django.views.generic import UpdateView
from wger.core.forms import GymUserAddForm
from wger.core.helpers import get_user_last_activity
-from wger.gym.models import Gym
+from wger.gym.models import Gym, GymConfig
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
from wger.utils.generic_views import WgerPermissionMixin
@@ -111,6 +111,16 @@ class GymAddView(WgerFormMixin, CreateView):
form_action = reverse_lazy('gym:gym:add')
permission_required = 'gym.add_gym'
+ def form_valid(self, form):
+ '''
+ Create a config object
+ '''
+ config = GymConfig()
+ config.gym = form.save()
+ config.save()
+
+ return super(GymAddView, self).form_valid(form)
+
@login_required
def gym_new_user_info(request):
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index 1668ff012..f1e877930 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -56,6 +56,7 @@ class BaseTestCase(object):
'test-languages',
'test-licenses',
'test-gyms',
+ 'test-gymsconfig',
'test-user-data',
'test-apikeys',
'test-weight-data',