Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add support for gym management

Roland Geiderdc3abf1b1db1
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.py
index 2bf2a5ff1..6702d93ff 100644
--- a/extras/scripts/filter-fixtures.py
+++ b/extras/scripts/filter-fixtures.py
@@ -55,10 +55,14 @@ filter_dump(data, ('exercises.exercise', 'exercises.exercisecomment',), 'exercis
filter_dump(data, ('exercises.equipment', 'exercises.equipment',), 'equipment.json')
#
-# Other
+# Core
#
+filter_dump(data, ('core.gym',), 'gyms.json')
filter_dump(data, ('core.language',), 'languages.json')
filter_dump(data, ('core.license',), 'licenses.json')
filter_dump(data, ('config.languageconfig',), 'language_config.json')
+#
+# Other
+#
filter_dump(data, ('auth.group',), 'groups.json')
diff --git a/wger/core/fixtures/test-gyms.json b/wger/core/fixtures/test-gyms.json
new file mode 100644
index 000000000..102679d7f
--- /dev/null
+++ b/wger/core/fixtures/test-gyms.json
@@ -0,0 +1,23 @@
+[
+ {
+ "pk": 1,
+ "model": "core.gym",
+ "fields": {
+ "name": "Test 123"
+ }
+ },
+ {
+ "pk": 2,
+ "model": "core.gym",
+ "fields": {
+ "name": "A cool gym"
+ }
+ },
+ {
+ "pk": 3,
+ "model": "core.gym",
+ "fields": {
+ "name": "Muscle Gym"
+ }
+ }
+]
\ No newline at end of file
diff --git a/wger/core/forms.py b/wger/core/forms.py
index b3b7489be..ec84e6444 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -16,14 +16,15 @@
from captcha.fields import ReCaptchaField
from django.contrib.auth.forms import UserCreationForm
-from django.contrib.auth.models import User as Django_User
+from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
-from django.forms import ModelForm, EmailField, Form, CharField, widgets, PasswordInput
+from django import forms
+from django.forms import EmailField, Form, CharField, widgets, PasswordInput
from django.utils.translation import ugettext as _
from wger.core.models import UserProfile
-class UserPreferencesForm(ModelForm):
+class UserPreferencesForm(forms.ModelForm):
class Meta:
model = UserProfile
fields = ('show_comments',
@@ -36,27 +37,90 @@ class UserPreferencesForm(ModelForm):
'timer_pause')
-class UserEmailForm(ModelForm):
+class UserEmailForm(forms.ModelForm):
email = EmailField(label=_("Email"),
help_text=_("Only needed to reset your password in case you forget it."),
required=False)
class Meta:
- model = Django_User
+ model = User
fields = ('email', )
def clean_email(self):
- # Email must be unique systemwide
+ '''
+ Email must be unique system wide
+
+ However, this check should only be performed when the user changes his
+ email, otherwise the uniqueness check will because it will find one user
+ (the current one) using the same email. Only when the user changes it, do
+ we want to check that nobody else has that email
+ '''
+
email = self.cleaned_data["email"]
if not email:
return email
try:
- Django_User.objects.get(email=email)
- except Django_User.DoesNotExist:
+ user = User.objects.get(email=email)
+ if user.email == self.instance.email:
+ return email
+ except User.DoesNotExist:
return email
+
raise ValidationError(_("This email is already used."))
+class UserPersonalInformationForm(UserEmailForm):
+ first_name = forms.CharField(label=_('First name'),
+ required=False)
+ last_name = forms.CharField(label=_('Last name'),
+ required=False)
+
+ class Meta:
+ model = User
+ fields = ('first_name', 'last_name', 'email')
+
+
+class GymUserAddForm(UserPersonalInformationForm):
+ '''
+ Form used when adding a user to a gym
+ '''
+ USER = 'user'
+ GYM_ADMIN = 'admin'
+ TRAINER = 'trainer'
+ ROLES = (
+ (USER, _('User')),
+ (TRAINER, _('Trainer')),
+ (GYM_ADMIN, _('Gym administrator')),
+ )
+
+ role = forms.ChoiceField(choices=ROLES,
+ initial=USER)
+ username = forms.RegexField(label=_("Username"),
+ max_length=30,
+ regex=r'^[\w.@-]$',
+ help_text=_("Required. 30 characters or fewer. Letters, digits and "
+ "@/.//-/_ only."),
+ error_messages={
+ 'invalid': _("This value may contain only letters, numbers and "
+ "@/.//-/_ characters.")})
+
+ class Meta:
+ model = User
+ fields = ('first_name', 'last_name', 'username', 'email', 'role',)
+
+ def clean_username(self):
+ '''
+ Since User.username is unique, this check is redundant,
+ but it sets a nicer error message than the ORM. See #13147.
+ '''
+ username = self.cleaned_data["username"]
+ try:
+ User._default_manager.get(username=username)
+ except User.DoesNotExist:
+ return username
+ raise forms.ValidationError(_("A user with that username already exists."))
+
+
class PasswordConfirmationForm(Form):
'''
A simple password confirmation form.
@@ -102,15 +166,15 @@ class RegistrationFormNoCaptcha(UserCreationForm, UserEmailForm):
pass
-class FeedbackRegisteredForm(Form):
+class FeedbackRegisteredForm(forms.Form):
'''
Feedback form used for logged in users
'''
- comment = CharField(max_length=500,
- min_length=10,
- widget=widgets.Textarea,
- help_text=_('What do you want to say?'),
- required=True)
+ comment = forms.CharField(max_length=500,
+ min_length=10,
+ widget=widgets.Textarea,
+ help_text=_('What do you want to say?'),
+ required=True)
class FeedbackAnonymousForm(FeedbackRegisteredForm):
diff --git a/wger/core/models.py b/wger/core/models.py
index fd95b2e6a..2f74fbad7 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -93,23 +93,37 @@ class UserProfile(models.Model):
(INTENSITY_HIGH, _('High')),
)
- # This field is required.
user = models.OneToOneField(User,
editable=False)
+ '''
+ The user
+ '''
+
+ gym = models.ForeignKey('Gym',
+ editable=False,
+ null=True,
+ blank=True)
+ '''
+ The gym this user belongs to, if any
+ '''
- # Flag to mark a temporary user (demo account)
is_temporary = models.BooleanField(default=False,
editable=False)
+ '''
+ Flag to mark a temporary user (demo account)
+ '''
#
# User preferences
#
- # Show exercise comments on workout view
show_comments = models.BooleanField(verbose_name=_('Show exercise comments'),
help_text=_('Check to show exercise comments on the '
'workout view'),
default=True)
+ '''
+ Show exercise comments on workout view
+ '''
# Also show ingredients in english while composing a nutritional plan
# (obviously this is only meaningful if the user has a language other than english)
@@ -466,3 +480,39 @@ 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"),
+ )
+
+ name = models.CharField(max_length=60,
+ verbose_name=_('Name'))
+ '''Gym name'''
+
+ 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_owner_object(self):
+ '''
+ Gym has no owner information
+ '''
+ return None
diff --git a/wger/core/templates/base.html b/wger/core/templates/base.html
index 84c2fb081..6338c40b0 100644
--- a/wger/core/templates/base.html
+++ b/wger/core/templates/base.html
@@ -1,5 +1,13 @@
-{% extends "template.html" %}
+{% extends "template.html" %}{% load i18n %}{% load wger_extras %}
{% block template %}
+{% if trainer_identity %}
+<div class="alert alert-info" style="margin-top: 1em;">
+ {% blocktrans with current_user=user|format_username %}You are
+browsing the site as the user "{{current_user}}", all actions are performed on his data.
+ {% endblocktrans %}
+ <a href="{% url 'core:trainer-login' trainer_identity %}" class="alert-link">{% trans "Back to own profile" %}</a>
+</div>
+{% endif %}
<h2 id="page-title" class="page-header">{% block title %}{% endblock %}</h2>
<div class="row">
<div class="col-sm-8" id="main-content">
diff --git a/wger/core/templates/gym/list.html b/wger/core/templates/gym/list.html
new file mode 100644
index 000000000..49f308438
--- /dev/null
+++ b/wger/core/templates/gym/list.html
@@ -0,0 +1,52 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load staticfiles %}
+{% load wger_extras %}
+
+{% block title %}{% trans "Gym list" %}{% endblock %}
+
+
+{% block content %}
+
+<ul class="list-group">
+ {% for gym in gym_list %}
+ <li class="list-group-item ">
+ <div class="pull-right">
+ <a href="{% url 'core:gym-delete' gym.id %}"
+ class="btn btn-danger btn-xs wger-modal-dialog">
+ {% trans 'Delete' %}
+ </a>
+ <a href="{% url 'core:gym-edit' gym.id %}"
+ class="btn btn-default btn-xs wger-modal-dialog">
+ {% trans 'Edit' %}
+ </a>
+ </div>
+ {% if perms.core.manage_gym and user.userprofile.gym == gym %}
+ <a href="{% url 'core:gym-user-list' gym.pk %}">{{gym}}</a>
+ {% else %}
+ {{gym}}
+ {% endif %}
+ </li>
+ {% endfor %}
+</ul>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+{% if perms.core.add_gym %}
+<h3>{% trans "Options" %}</h3>
+<p>
+ <a href="{% url 'core:gym-add' %}"
+ {% auto_link_css flavour "wger-modal-dialog" %}>
+ <img src="{% static 'images/icons/new.svg' %}"
+ width="32"
+ height="32"
+ alt="{% trans 'Add new gym' %}"
+ title="{% trans 'Add new gym' %}">
+ {% trans "Add new gym" %}
+ </a>
+</p>
+{% endif %}
+{% endblock %}
diff --git a/wger/core/templates/gym/member_list.html b/wger/core/templates/gym/member_list.html
new file mode 100644
index 000000000..5865bbc3f
--- /dev/null
+++ b/wger/core/templates/gym/member_list.html
@@ -0,0 +1,74 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load staticfiles %}
+{% load wger_extras %}
+
+{% block title %}{% trans "Members in gym" %} - {{gym}}{% endblock %}
+
+
+{% block content %}
+<table class="table">
+<thead>
+<tr>
+ <th>{% trans "ID" %}</th>
+ <th>{% trans "Username" %}</th>
+ <th>{% trans "Name" %}</th>
+</tr>
+</thead>
+<tbody>
+{% for current_user in object_list %}
+<tr>
+ <td>
+ {{current_user.obj.pk}}
+ </td>
+ <td>
+ {% if current_user.perms.any_admin %}
+ {{current_user.obj}}
+ {% else %}
+ <a href="{% url 'core:user-overview' current_user.obj.pk %}">{{current_user.obj}}</a>
+ {% endif %}
+
+
+ {% if current_user.perms.gym_trainer %}
+ <span class="label label-primary">{% trans "Trainer" %}</span>
+ {% endif %}
+
+ {% if current_user.perms.manage_gym %}
+ <span class="label label-primary">{% trans "Gym manager" %}</span>
+ {% endif %}
+
+ {% if current_user.perms.manage_gyms %}
+ <span class="label label-primary">{% trans "General manager" %}</span>
+ {% endif %}
+ </td>
+ <td>
+ {{current_user.obj.get_full_name}}
+ </td>
+</tr>
+{% empty %}
+<tr>
+ <td colspan="2">{% trans "No users for this gym found" %}</td>
+</tr>
+{% endfor %}
+</tbody>
+</table>
+{% endblock %}
+
+
+{% block sidebar %}
+
+{% if perms.core.manage_gym %}
+<h3>{% trans "Options" %}</h3>
+<p>
+ <a href="{% url 'core:gym-add-user' gym.pk %}"
+ {% auto_link_css flavour "wger-modal-dialog" %}>
+ <img src="{% static 'images/icons/new.svg' %}"
+ width="32"
+ height="32"
+ alt="{% trans 'Add member' %}"
+ title="{% trans 'Add member' %}">
+ {% trans "Add member" %}
+ </a>
+</p>
+{% endif %}
+{% endblock %}
diff --git a/wger/core/templates/gym/new_user.html b/wger/core/templates/gym/new_user.html
new file mode 100644
index 000000000..4dd40884e
--- /dev/null
+++ b/wger/core/templates/gym/new_user.html
@@ -0,0 +1,42 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load staticfiles %}
+{% load wger_extras %}
+
+{% block title %}{{user_data.user.get_full_name}}{% endblock %}
+
+
+{% block content %}
+<table class="table">
+ <tr>
+ <th>{% trans "User" %}</th>
+ <td>{{user_data.user.get_full_name}} ({{user_data.user}})</td>
+ </tr>
+ <tr>
+ <th>{% trans "Password" %}</th>
+ <td>{{user_data.password}}</td>
+ </tr>
+ <tr>
+ <th>{% trans "Email" %}</th>
+ <td>{{user_data.user.email}}</td>
+ </tr>
+ <tr>
+ <th>{% trans "Gym" %}</th>
+ <td>{{user_data.user.userprofile.gym}}</td>
+ </tr>
+</table>
+
+<a href="{% url 'core:gym-user-list' user_data.user.userprofile.gym.pk %}">
+{% trans "Back to gym" %}
+</a>
+{% endblock %}
+
+
+
+
+{% block sidebar %}
+<h3>{% trans "Info" %}</h3>
+<p>
+ {% blocktrans %}Please write down the user password, this value cannot be recovered later.{% endblocktrans %}
+</p>
+{% endblock %}
diff --git a/wger/core/templates/mobile/navigation.html b/wger/core/templates/mobile/navigation.html
index 0898c1f09..1e79c4fe4 100644
--- a/wger/core/templates/mobile/navigation.html
+++ b/wger/core/templates/mobile/navigation.html
@@ -140,14 +140,22 @@
<li><a href="{% url 'software:changelog' %}">{% trans "Changelog" %} </a></li>
<li><a href="https://github.com/rolandgeider/wger">{% trans "Github" %} </a></li>
<li><a href="https://www.transifex.com/projects/p/wger-workout-manager/">{% trans "Translate with Transifex" %} </a></li>
- {% cache cache_timeout user-admin-software user.id language.id %}
- {% if perms.exercises %}
- <li class="divider"></li>
- <li class="nav-header">{% trans "Administration" %}</li>
- <li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>
- <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
+ {% if perms.exercises or perms.core.manage_gyms or perms.core.manage_gym or perms.core.gym_trainer %}
+ <li class="divider"></li>
+ <li class="nav-header">{% trans "Administration" %}</li>
+ <li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>
+ <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
+ {% if perms.core.manage_gyms %}
+ <li><a href="{% url 'core:gym-list' %}">{% trans "Gyms" %} </a></li>
+ {% endif %}
+
+ {# it's not possible to group expressions '(a or b) and c' #}
+ {% if perms.core.gym_trainer or perms.core.manage_gym %}
+ {% if user.userprofile.gym %}
+ <li><a href="{% url 'core:gym-user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>
+ {% endif %}
+ {% endif %}
{% endif %}
- {% endcache %}
</ul>
</li>
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 6db467a76..ffc9b70c5 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -1,4 +1,4 @@
-{% load i18n %}{% load cache %}
+{% load i18n %}{% load cache %}{% load wger_extras %}
<nav id="nav">
<div>
<div class="navbar navbar-inverse ">
@@ -45,7 +45,7 @@
<li><a href="{% url 'exercise-overview' %}">{% trans "Exercises" %}</a></li>
<li><a href="{% url 'muscle-overview' %}">{% trans "Muscle overview" %}</a></li>
<li><a href="{% url 'equipment-overview' %}">{% trans "Equipment overview" %}</a></li>
- {% if user.is_authenticated and not user.userprofile.is_temporary %}
+ {% if user.is_authenticated and not user.userprofile.is_temporary and not trainer_identity %}
<li class="divider"></li>
<li><a href="{% url 'exercise-add' %}">{% trans "Add new exercise" %}</a><li>
{% endif %}
@@ -121,14 +121,22 @@
<li><a href="{% url 'software:changelog' %}">{% trans "Changelog" %} </a></li>
<li><a href="https://github.com/rolandgeider/wger">{% trans "Github" %} </a></li>
<li><a href="https://www.transifex.com/projects/p/wger-workout-manager/">{% trans "Translate with Transifex" %} </a></li>
- {% cache cache_timeout user-admin-software user.id language.id %}
- {% if perms.exercises %}
- <li class="divider"></li>
- <li class="nav-header">{% trans "Administration" %}</li>
- <li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>
- <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
+ {% if perms.exercises or perms.core.manage_gyms or perms.core.manage_gym or perms.core.gym_trainer %}
+ <li class="divider"></li>
+ <li class="nav-header">{% trans "Administration" %}</li>
+ <li><a href="{% url 'config:language-overview' %}">{% trans "Languages" %} </a></li>
+ <li><a href="{% url 'core:license-list' %}">{% trans "Licenses" %} </a></li>
+ {% if perms.core.manage_gyms %}
+ <li><a href="{% url 'core:gym-list' %}">{% trans "Gyms" %} </a></li>
+ {% endif %}
+
+ {# it's not possible to group expressions '(a or b) and c' #}
+ {% if perms.core.gym_trainer or perms.core.manage_gym %}
+ {% if user.userprofile.gym %}
+ <li><a href="{% url 'core:gym-user-list' user.userprofile.gym.pk %}">{{user.userprofile.gym}}</a></li>
+ {% endif %}
+ {% endif %}
{% endif %}
- {% endcache %}
</ul>
</li>
</ul>
@@ -156,23 +164,21 @@
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- {% if user.email %}
- {{user.email}}
- {% else %}
- {{user.username}}
- {% endif %}
+ {{user|format_username}}
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li>
<a href="{% url 'core:preferences' %}">{% trans "My preferences" %}</a>
</li>
+ {% if not trainer_identity %}
<li>
<a href="{% url 'core:logout' %}" class="browserid-logout">
<span class="glyphicon glyphicon-log-out"></span>
{% trans "Logout" %}
</a>
</li>
+ {% endif %}
</ul>
</li>
</ul>
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
new file mode 100644
index 000000000..35b849b87
--- /dev/null
+++ b/wger/core/templates/user/overview.html
@@ -0,0 +1,146 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% load staticfiles %}
+{% load wger_extras %}
+
+{% block title %}{% trans "User" %}: {{current_user|format_username}}{% endblock %}
+
+
+{% block content %}
+
+<h3>{% trans "Workouts" %} ({% trans "last 10" %})</h3>
+<table class="table">
+<thead>
+<tr>
+ <th>{% trans "Name" %}</th>
+ <th>{% trans "Date" %}</th>
+</tr>
+</thead>
+<tbody>
+{% for workout in current_user.workout_set.all|slice:":10" %}
+<tr>
+ <td>
+ <a href="{% url 'workout-view' workout.pk %}">{{workout}}</a>
+ </td>
+ <td>
+ {{workout.creation_date}}
+ </td>
+</tr>
+{% empty %}
+<tr>
+ <td colspan="2">{% trans "No workouts found." %}</td>
+</tr>
+{% endfor %}
+</tbody>
+</table>
+{% if perms.core.gym_trainer %}
+<a href="{% url 'core:trainer-login' current_user.pk %}" class="btn btn-success btn-sm">{% trans "Log in as this user" %}</a>
+<a href="{% url 'workout-add' current_user.pk %}" class="btn btn-default btn-sm">{% trans "Add workout" %}</a>
+{% endif %}
+
+
+
+
+<h3>{% trans "Log" %}</h3>
+<table class="table">
+<thead>
+<tr>
+ <th>{% trans "Date" %}</th>
+ <th>{% trans "Impression" %}</th>
+ <th>{% trans "Time" %}</th>
+</tr>
+</thead>
+<tbody>
+{% for log in current_user.workoutsession_set.all|slice:":10" %}
+<tr>
+ <td>
+ {{log.date}}
+ </td>
+ <td>
+ {{log.get_impression_display}}
+ </td>
+ <td>
+ {% if log.time_start and log.time_end %}
+ {{log.time_start|time:"H:i"}} - {{log.time_end|time:"H:i"}}
+ {% else %}
+ -/-
+ {% endif %}
+ </td>
+</tr>
+{% empty %}
+<tr>
+ <td colspan="3">{% trans "No logs found." %}</td>
+</tr>
+{% endfor %}
+</tbody>
+</table>
+{% endblock %}
+
+
+{% block sidebar %}
+{% if perms.core.manage_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 'core:user-edit' current_user.pk %}" class="wger-modal-dialog">{% trans "Edit"%}</a>
+ </li>
+ <li>
+ {% if current_user.is_active %}
+ <a href="{% url 'core:user-deactivate' current_user.pk %}" >{% trans "Deactivate user"%}</a>
+ {% else %}
+ <a href="{% url 'core:user-activate' current_user.pk %}">{% trans "Activate user"%}</a>
+ {% endif %}
+ </li>
+ </ul>
+</div>
+{% endif %}
+<h4 >{% trans "Details" %}</h4>
+
+<table class="table">
+ <tr>
+ <td>{% trans "Nr." %}</td>
+ <td>{{current_user.pk}}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Name" %}</td>
+ <td>{{current_user.first_name}}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Last name" %}</td>
+ <td>{{current_user.last_name}}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Email" %}</td>
+ <td>
+ {% if user.email %}
+ <a href="mailto:{{current_user.email}}">{{current_user.email}}</a>
+ {% else %}
+ -/-
+ {% endif %}
+ </td>
+ </tr>
+ <tr>
+ <td>{% trans "Registered" %}</td>
+ <td>{{current_user.date_joined}}</td>
+ </tr>
+ <tr>
+ <td>{% trans "Last login" %}</td>
+ <td>{{current_user.last_login}}</td>
+ </tr>
+{% if perms.core.manage_gym %}
+ <tr {% if not current_user.is_active %}class="danger"{% endif%}>
+ <td>{% trans "Status" %}</td>
+ <td>
+ {% if current_user.is_active %}
+ {% trans "Active" %}
+ {% else %}
+ {% trans "Inactive" %}
+ {% endif %}
+ </td>
+ </tr>
+{% endif %}
+</table>
+{% endblock %}
diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.html
index f4c81609d..4cff9029e 100644
--- a/wger/core/templates/user/preferences.html
+++ b/wger/core/templates/user/preferences.html
@@ -37,6 +37,8 @@ $(function() {
<div id="collapseEmail" class="panel-collapse collapse in">
<div class="panel-body">
{% render_form_field email_form.email %}
+ {% render_form_field email_form.first_name %}
+ {% render_form_field email_form.last_name %}
</div>
</div>
</div>
diff --git a/wger/core/tests/test_gym.py b/wger/core/tests/test_gym.py
new file mode 100644
index 000000000..10fdc111e
--- /dev/null
+++ b/wger/core/tests/test_gym.py
@@ -0,0 +1,87 @@
+# 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 django.core.urlresolvers import reverse_lazy
+
+from wger.core.models import Gym
+from wger.core.models import UserProfile
+
+from wger.manager.tests.testcase import WorkoutManagerTestCase
+from wger.manager.tests.testcase import WorkoutManagerAccessTestCase
+from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
+from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+
+
+class GymOverviewTest(WorkoutManagerAccessTestCase):
+ '''
+ Tests accessing the gym overview page
+ '''
+ url = 'core:gym-list'
+ anonymous_fail = True
+
+
+class GymUserOverviewTest(WorkoutManagerAccessTestCase):
+ '''
+ Tests accessing the gym user overview page
+ '''
+ url = reverse_lazy('core:gym-user-list', kwargs={'pk': 1})
+ anonymous_fail = True
+
+
+class AddGymTestCase(WorkoutManagerAddTestCase):
+ '''
+ Tests adding a new gym
+ '''
+ object_class = Gym
+ url = 'core:gym-add'
+ data = {'name': 'The name her'}
+ pk = 4
+
+
+class DeleteGymTestCase(WorkoutManagerDeleteTestCase):
+ '''
+ Tests deleting a gym
+ '''
+
+ object_class = Gym
+ url = 'core:gym-delete'
+ pk = 2
+
+
+class EditGymTestCase(WorkoutManagerEditTestCase):
+ '''
+ Tests editing a license
+ '''
+
+ object_class = Gym
+ url = 'core:gym-edit'
+ pk = 1
+ data = {'name': 'A different name'}
+
+
+class GymTestCase(WorkoutManagerTestCase):
+ '''
+ Tests other methods
+ '''
+
+ def test_delete_gym(self):
+ '''
+ Tests that deleting a gym also removes it from all user profiles
+ '''
+ gym = Gym.objects.get(pk=1)
+ self.assertEqual(UserProfile.objects.filter(gym=gym).count(), 2)
+
+ gym.delete()
+ self.assertEqual(UserProfile.objects.filter(gym=gym).count(), 0)
diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.py
new file mode 100644
index 000000000..5e2f4f7de
--- /dev/null
+++ b/wger/core/tests/test_user.py
@@ -0,0 +1,170 @@
+# 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.contrib.auth.models import User
+from django.core.urlresolvers import reverse
+
+from wger.manager.tests.testcase import WorkoutManagerTestCase
+from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+
+
+class StatusUserTestCase(WorkoutManagerTestCase):
+ '''
+ Tests activating and deactivating users
+ '''
+
+ def activate(self, fail=False):
+ '''
+ Helper function to test activating users
+ '''
+ user = User.objects.get(pk=2)
+ user.is_active = False
+ user.save()
+ self.assertFalse(user.is_active)
+
+ response = self.client.get(reverse('core:user-activate', kwargs={'pk': user.pk}))
+ user = User.objects.get(pk=2)
+
+ if fail:
+ self.assertEqual(response.status_code, 403)
+ self.assertFalse(user.is_active)
+ else:
+ self.assertEqual(response.status_code, 302)
+ self.assertTrue(user.is_active)
+
+ def test_activate_authorized(self):
+ '''
+ Tests activating a user as an administrator
+ '''
+ self.user_login('admin')
+ self.activate()
+
+ def test_activate_unauthorized(self):
+ '''
+ Tests activating a user as another logged in user
+ '''
+ self.user_login('demo')
+ self.activate(fail=True)
+
+ def test_activate_logged_out(self):
+ '''
+ Tests activating a user a logged out user
+ '''
+ self.activate(fail=True)
+
+ def deactivate(self, fail=False):
+ '''
+ Helper function to test deactivating users
+ '''
+ user = User.objects.get(pk=2)
+ self.assertTrue(user.is_active)
+
+ response = self.client.get(reverse('core:user-deactivate', kwargs={'pk': user.pk}))
+ user = User.objects.get(pk=2)
+
+ if fail:
+ self.assertEqual(response.status_code, 403)
+ self.assertTrue(user.is_active)
+ else:
+ self.assertEqual(response.status_code, 302)
+ self.assertFalse(user.is_active)
+
+ def test_deactivate_authorized(self):
+ '''
+ Tests deactivating a user as an administrator
+ '''
+ self.user_login('admin')
+ self.deactivate()
+
+ def test_deactivate_unauthorized(self):
+ '''
+ Tests deactivating a user as another logged in user
+ '''
+ self.user_login('demo')
+ self.deactivate(fail=True)
+
+ def test_deactivate_logged_out(self):
+ '''
+ Tests deactivating a user a logged out user
+ '''
+ self.deactivate(fail=True)
+
+
+class GymAddUserTestCase(WorkoutManagerTestCase):
+ '''
+ Tests admin adding users to gyms
+ '''
+
+ def add_user(self, fail=False):
+ '''
+ Helper function to add users
+ '''
+ count_before = User.objects.all().count()
+ response = self.client.get(reverse('core:gym-add-user', kwargs={'gym_pk': 1}))
+ if fail:
+ self.assertEqual(response.status_code, 403)
+ else:
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse('core:gym-add-user', kwargs={'gym_pk': 1}),
+ {'first_name': 'Cletus',
+ 'last_name': 'Spuckle',
+ 'username': 'cletus',
+ 'email': '[email protected]',
+ 'role': 'admin'})
+ count_after = User.objects.all().count()
+ if fail:
+ self.assertEqual(response.status_code, 403)
+ self.assertEqual(count_before, count_after)
+ self.assertFalse(self.client.session.get('gym.user'))
+ else:
+ self.assertEqual(count_before + 1, count_after)
+ self.assertEqual(response.status_code, 302)
+ self.assertTrue(self.client.session['gym.user']['user'])
+ self.assertTrue(self.client.session['gym.user']['password'])
+ self.assertEqual(len(self.client.session['gym.user']['password']), 15)
+ self.assertEqual(self.client.session['gym.user']['user'].userprofile.gym_id, 1)
+
+ def test_add_user_authorized(self):
+ '''
+ Tests adding a user as an administrator
+ '''
+ self.user_login('admin')
+ self.add_user()
+
+ def test_add_user_unauthorized(self):
+ '''
+ Tests adding a user a different user
+ '''
+ self.user_login('test')
+ self.add_user(fail=True)
+
+ def test_add_user_logged_out(self):
+ '''
+ Tests adding a user a logged out user
+ '''
+ self.add_user(fail=True)
+
+
+class EditUserTestCase(WorkoutManagerEditTestCase):
+ '''
+ Tests editing a user by an admin
+ '''
+
+ object_class = User
+ url = 'core:user-edit'
+ pk = 2
+ data = {'email': '[email protected]',
+ 'first_name': 'Name',
+ 'last_name': 'Lastname'}
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 188bf9dc7..fb83a39eb 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -23,6 +23,7 @@ from django.core.urlresolvers import reverse_lazy
from wger.core.views import user
from wger.core.views import misc
from wger.core.views import license
+from wger.core.views import gym
urlpatterns = patterns('',
@@ -44,6 +45,9 @@ urlpatterns = patterns('',
url(r'^user/logout$',
user.logout,
name='logout'),
+ url(r'^user/(?P<user_pk>\d+)/trainer-login$',
+ user.trainer_login,
+ name='trainer-login'),
url(r'^user/registration$',
user.registration,
name='registration'),
@@ -56,6 +60,18 @@ urlpatterns = patterns('',
url(r'^user/demo-entries$',
misc.demo_entries,
name='demo-entries'),
+ url(r'^user/(?P<pk>\d+)/activate',
+ user.UserActivateView.as_view(),
+ name='user-activate'),
+ url(r'^user/(?P<pk>\d+)/deactivate',
+ user.UserDeactivateView.as_view(),
+ name='user-deactivate'),
+ url(r'^user/(?P<pk>\d+)/edit',
+ user.UserEditView.as_view(),
+ name='user-edit'),
+ url(r'^user/(?P<pk>\d+)/overview',
+ user.UserDetailView.as_view(),
+ name='user-overview'),
# Licenses
url(r'^license/list$',
@@ -71,7 +87,29 @@ urlpatterns = patterns('',
license.LicenseDeleteView.as_view(),
name='license-delete'),
-
+ # Gyms
+ url(r'^gym/list$',
+ gym.GymListView.as_view(),
+ name='gym-list'),
+ url(r'^gym/new-user-data$',
+ gym.gym_new_user_info,
+ name='gym-new-user-data'),
+ url(r'^gym/(?P<pk>\d+)/members',
+ gym.GymUserListView.as_view(),
+ name='gym-user-list'),
+ url(r'^gym/(?P<gym_pk>\d+)/add-member',
+ gym.GymAddUserView.as_view(),
+ name='gym-add-user'),
+ url(r'^gym/add$',
+ gym.GymAddView.as_view(),
+ name='gym-add'),
+ url(r'^gym/(?P<pk>\d+)/edit',
+ gym.GymUpdateView.as_view(),
+ name='gym-edit'),
+ url(r'^gym/(?P<pk>\d+)/delete',
+ gym.GymDeleteView.as_view(),
+ name='gym-delete'),
+
# Others
diff --git a/wger/core/views/gym.py b/wger/core/views/gym.py
new file mode 100644
index 000000000..f13a4b423
--- /dev/null
+++ b/wger/core/views/gym.py
@@ -0,0 +1,212 @@
+# -*- 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.contrib.auth.models import Permission
+from django.contrib.contenttypes.models import ContentType
+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
+from django.shortcuts import render
+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.models import Gym
+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 GymListView(WgerPermissionMixin, ListView):
+ '''
+ Overview of all available gyms
+ '''
+ model = Gym
+ permission_required = 'core.manage_gyms'
+ template_name = 'gym/list.html'
+
+
+class GymUserListView(WgerPermissionMixin, ListView):
+ '''
+ Overview of all users for a specific gym
+ '''
+ model = User
+ permission_required = ('core.manage_gym', 'core.gym_trainer')
+ template_name = 'gym/member_list.html'
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Only managers and trainers for this gym can access the members
+ '''
+ if (request.user.has_perm('core.manage_gym') or request.user.has_perm('core.gym_trainer')) \
+ and request.user.userprofile.gym_id == int(self.kwargs['pk']):
+ return super(GymUserListView, self).dispatch(request, *args, **kwargs)
+ return HttpResponseForbidden()
+
+ def get_queryset(self):
+ '''
+ Return a list with the users, not really a queryset.
+ '''
+ out = []
+ for u in User.objects.filter(userprofile__gym_id=self.kwargs['pk']):
+ out.append({'obj': u,
+ 'perms': {'manage_gym': u.has_perm('core.manage_gym'),
+ 'manage_gyms': u.has_perm('core.manage_gyms'),
+ 'gym_trainer': u.has_perm('core.gym_trainer'),
+ 'any_admin': u.has_perm('core.manage_gym')
+ or u.has_perm('core.manage_gyms')
+ or u.has_perm('core.gym_trainer')}})
+ return out
+
+ def get_context_data(self, **kwargs):
+ '''
+ Pass other info to the template
+ '''
+ context = super(GymUserListView, self).get_context_data(**kwargs)
+ context['gym'] = Gym.objects.get(pk=self.kwargs['pk'])
+ return context
+
+
+class GymAddView(WgerFormMixin, CreateView):
+ '''
+ View to add a new gym
+ '''
+
+ model = Gym
+ success_url = reverse_lazy('core:gym-list')
+ title = ugettext_lazy('Add gym')
+ form_action = reverse_lazy('core:gym-add')
+ permission_required = 'core.add_gym'
+
+
+def gym_new_user_info(request):
+ '''
+ Shows info about a newly created user
+ '''
+ if not (request.user.has_perm('core.manage_gym') or request.user.has_perm('core.manage_gym')):
+ return HttpResponseForbidden()
+
+ return render(request, 'gym/new_user.html', {'user_data': request.session['gym.user']})
+
+
+class GymAddUserView(WgerFormMixin, CreateView):
+ '''
+ View to add a user to a new gym
+ '''
+
+ model = User
+ title = ugettext_lazy('Add user to gym')
+ success_url = reverse_lazy('core:gym-new-user-data')
+ permission_required = 'core.manage_gym'
+ form_class = GymUserAddForm
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Only managers for this gym can add new members
+ '''
+ if not request.user.is_authenticated():
+ return HttpResponseForbidden()
+ gym_id = request.user.userprofile.gym_id
+ if request.user.has_perm('core.manage_gym') and gym_id == int(self.kwargs['gym_pk']):
+ return super(GymAddUserView, self).dispatch(request, *args, **kwargs)
+ return HttpResponseForbidden()
+
+ def form_valid(self, form):
+ '''
+ Create the user, set the user permissions and gym
+ '''
+ gym = Gym.objects.get(pk=self.kwargs['gym_pk'])
+ password = password_generator()
+ user = User.objects.create_user(form.cleaned_data['username'],
+ form.cleaned_data['email'],
+ password)
+ user.first_name = form.cleaned_data['first_name']
+ user.last_name = form.cleaned_data['last_name']
+ form.instance = user
+
+ user.userprofile.gym = gym
+ user.userprofile.save()
+
+ if form.cleaned_data['role'] != 'user':
+ content_type = ContentType.objects.get_for_model(Gym)
+ if form.cleaned_data['role'] == 'trainer':
+ permission = Permission.objects.get(content_type=content_type,
+ codename='gym_trainer')
+ elif form.cleaned_data['role'] == 'admin':
+ permission = Permission.objects.get(content_type=content_type,
+ codename='manage_gym')
+ user.user_permissions.add(permission)
+
+ self.request.session['gym.user'] = {'user': user,
+ 'password': password}
+
+ return super(GymAddUserView, self).form_valid(form)
+
+ def get_context_data(self, **kwargs):
+ context = super(GymAddUserView, self).get_context_data(**kwargs)
+ context['form_action'] = reverse('core:gym-add-user',
+ kwargs={'gym_pk': self.kwargs['gym_pk']})
+ return context
+
+
+class GymUpdateView(WgerFormMixin, UpdateView):
+ '''
+ View to update an existing license
+ '''
+
+ model = Gym
+ title = ugettext_lazy('Edit gym')
+ success_url = reverse_lazy('core:gym-list')
+ permission_required = 'core.change_gym'
+
+ def get_context_data(self, **kwargs):
+ '''
+ Send some additional data to the template
+ '''
+ context = super(GymUpdateView, self).get_context_data(**kwargs)
+ context['form_action'] = reverse('core:gym-edit', kwargs={'pk': self.object.id})
+ context['title'] = _(u'Edit {0}'.format(self.object))
+ return context
+
+
+class GymDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
+ '''
+ View to delete an existing gym
+ '''
+
+ model = Gym
+ success_url = reverse_lazy('core:gym-list')
+ permission_required = 'core.delete_gym'
+
+ def get_context_data(self, **kwargs):
+ '''
+ Send some additional data to the template
+ '''
+ context = super(GymDeleteView, self).get_context_data(**kwargs)
+ context['title'] = _(u'Delete {0}?'.format(self.object))
+ context['form_action'] = reverse('core:gym-delete', kwargs={'pk': self.kwargs['pk']})
+ return context
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index b20102ce1..daef2eafe 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -16,25 +16,27 @@
import logging
-from django.shortcuts import render
-from django.http import HttpResponseRedirect
+from django.shortcuts import render, get_object_or_404
+from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.core.context_processors import csrf
from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext as _, ugettext_lazy
from django.utils import translation
from django.contrib.auth import authenticate
from django.contrib.auth import login as django_login
from django.contrib.auth import logout as django_logout
from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import User as Django_User
+from django.contrib.auth.models import User as Django_User, User
from django.contrib.auth.views import login as django_loginview
from django.contrib import messages
+from django.views.generic import RedirectView, UpdateView, DetailView
from rest_framework.authtoken.models import Token
from wger.core.models import Language
from wger.utils.constants import USER_TAB
+from wger.utils.generic_views import WgerPermissionMixin, WgerFormMixin
from wger.utils.user_agents import check_request_amazon, check_request_android
-from wger.core.forms import UserPreferencesForm
+from wger.core.forms import UserPreferencesForm, UserPersonalInformationForm
from wger.core.forms import PasswordConfirmationForm
from wger.core.forms import UserEmailForm
from wger.core.forms import RegistrationForm
@@ -76,6 +78,53 @@ def delete(request):
return render(request, 'user/delete_account.html', context)
+@login_required()
+def trainer_login(request, user_pk):
+ '''
+ Allows a trainer to 'log in' as the selected user
+ '''
+ user = get_object_or_404(User, pk=user_pk)
+ orig_user_pk = request.user.pk
+
+ # Changing only between the same gym
+ if request.user.userprofile.gym != user.userprofile.gym:
+ return HttpResponseForbidden()
+
+ # No changing if identity is not set
+ if not request.user.has_perm('core.gym_trainer') \
+ and not request.session.get('trainer.identity'):
+ return HttpResponseForbidden()
+
+ # Changing between trainers or managers is not allowed
+ if request.user.has_perm('core.gym_trainer') \
+ and (user.has_perm('core.gym_trainer')
+ or user.has_perm('core.manage_gym')
+ or user.has_perm('core.manage_gyms')):
+ return HttpResponseForbidden()
+
+ # Check if we're switching back to our original account
+ own = False
+ if (user.has_perm('core.gym_trainer')
+ or user.has_perm('core.manage_gym')
+ or user.has_perm('core.manage_gyms')):
+ own = True
+
+ # Note: it seems we have to manually set the authentication backend here
+ # - https://docs.djangoproject.com/en/1.6/topics/auth/default/#auth-web-requests
+ # - http://stackoverflow.com/questions/3807777/django-login-without-authenticating
+ if own:
+ del(request.session['trainer.identity'])
+ user.backend = 'django.contrib.auth.backends.ModelBackend'
+ django_login(request, user)
+
+ if not own:
+ request.session['trainer.identity'] = orig_user_pk
+ return HttpResponseRedirect(reverse('core:index'))
+ else:
+ return HttpResponseRedirect(reverse('core:gym-user-list',
+ kwargs={'pk': user.userprofile.gym_id}))
+
+
def logout(request):
'''
Logout the user. For temporary users, delete them.
@@ -160,20 +209,16 @@ def preferences(request):
form = UserPreferencesForm(instance=request.user.userprofile)
# Process the email form
- #
- # this is a bit ugly, but we need to take special care here, only instatiating
- # the form when the user changes its password, otherwise the email form will
- # check the adress for uniqueness and fail, because it will find one user (the
- # current one) using it. But if he changes it, we want to check that nobody else
- # has that email
- if request.method == 'POST' and request.POST["email"] != request.user.email:
- email_form = UserEmailForm(data=request.POST, instance=request.user)
+ if request.method == 'POST':
+ email_form = UserPersonalInformationForm(data=request.POST, instance=request.user)
+
if email_form.is_valid() and redirect:
- request.user.email = email_form.cleaned_data['email']
- request.user.save()
+ email_form.save()
redirect = True
+ else:
+ redirect = False
else:
- email_form = UserEmailForm(instance=request.user)
+ email_form = UserPersonalInformationForm(instance=request.user)
template_data['form'] = form
template_data['email_form'] = email_form
@@ -185,6 +230,90 @@ def preferences(request):
return render(request, 'user/preferences.html', template_data)
+class UserDeactivateView(WgerPermissionMixin, RedirectView):
+ '''
+ Deactivates a user
+ '''
+ permanent = False
+ model = User
+ permission_required = ('core.manage_gym', 'core.gym_trainer')
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Only managers and trainers for this gym can access the members
+ '''
+ edit_user = get_object_or_404(User, pk=self.kwargs['pk'])
+ if (request.user.has_perm('core.manage_gym') or request.user.has_perm('core.gym_trainer')
+ and request.user.userprofile.gym_id == edit_user.userprofile.gym_id):
+ return super(UserDeactivateView, self).dispatch(request, *args, **kwargs)
+ return HttpResponseForbidden()
+
+ def get_redirect_url(self, pk):
+ edit_user = get_object_or_404(User, pk=pk)
+ edit_user.is_active = False
+ edit_user.save()
+ messages.success(self.request, _('The user was successfully deactivated'))
+ return reverse('core:user-overview', kwargs=({'pk': pk}))
+
+
+class UserActivateView(WgerPermissionMixin, RedirectView):
+ '''
+ Activates a previously deactivated user
+ '''
+ permanent = False
+ model = User
+ permission_required = ('core.manage_gym', 'core.gym_trainer')
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Only managers and trainers for this gym can access the members
+ '''
+ edit_user = get_object_or_404(User, pk=self.kwargs['pk'])
+ if (request.user.has_perm('core.manage_gym') or request.user.has_perm('core.gym_trainer')
+ and request.user.userprofile.gym_id == edit_user.userprofile.gym_id):
+ return super(UserActivateView, self).dispatch(request, *args, **kwargs)
+ return HttpResponseForbidden()
+
+ def get_redirect_url(self, pk):
+ edit_user = get_object_or_404(User, pk=pk)
+ edit_user.is_active = True
+ edit_user.save()
+ messages.success(self.request, _('The user was successfully activated'))
+ return reverse('core:user-overview', kwargs=({'pk': pk}))
+
+
+class UserEditView(WgerFormMixin, UpdateView):
+ '''
+ View to update the personal information of an user by an admin
+ '''
+
+ model = User
+ title = ugettext_lazy('Edit user')
+ permission_required = 'core.manage_gym'
+ form_class = UserPersonalInformationForm
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Only managers and trainers for this gym can access the members
+ '''
+ if request.user.userprofile.gym == self.get_object().userprofile.gym:
+ return super(UserEditView, self).dispatch(request, *args, **kwargs)
+ else:
+ return HttpResponseForbidden()
+
+ def get_success_url(self):
+ return reverse('core:user-overview', kwargs={'pk': self.kwargs['pk']})
+
+ def get_context_data(self, **kwargs):
+ '''
+ Send some additional data to the template
+ '''
+ context = super(UserEditView, self).get_context_data(**kwargs)
+ context['form_action'] = reverse('core:user-edit', kwargs={'pk': self.object.id})
+ context['title'] = _('Edit {0}'.format(self.object))
+ return context
+
+
@login_required
def api_key(request):
'''
@@ -210,3 +339,22 @@ def api_key(request):
context['token'] = token
return render(request, 'user/api_key.html', context)
+
+
+class UserDetailView(WgerPermissionMixin, DetailView):
+ '''
+ Overview of all available gyms
+ '''
+ model = User
+ permission_required = ('core.manage_gym', 'core.gym_trainer')
+ template_name = 'user/overview.html'
+ context_object_name = 'current_user'
+
+ def dispatch(self, request, *args, **kwargs):
+ '''
+ Only managers for this gym can access the members
+ '''
+ if request.user.userprofile.gym == self.get_object().userprofile.gym:
+ return super(UserDetailView, self).dispatch(request, *args, **kwargs)
+ else:
+ return HttpResponseForbidden()
diff --git a/wger/manager/fixtures/test-user-data.json b/wger/manager/fixtures/test-user-data.json
index da4e1ccff..4f92c4e6d 100644
--- a/wger/manager/fixtures/test-user-data.json
+++ b/wger/manager/fixtures/test-user-data.json
@@ -184,6 +184,36 @@
"delete_ingredientweightunit",
"nutrition",
"ingredientweightunit"
+ ],
+ [
+ "add_gym",
+ "core",
+ "gym"
+ ],
+ [
+ "change_gym",
+ "core",
+ "gym"
+ ],
+ [
+ "delete_gym",
+ "core",
+ "gym"
+ ],
+ [
+ "gym_trainer",
+ "core",
+ "gym"
+ ],
+ [
+ "manage_gym",
+ "core",
+ "gym"
+ ],
+ [
+ "manage_gyms",
+ "core",
+ "gym"
]
]
}
@@ -269,8 +299,9 @@
"workout_reminder": 20,
"workout_duration": 8,
"notification_language": 1,
- "timer_active": true,
- "timer_pause": 90
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
}
},
{
@@ -296,8 +327,9 @@
"workout_reminder": 14,
"workout_duration": 12,
"notification_language": 2,
- "timer_active": true,
- "timer_pause": 90
+ "timer_active": true,
+ "timer_pause": 90,
+ "gym": 1
}
},
{
diff --git a/wger/manager/templatetags/wger_extras.py b/wger/manager/templatetags/wger_extras.py
index afb5c15d5..8aef95c4c 100644
--- a/wger/manager/templatetags/wger_extras.py
+++ b/wger/manager/templatetags/wger_extras.py
@@ -129,6 +129,19 @@ def auto_link_css(flavour='full', css=''):
return 'class="{0}"'.format(css)
+def format_username(user):
+ '''
+ Formats the username according to the information available
+ '''
+ if user.get_full_name():
+ return user.get_full_name()
+ elif user.email:
+ return user.email
+ else:
+ return user.username
+
+
#
# Form utils
#
diff --git a/wger/manager/tests/testcase.py b/wger/manager/tests/testcase.py
index 7993f9124..189b9675b 100644
--- a/wger/manager/tests/testcase.py
+++ b/wger/manager/tests/testcase.py
@@ -53,6 +53,7 @@ class BaseTestCase(object):
fixtures = ('days_of_week',
'test-languages',
'test-licenses',
+ 'test-gyms',
'test-user-data',
'test-apikeys',
'test-weight-data',
diff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.html
index 5dbb1762b..f6b4d2abc 100644
--- a/wger/software/templates/changelog.html
+++ b/wger/software/templates/changelog.html
@@ -12,6 +12,12 @@
<ul>
<li>New Translation: Dutch (many thanks to David Machiels!)</li>
+ <li>Add support for gym management
+ <ul>
+ <li>Gym managers can create and manage gyms</li>
+ <li>Trainers can see the gym's users and their routines</li>
+ </ul>
+ </li>
<li>Reduce amount of CSS and JS libraries by using bootstrap as much as possible</li>
<li>Improvements to the REST API
<ul>
diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py
index 854e75ba6..4fe85ac3e 100644
--- a/wger/utils/context_processor.py
+++ b/wger/utils/context_processor.py
@@ -55,7 +55,10 @@ def processor(request):
'no_messages': request.META.get('HTTP_X_WGER_NO_MESSAGES', False),
# Default cache time for template fragment caching
- 'cache_timeout': settings.CACHES['default']['TIMEOUT']
+ 'cache_timeout': settings.CACHES['default']['TIMEOUT'],
+
+ # Used for logged in trainers
+ 'trainer_identity': request.session.get('trainer.identity'),
}
# Pseudo-intelligent navigation here
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index cb9946e3f..8a6a0eb79 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -45,7 +45,10 @@ class WgerPermissionMixin(object):
permission_required = False
'''
- The name of the permission required to access this class
+ The name of the permission required to access this class.
+
+ This can be a string or a tuple, in the latter case having any of the permissions
+ listed is enough to access the resource
'''
login_required = False
@@ -62,8 +65,17 @@ class WgerPermissionMixin(object):
if not request.user.is_authenticated():
return HttpResponseRedirect(reverse_lazy('core:login') + '?next=%s' % request.path)
- if self.permission_required and not request.user.has_perm(self.permission_required):
- return HttpResponseForbidden()
+ if self.permission_required:
+ has_permission = False
+ if self.permission_required.__class__.__name__ == 'tuple':
+ for permission in self.permission_required:
+ if request.user.has_perm(permission):
+ has_permission = True
+ elif request.user.has_perm(self.permission_required):
+ has_permission = True
+
+ if not has_permission:
+ return HttpResponseForbidden('You are not allowed to access this object')
# Dispatch normally
return super(WgerPermissionMixin, self).dispatch(request, *args, **kwargs)
diff --git a/wger/utils/helpers.py b/wger/utils/helpers.py
index 0e59ccb89..6862b946c 100644
--- a/wger/utils/helpers.py
+++ b/wger/utils/helpers.py
@@ -14,6 +14,9 @@
#
# You should have received a copy of the GNU Affero General Public License
+import os
+import random
+import string
import logging
import decimal
import json
@@ -25,7 +28,6 @@ from django.contrib.auth.tokens import default_token_generator
from django.utils.encoding import force_bytes
from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode
-
logger = logging.getLogger('wger.custom')
@@ -107,3 +109,19 @@ def check_token(uidb64, token):
return True
return False
+
+
+def password_generator(length=15):
+ '''
+ A simple password generator
+
+ Also removes some 'problematic' characters like O and 0
+ :param length: the length of the password
+ :return: the generated password
+ '''
+ chars = string.ascii_letters + string.digits
+ random.seed = (os.urandom(1024))
+ for char in ('I', '1', 'O', '0', 'o'):
+ chars = chars.replace(char, '')
+
+ return ''.join(random.choice(chars) for i in range(length))