Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow trainers to add notes to users
Roland Geiderf26a6be485d5
diff --git a/extras/scripts/filter-fixtures.py b/extras/scripts/filter-fixtures.pyindex 786050d99..362715760 100644--- a/extras/scripts/filter-fixtures.py+++ b/extras/scripts/filter-fixtures.py@@ -61,6 +61,7 @@ filter_dump(data, ('gym.gym',), 'gyms.json')filter_dump(data, ('gym.gymconfig',), 'gym_config.json')filter_dump(data, ('gym.gymadminconfig',), 'gym_adminconfig.json')filter_dump(data, ('gym.gymuserconfig',), 'gym_userconfig.json')+filter_dump(data, ('gym.adminusernote',), 'gym_admin_user_notes.json')## Corediff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex ddcf28284..d4d8de47f 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -231,15 +231,55 @@{% endif %}</table>+++{# #}+{# Admin notes #}+{# #}+<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_note:list' current_user.pk %}">{% trans "Overview" %}</a>+ </li>+ <li>+ <a href="{% url 'gym:admin_note:add' current_user.pk %}" class="wger-modal-dialog">{% trans "Add"%}</a>+ </li>+ </ul>+</div>+++<h4>{% trans "Notes" %}</h4>+<table class="table">+ {% for note in admin_notes %}+ <tr>+ <td>+ {{ note.timestamp_created }}+ </td>+ <td>+ {{ note.note|truncatewords:10 }}+ </td>+ </tr>+ {% empty %}+ <tr>+ <td>+ {% trans "Nothing found" %}+ </td>+ </tr>+ {% endfor %}+</table>+{# #}{# Gym 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:user_config:edit' current_user.gymuserconfig.pk %}" class="wger-modal-dialog">{% trans "Edit"%}</a></li>diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 5769a7d83..ba8823a61 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -32,6 +32,7 @@ from django.contrib.auth.views import login as django_loginviewfrom django.contrib import messagesfrom django.views.generic import RedirectView, UpdateView, DetailViewfrom rest_framework.authtoken.models import Token+from wger.gym.models import AdminUserNotefrom wger.utils.constants import USER_TABfrom wger.utils.generic_views import WgerPermissionMixin@@ -425,4 +426,5 @@ class UserDetailView(WgerPermissionMixin, DetailView):context['nutrition_plans'] = NutritionPlan.objects.filter(user=self.object)\.order_by('-creation_date')[:5]context['session'] = WorkoutSession.objects.filter(user=self.object).order_by('-date')[:10]+ context['admin_notes'] = AdminUserNote.objects.filter(member=self.object)[:5]return contextdiff --git a/wger/gym/migrations/0008_auto__add_adminusernote.py b/wger/gym/migrations/0008_auto__add_adminusernote.pynew file mode 100644index 000000000..0a20cb1c7--- /dev/null+++ b/wger/gym/migrations/0008_auto__add_adminusernote.py@@ -0,0 +1,107 @@+# -*- 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 'AdminUserNote'+ db.create_table(u'gym_adminusernote', (+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),+ ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='adminusernote_user', to=orm['auth.User'])),+ ('member', self.gf('django.db.models.fields.related.ForeignKey')(related_name='adminusernote_member', to=orm['auth.User'])),+ ('timestamp_created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),+ ('timestamp_edited', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),+ ('note', self.gf('django.db.models.fields.TextField')()),+ ))+ db.send_create_signal(u'gym', ['AdminUserNote'])+++ def backwards(self, orm):+ # Deleting model 'AdminUserNote'+ db.delete_table(u'gym_adminusernote')+++ 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.adminusernote': {+ 'Meta': {'ordering': "['-timestamp_created']", 'object_name': 'AdminUserNote'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'adminusernote_member'", 'to': u"orm['auth.User']"}),+ 'note': ('django.db.models.fields.TextField', [], {}),+ 'timestamp_created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),+ 'timestamp_edited': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'adminusernote_user'", 'to': u"orm['auth.User']"})+ },+ 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'})+ },+ u'gym.gymuserconfig': {+ 'Meta': {'unique_together': "(('gym', 'user'),)", 'object_name': 'GymUserConfig'},+ 'gym': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['gym.Gym']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'include_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 filediff --git a/wger/gym/models.py b/wger/gym/models.pyindex f904ba4d7..8f5583787 100644--- a/wger/gym/models.py+++ b/wger/gym/models.py@@ -209,3 +209,51 @@ class GymUserConfig(AbstractGymUserConfigModel, m.Model):trainers in the gym.'''return None+++class AdminUserNote(m.Model):+ '''+ Administrator notes about a member+ '''++ class Meta:+ '''+ Order by time+ '''+ ordering = ["-timestamp_created", ]++ user = m.ForeignKey(User,+ editable=False,+ related_name='adminusernote_user')+ '''+ User this note belongs to+ '''++ member = m.ForeignKey(User,+ editable=False,+ related_name='adminusernote_member')+ '''+ Gym member this note refers to+ '''++ timestamp_created = m.DateTimeField(auto_now_add=True)+ '''+ Time when this note was created+ '''++ timestamp_edited = m.DateTimeField(auto_now=True)+ '''+ Last time when this note was edited+ '''++ note = m.TextField(verbose_name=_('Note'))+ '''+ Actual note+ '''++ def get_owner_object(self):+ '''+ While the model has a user foreign key, this is editable by all+ trainers in the gym.+ '''+ return Nonediff --git a/wger/gym/templates/admin_notes/list.html b/wger/gym/templates/admin_notes/list.htmlnew file mode 100644index 000000000..449f16be9--- /dev/null+++ b/wger/gym/templates/admin_notes/list.html@@ -0,0 +1,58 @@+{% extends "base.html" %}+{% load i18n %}+{% load staticfiles %}+{% load wger_extras %}++{% block title %}{{ member|format_username }} - {% trans "User notes" %}{% endblock %}+++{% block content %}++<ul class="list-group">+ {% for note in adminusernote_list %}+ <li class="list-group-item ">+ <div class="pull-right">+ <a href="{% url 'gym:admin_note:delete' note.pk %}"+ class="btn btn-danger btn-xs wger-modal-dialog">+ {% trans 'Delete' %}+ </a>+ <a href="{% url 'gym:admin_note:edit' note.pk %}"+ class="btn btn-default btn-xs wger-modal-dialog">+ {% trans 'Edit' %}+ </a>+ </div>++ <h4 class="list-group-item-heading">{{ note.timestamp_created }} - {{ note.user|format_username }}</h4>+ <p class="list-group-item-text">{{ note.note }}</p>+ </li>+ {% endfor %}+</ul>+{% endblock %}+++++{% block sidebar %}+<h4>{% trans "Options" %}</h4>+<p>+ <a href="{% url 'gym:admin_note:add' member.pk %}"+ {% auto_link_css flavour "wger-modal-dialog" %}>+ <img src="{% static 'images/icons/new.svg' %}"+ width="32"+ height="32"+ alt="{% trans 'Add' %}"+ title="{% trans 'Add' %}">+ {% trans "Add" %}+ </a>+</p>++<p>+ <a href="{% url 'core:user-overview' member.pk %}" {% auto_link_css flavour %}>+ <img src="{% static 'images/icons/list.svg' %}"+ width="32"+ height="32"+ alt="{% trans 'Back' context 'like forward/back not chest/back' %}">+ {% trans 'Back' context 'like forward/back not chest/back' %}+</a>+</p>+{% endblock %}diff --git a/wger/gym/urls.py b/wger/gym/urls.pyindex 9f129be18..197e14c89 100644--- a/wger/gym/urls.py+++ b/wger/gym/urls.py@@ -21,6 +21,7 @@ from wger.gym.views import gymfrom wger.gym.views import configfrom wger.gym.views import admin_configfrom wger.gym.views import user_config+from wger.gym.views import admin_notes# 'sub patterns' for gyms@@ -73,6 +74,22 @@ patterns_userconfig = patterns('',name='edit'),)+# 'sub patterns' for admin notes+patterns_admin_notes = patterns('',+ url(r'^list/user/(?P<user_pk>\d+)$',+ admin_notes.ListView.as_view(),+ name='list'),+ url(r'^add/user/(?P<user_pk>\d+)$',+ admin_notes.AddView.as_view(),+ name='add'),+ url(r'^(?P<pk>\d+)/edit$',+ admin_notes.UpdateView.as_view(),+ name='edit'),+ url(r'^(?P<pk>\d+)/delete$',+ admin_notes.DeleteView.as_view(),+ name='delete'),+)+## All patterns for this app#@@ -82,4 +99,5 @@ urlpatterns = patterns('',url(r'^config/', include(patterns_gymconfig, namespace="config")),url(r'^admin-config/', include(patterns_adminconfig, namespace="admin_config")),url(r'^user-config/', include(patterns_userconfig, namespace="user_config")),+ url(r'^notes/', include(patterns_admin_notes, namespace="admin_note")),)diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.pyindex af142d7c1..a1819b7d6 100644--- a/wger/gym/views/admin_config.py+++ b/wger/gym/views/admin_config.py@@ -13,10 +13,10 @@# GNU General Public License for more details.## You should have received a copy of the GNU Affero General Public License+import loggingfrom django.core.urlresolvers import reverse-from django.http.response import HttpResponseForbiddenfrom django.utils.translation import ugettext as _from django.views.generic import UpdateViewdiff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.pynew file mode 100644index 000000000..c2306999b--- /dev/null+++ b/wger/gym/views/admin_notes.py@@ -0,0 +1,187 @@+# -*- 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.core.urlresolvers import reverse_lazy+from django.contrib.auth.models import User+from django.http.response import HttpResponseForbidden+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.gym.models import Gym+from wger.gym.models import AdminUserNote+from wger.utils.generic_views import WgerFormMixin+from wger.utils.generic_views import WgerDeleteMixin+from wger.utils.generic_views import WgerPermissionMixin+++logger = logging.getLogger('wger.custom')+++class ListView(WgerPermissionMixin, ListView):+ '''+ Overview of all available admin notes+ '''+ model = AdminUserNote+ permission_required = 'gym.add_adminusernote'+ template_name = 'admin_notes/list.html'+ member = None++ def get_queryset(self):+ '''+ Only notes for current user+ '''+ return AdminUserNote.objects.filter(member_id=self.kwargs['user_pk'])++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only add notes to users in own gym+ '''+ user = User.objects.get(pk=self.kwargs['user_pk'])+ self.member = user+ gym_id = user.userprofile.gym_id+ if gym_id != request.user.userprofile.gym_id:+ return HttpResponseForbidden()+ return super(ListView, self).dispatch(request, *args, **kwargs)++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(ListView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('gym:admin_note:add',+ kwargs={'user_pk': self.kwargs['user_pk']})+ context['member'] = self.member+ return context+++class AddView(WgerFormMixin, CreateView):+ '''+ View to add a new admin note+ '''++ model = AdminUserNote+ title = ugettext_lazy('Add note')+ permission_required = 'gym.add_adminusernote'+ member = None++ def get_success_url(self):+ '''+ Redirect back to user page+ '''+ return reverse('gym:admin_note:list', kwargs={'user_pk': self.member.pk})++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only add notes to users in own gym+ '''+ user = User.objects.get(pk=self.kwargs['user_pk'])+ self.member = user+ gym_id = user.userprofile.gym_id+ if gym_id != request.user.userprofile.gym_id:+ return HttpResponseForbidden()+ return super(AddView, self).dispatch(request, *args, **kwargs)++ def form_valid(self, form):+ '''+ Set user instances+ '''+ form.instance.member = self.member+ form.instance.user = self.request.user+ return super(AddView, self).form_valid(form)++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(AddView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('gym:admin_note:add',+ kwargs={'user_pk': self.kwargs['user_pk']})+ return context+++class UpdateView(WgerFormMixin, UpdateView):+ '''+ View to update an existing admin note+ '''++ model = AdminUserNote+ permission_required = 'gym.change_adminusernote'++ def get_success_url(self):+ '''+ Redirect back to user page+ '''+ return reverse('gym:admin_note:list', kwargs={'user_pk':+ self.object.member.pk})++ def dispatch(self, request, *args, **kwargs):+ '''+ Only trainers for this gym can edit user notes+ '''++ note = self.get_object()+ if note.member.userprofile.gym_id != request.user.userprofile.gym_id:+ return HttpResponseForbidden()+ return super(UpdateView, self).dispatch(request, *args, **kwargs)++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(UpdateView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('gym:admin_note:edit', kwargs={'pk': self.object.id})+ context['title'] = _(u'Edit {0}'.format(self.object))+ return context+++class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):+ '''+ View to delete an existing admin note+ '''++ model = AdminUserNote+ permission_required = 'gym.delete_adminusernote'++ def get_success_url(self):+ '''+ Redirect back to user page+ '''+ return reverse('gym:admin_note:list', kwargs={'user_pk': self.object.member.pk})++ def dispatch(self, request, *args, **kwargs):+ '''+ Only trainers for this gym can delete user notes+ '''++ note = self.get_object()+ if note.member.userprofile.gym_id != request.user.userprofile.gym_id:+ return HttpResponseForbidden()+ return super(DeleteView, self).dispatch(request, *args, **kwargs)++ def get_context_data(self, **kwargs):+ '''+ Send some additional data to the template+ '''+ context = super(DeleteView, self).get_context_data(**kwargs)+ context['title'] = _(u'Delete {0}?'.format(self.object))+ context['form_action'] = reverse('gym:admin_note:delete', kwargs={'pk': self.kwargs['pk']})+ return context