Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add a field to user documents for additional notes

Roland Geidere6a9205633c5
diff --git a/wger/gym/migrations/0010_auto__add_field_userdocument_note.py b/wger/gym/migrations/0010_auto__add_field_userdocument_note.py
new file mode 100644
index 000000000..e9f86a001
--- /dev/null
+++ b/wger/gym/migrations/0010_auto__add_field_userdocument_note.py
@@ -0,0 +1,113 @@
+# -*- 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 field 'UserDocument.note'
+ db.add_column(u'gym_userdocument', 'note',
+ self.gf('django.db.models.fields.TextField')(null=True, blank=True),
+ keep_default=False)
+
+
+ def backwards(self, orm):
+ # Deleting field 'UserDocument.note'
+ db.delete_column(u'gym_userdocument', 'note')
+
+
+ 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'}),
+ 'note': ('django.db.models.fields.TextField', [], {'null': 'True', '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 file
diff --git a/wger/gym/models.py b/wger/gym/models.py
index cf914797c..69f632d55 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -324,6 +324,13 @@ class UserDocument(m.Model):
Name or description
'''
+ note = m.TextField(verbose_name=_('Note'),
+ blank=True,
+ null=True)
+ '''
+ Note with additional information
+ '''
+
def __unicode__(self):
'''
Return a more human-readable representation
diff --git a/wger/gym/templates/document/list.html b/wger/gym/templates/document/list.html
index 28f30aec2..2693759e0 100644
--- a/wger/gym/templates/document/list.html
+++ b/wger/gym/templates/document/list.html
@@ -27,14 +27,18 @@
{% endif %}
{% if perms.gym.change_userdocument %}
<a href="{% url 'gym:document:edit' document.pk %}"
- class="btn btn-default btn-xs wger-modal-dialog">
+ class="btn btn-default btn-xs">
{% 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>
+ <h4 class="list-group-item-heading">{{ document.name }}</h4>
+
+ <p class="list-group-item-text">{{ document.timestamp_created }} - {{ document.user|format_username }}</p>
+ {% if document.note %}
+ <p class="list-group-item-text">{{ document.note }}</p>
+ {% endif %}
</li>
{% endfor %}
</ul>
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index eda9949e8..06c3005fa 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -52,7 +52,7 @@ $(document).ready( function () {
{% endif %}
{% empty %}
<tr>
- <td colspan="2">{% trans "No users for this gym found" %}</td>
+ <td colspan="4">{% trans "No users for this gym found" %}</td>
</tr>
{% endfor %}
</tbody>