Self hosted FLOSS fitness/workout, nutrition and weight tracker
First implementation of documents for gym members
Roland Geiderb8568c8c4986
diff --git a/wger/core/fixtures/groups.json b/wger/core/fixtures/groups.jsonindex 75722fbcb..ddd246fcd 100644--- a/wger/core/fixtures/groups.json+++ b/wger/core/fixtures/groups.json@@ -351,6 +351,21 @@"change_gymuserconfig","gym","gymuserconfig"+ ],+ [+ "add_userdocument",+ "gym",+ "userdocument"+ ],+ [+ "change_userdocument",+ "gym",+ "userdocument"+ ],+ [+ "delete_userdocument",+ "gym",+ "userdocument"]]}diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.htmlindex 053f8b675..a521bfd86 100644--- a/wger/core/templates/user/overview.html+++ b/wger/core/templates/user/overview.html@@ -257,7 +257,7 @@</ul></div>-<h4>{% trans "Notes" %}</h4>+<h4>{% trans "Notes" %} <small>({% trans "last 5" %})</small></h4><table class="table">{% for note in admin_notes %}<tr>@@ -278,6 +278,57 @@</table>{% endif %}+++{# #}+{# Documents #}+{# #}+{% if perms.gym.add_userdocument %}+<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:document:list' current_user.pk %}">{% trans "Overview" %}</a>+ </li>+ <li>+ <a href="{% url 'gym:document:add' current_user.pk %}">{% trans "Add"%}</a>+ </li>+ </ul>+</div>++<h4>{% trans "Documents" %} <small>({% trans "last 5" %})</small></h4>+<table class="table">+ {% for document in current_user.userdocument_member.all %}+ <tr>+ <td>+ <a href="{{ document.document.url }}"+ class="btn btn-default btn-xs"+ title="{% trans 'Download' %}"+ download="{{ document.original_name }}">+ <span class="glyphicon glyphicon-download"></span>+ </a>+ </td>+ <td>+ {{ document.timestamp_created }}+ </td>+ <td>+ {{ document.name }}+ </td>+ </tr>+ {% empty %}+ <tr>+ <td>+ {% trans "Nothing found" %}+ </td>+ </tr>+ {% endfor %}+</table>+{% endif %}+++{# #}{# Gym configuration #}{# #}diff --git a/wger/gym/migrations/0009_auto__add_userdocument.py b/wger/gym/migrations/0009_auto__add_userdocument.pynew file mode 100644index 000000000..d3d8f7752--- /dev/null+++ b/wger/gym/migrations/0009_auto__add_userdocument.py@@ -0,0 +1,120 @@+# -*- 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 'UserDocument'+ db.create_table(u'gym_userdocument', (+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),+ ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='userdocument_user', to=orm['auth.User'])),+ ('member', self.gf('django.db.models.fields.related.ForeignKey')(related_name='userdocument_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)),+ ('document', self.gf('django.db.models.fields.files.FileField')(max_length=100)),+ ('original_name', self.gf('django.db.models.fields.CharField')(max_length=128)),+ ('name', self.gf('django.db.models.fields.CharField')(max_length=60, blank=True)),+ ))+ db.send_create_signal(u'gym', ['UserDocument'])+++ def backwards(self, orm):+ # Deleting model 'UserDocument'+ db.delete_table(u'gym_userdocument')+++ 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'})+ },+ u'gym.userdocument': {+ 'Meta': {'ordering': "['-timestamp_created']", 'object_name': 'UserDocument'},+ 'document': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'member': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'userdocument_member'", 'to': u"orm['auth.User']"}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),+ 'original_name': ('django.db.models.fields.CharField', [], {'max_length': '128'}),+ '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': "'userdocument_user'", 'to': u"orm['auth.User']"})+ }+ }++ complete_apps = ['gym']\ No newline at end of filediff --git a/wger/gym/models.py b/wger/gym/models.pyindex 8f5583787..0a351414b 100644--- a/wger/gym/models.py+++ b/wger/gym/models.py@@ -14,6 +14,7 @@## You should have received a copy of the GNU Affero General Public License+import uuidfrom django.db import models as mfrom django.contrib.auth.models import User@@ -257,3 +258,84 @@ class AdminUserNote(m.Model):trainers in the gym.'''return None+++def gym_document_upload_dir(instance, filename):+ '''+ Returns the upload target for documents+ '''+ return "gym/documents/{0}/{1}/{2}".format(instance.member.userprofile.gym.id,+ instance.member.id,+ uuid.uuid4())+++class UserDocument(m.Model):+ '''+ Model for a document+ '''++ class Meta:+ '''+ Order by time+ '''+ ordering = ["-timestamp_created", ]++ user = m.ForeignKey(User,+ editable=False,+ related_name='userdocument_user')+ '''+ User this note belongs to+ '''++ member = m.ForeignKey(User,+ editable=False,+ related_name='userdocument_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+ '''++ document = m.FileField(verbose_name=_('Document'),+ upload_to=gym_document_upload_dir)+ '''+ Uploaded document+ '''++ original_name = m.CharField(max_length=128,+ editable=False)+ '''+ Original document name when uploaded+ '''++ name = m.CharField(max_length=60,+ verbose_name=_('Name'),+ help_text=_('Will use file name if nothing provided'),+ blank=True)+ '''+ Name or description+ '''++ def __unicode__(self):+ '''+ Return a more human-readable representation+ '''+ if self.name != self.original_name:+ return "{} ({})".format(self.name, self.original_name)+ else:+ return "{}".format(self.name)++ 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/document/list.html b/wger/gym/templates/document/list.htmlnew file mode 100644index 000000000..28f30aec2--- /dev/null+++ b/wger/gym/templates/document/list.html@@ -0,0 +1,70 @@+{% extends "base.html" %}+{% load i18n %}+{% load staticfiles %}+{% load wger_extras %}++{% block title %}{{ member|format_username }} - {% trans "Documents" %}{% endblock %}+++{% block content %}++<ul class="list-group">+ {% for document in userdocument_list %}+ <li class="list-group-item ">+ <div class="pull-right">+ <a href="{{ document.document.url }}"+ class="btn btn-default btn-xs"+ download="{{ document.original_name }}">+ <span class="glyphicon glyphicon-download"></span>+ {% trans 'Download' %}+ </a>++ {% if perms.gym.delete_userdocument %}+ <a href="{% url 'gym:document:delete' document.pk %}"+ class="btn btn-danger btn-xs wger-modal-dialog">+ {% trans 'Delete' %}+ </a>+ {% endif %}+ {% if perms.gym.change_userdocument %}+ <a href="{% url 'gym:document:edit' document.pk %}"+ class="btn btn-default btn-xs wger-modal-dialog">+ {% trans 'Edit' %}+ </a>+ {% endif %}+ </div>++ <h4 class="list-group-item-heading">{{ document.timestamp_created }} - {{ document.user|format_username }}</h4>+ <p class="list-group-item-text">{{ document.name }}</p>+ </li>+ {% endfor %}+</ul>+{% endblock %}+++++{% block sidebar %}+<h4>{% trans "Options" %}</h4>+{% if perms.gym.add_userdocument %}+<p>+ <a href="{% url 'gym:document:add' member.pk %}" {% auto_link_css flavour %}>+ <img src="{% static 'images/icons/new.svg' %}"+ width="32"+ height="32"+ alt="{% trans 'Add' %}"+ title="{% trans 'Add' %}">+ {% trans "Add" %}+ </a>+</p>+{% endif %}++<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 2bd82805e..3755fe836 100644--- a/wger/gym/urls.py+++ b/wger/gym/urls.py@@ -22,6 +22,7 @@ from wger.gym.views import configfrom wger.gym.views import admin_configfrom wger.gym.views import user_configfrom wger.gym.views import admin_notes+from wger.gym.views import document# 'sub patterns' for gyms@@ -93,6 +94,22 @@ patterns_admin_notes = patterns('',name='delete'),)+# 'sub patterns' for user documents+patterns_documents = patterns('',+ url(r'^list/user/(?P<user_pk>\d+)$',+ document.ListView.as_view(),+ name='list'),+ url(r'^add/user/(?P<user_pk>\d+)$',+ document.AddView.as_view(),+ name='add'),+ url(r'^(?P<pk>\d+)/edit$',+ document.UpdateView.as_view(),+ name='edit'),+ url(r'^(?P<pk>\d+)/delete$',+ document.DeleteView.as_view(),+ name='delete'),+)+## All patterns for this app#@@ -103,4 +120,5 @@ urlpatterns = patterns('',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")),+ url(r'^document/', include(patterns_documents, namespace="document")),)diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.pyindex 01f64eae2..882bffcbe 100644--- a/wger/gym/views/admin_notes.py+++ b/wger/gym/views/admin_notes.py@@ -58,8 +58,7 @@ class ListView(WgerPermissionMixin, ListView):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:+ if user.userprofile.gym_id != request.user.userprofile.gym_id:return HttpResponseForbidden()return super(ListView, self).dispatch(request, *args, **kwargs)diff --git a/wger/gym/views/document.py b/wger/gym/views/document.pynew file mode 100644index 000000000..fd70c445a--- /dev/null+++ b/wger/gym/views/document.py@@ -0,0 +1,198 @@+# -*- coding: utf-8 -*-++# This file is part of wger Workout Manager.+#+# wger Workout Manager is free software: you can redistribute it and/or modify+# it under the terms of the GNU Affero General Public License as published by+# the Free Software Foundation, either version 3 of the License, or+# (at your option) any later version.+#+# wger Workout Manager is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU Affero General Public License+import logging++from django.core.urlresolvers import reverse+from django.contrib.auth.models import User+from django.http.response import HttpResponseForbidden+from django.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.utils.generic_views import WgerFormMixin+from wger.utils.generic_views import WgerDeleteMixin+from wger.utils.generic_views import WgerPermissionMixin+from wger.gym.models import UserDocument+++logger = logging.getLogger('wger.custom')+++class ListView(WgerPermissionMixin, ListView):+ '''+ Overview of all available admin notes+ '''+ model = UserDocument+ permission_required = 'gym.add_userdocument'+ template_name = 'document/list.html'+ member = None++ def get_queryset(self):+ '''+ Only documents for current user+ '''+ return UserDocument.objects.filter(member_id=self.kwargs['user_pk'])++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only add notes to users in own gym+ '''+ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ user = User.objects.get(pk=self.kwargs['user_pk'])+ self.member = user+ if user.userprofile.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:document:add',+ kwargs={'user_pk': self.kwargs['user_pk']})+ context['member'] = self.member+ return context+++class AddView(WgerFormMixin, CreateView):+ '''+ View to add a new document+ '''++ model = UserDocument+ title = ugettext_lazy('Add note')+ permission_required = 'gym.add_userdocument'+ member = None++ def get_success_url(self):+ '''+ Redirect back to user page+ '''+ return reverse('gym:document:list', kwargs={'user_pk': self.member.pk})++ def dispatch(self, request, *args, **kwargs):+ '''+ Can only add documents to users in own gym+ '''+ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ user = User.objects.get(pk=self.kwargs['user_pk'])+ self.member = user+ if user.userprofile.gym_id != request.user.userprofile.gym_id:+ return HttpResponseForbidden()+ return super(AddView, self).dispatch(request, *args, **kwargs)++ def form_valid(self, form):+ '''+ Set user instances+ '''+ form.instance.original_name = form.cleaned_data['document'].name+ if not form.cleaned_data['name']:+ form.instance.name = form.cleaned_data['document'].name+ 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['enctype'] = 'multipart/form-data'+ context['form_action'] = reverse('gym:document:add',+ kwargs={'user_pk': self.kwargs['user_pk']})+ return context+++class UpdateView(WgerFormMixin, UpdateView):+ '''+ View to update an existing document+ '''++ model = UserDocument+ permission_required = 'gym.change_userdocument'++ def get_success_url(self):+ '''+ Redirect back to user page+ '''+ return reverse('gym:document:list', kwargs={'user_pk':+ self.object.member.pk})++ def dispatch(self, request, *args, **kwargs):+ '''+ Only trainers for this gym can edit user notes+ '''++ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ 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:document: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 document+ '''++ model = UserDocument+ permission_required = 'gym.delete_userdocument'++ def get_success_url(self):+ '''+ Redirect back to user page+ '''+ return reverse('gym:document:list', kwargs={'user_pk': self.object.member.pk})++ def dispatch(self, request, *args, **kwargs):+ '''+ Only trainers for this gym can delete documents+ '''+ if not request.user.is_authenticated():+ return HttpResponseForbidden()++ 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:document:delete', kwargs={'pk': self.kwargs['pk']})+ return context