Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add model and views for a workout session
Roland Geiderf4f73970732f
diff --git a/wger/manager/forms.py b/wger/manager/forms.pyindex 2cb4a9984..110b3084d 100644--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@ -26,15 +26,15 @@ from django.forms import CharFieldfrom django.forms import DecimalFieldfrom django.forms import ValidationErrorfrom django.forms import widgets-+from django.forms import ModelChoiceFieldfrom django.contrib.auth.forms import UserCreationFormfrom django.contrib.auth.models import User as Django_User-from django.utils.translation import ugettext as _from captcha.fields import ReCaptchaField-from wger.manager.models import UserProfile+from wger.exercises.models import Exercise+from wger.manager.models import UserProfile, WorkoutSessionfrom wger.manager.models import Workoutfrom wger.manager.models import Dayfrom wger.manager.models import Set@@ -157,9 +157,6 @@ class SetForm(ModelForm):self.fields['exercises'].help_text = _('You can search for more than one exercise, ''they will be grouped together for a superset.')-from wger.exercises.models import Exercise-from django.forms import ModelChoiceField-class SetFormMobile(ModelForm):'''@@ -201,3 +198,9 @@ class WorkoutLogForm(ModelForm):class Meta:model = WorkoutLogexclude = ('exercise', )+++class WorkoutSessionForm(ModelForm):+ class Meta:+ model = WorkoutSession+ exclude = ('time_start', 'time_end')diff --git a/wger/manager/migrations/0011_auto__add_workoutsession.py b/wger/manager/migrations/0011_auto__add_workoutsession.pynew file mode 100644index 000000000..d170ea6d8--- /dev/null+++ b/wger/manager/migrations/0011_auto__add_workoutsession.py@@ -0,0 +1,203 @@+# -*- coding: utf-8 -*-+import 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 'WorkoutSession'+ db.create_table(u'manager_workoutsession', (+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),+ ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),+ ('workout', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['manager.Workout'])),+ ('date', self.gf('wger.utils.fields.Html5DateField')(auto_now_add=True, blank=True)),+ ('notes', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),+ ('impression', self.gf('django.db.models.fields.CharField')(default='2', max_length=2)),+ ('time_start', self.gf('django.db.models.fields.TimeField')()),+ ('time_end', self.gf('django.db.models.fields.TimeField')()),+ ))+ db.send_create_signal(u'manager', ['WorkoutSession'])+++ def backwards(self, orm):+ # Deleting model 'WorkoutSession'+ db.delete_table(u'manager_workoutsession')+++ 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', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),+ 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', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),+ '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'exercises.equipment': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Equipment'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'exercises.exercise': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Exercise'},+ 'category': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.ExerciseCategory']"}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),+ 'description': ('django.db.models.fields.TextField', [], {'max_length': '2000'}),+ 'equipment': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['exercises.Equipment']", 'null': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Language']"}),+ 'muscles': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['exercises.Muscle']", 'symmetrical': 'False'}),+ 'muscles_secondary': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'secondary_muscles'", 'null': 'True', 'symmetrical': 'False', 'to': u"orm['exercises.Muscle']"}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),+ 'status': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '2'}),+ 'user': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'})+ },+ u'exercises.exercisecategory': {+ 'Meta': {'ordering': "['name']", 'object_name': 'ExerciseCategory'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})+ },+ u'exercises.language': {+ 'Meta': {'ordering': "['full_name']", 'object_name': 'Language'},+ 'full_name': ('django.db.models.fields.CharField', [], {'max_length': '30'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'short_name': ('django.db.models.fields.CharField', [], {'max_length': '2'})+ },+ u'exercises.muscle': {+ 'Meta': {'ordering': "['name']", 'object_name': 'Muscle'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_front': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})+ },+ u'manager.day': {+ 'Meta': {'object_name': 'Day'},+ 'day': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['manager.DaysOfWeek']", 'symmetrical': 'False'}),+ 'description': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'training': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.daysofweek': {+ 'Meta': {'ordering': "['pk']", 'object_name': 'DaysOfWeek'},+ 'day_of_week': ('django.db.models.fields.CharField', [], {'max_length': '9'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})+ },+ u'manager.schedule': {+ 'Meta': {'object_name': 'Schedule'},+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'is_loop': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),+ 'start_date': ('wger.utils.fields.Html5DateField', [], {'default': 'datetime.date.today'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})+ },+ u'manager.schedulestep': {+ 'Meta': {'ordering': "['order']", 'object_name': 'ScheduleStep'},+ 'duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '4', 'max_length': '1'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('django.db.models.fields.IntegerField', [], {'default': '1', 'max_length': '1'}),+ 'schedule': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Schedule']"}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.set': {+ 'Meta': {'ordering': "['order']", 'object_name': 'Set'},+ 'exerciseday': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Day']"}),+ 'exercises': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['exercises.Exercise']", 'symmetrical': 'False'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '1', 'null': 'True', 'blank': 'True'}),+ 'sets': ('wger.utils.fields.Html5IntegerField', [], {'default': '4'})+ },+ u'manager.setting': {+ 'Meta': {'ordering': "['order', 'id']", 'object_name': 'Setting'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'order': ('wger.utils.fields.Html5IntegerField', [], {'blank': 'True'}),+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),+ 'set': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Set']"})+ },+ u'manager.userprofile': {+ 'Meta': {'object_name': 'UserProfile'},+ 'age': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),+ 'calories': ('wger.utils.fields.Html5IntegerField', [], {'default': '2500', 'null': 'True'}),+ 'freetime_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),+ 'freetime_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'gender': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'height': ('wger.utils.fields.Html5IntegerField', [], {'max_length': '2', 'null': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'is_temporary': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),+ 'last_workout_notification': ('django.db.models.fields.DateField', [], {'null': 'True'}),+ 'notification_language': ('django.db.models.fields.related.ForeignKey', [], {'default': '2', 'to': u"orm['exercises.Language']"}),+ 'show_comments': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'show_english_ingredients': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),+ 'sleep_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '7', 'null': 'True'}),+ 'sport_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '3', 'null': 'True'}),+ 'sport_intensity': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '1', 'null': 'True'}),+ 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),+ 'work_hours': ('wger.utils.fields.Html5IntegerField', [], {'default': '8', 'null': 'True'}),+ 'work_intensity': ('django.db.models.fields.CharField', [], {'default': "'1'", 'max_length': '1', 'null': 'True'}),+ 'workout_duration': ('wger.utils.fields.Html5IntegerField', [], {'default': '12'}),+ 'workout_reminder': ('wger.utils.fields.Html5IntegerField', [], {'default': '14'}),+ 'workout_reminder_active': ('django.db.models.fields.BooleanField', [], {'default': 'False'})+ },+ u'manager.workout': {+ 'Meta': {'ordering': "['-creation_date']", 'object_name': 'Workout'},+ 'comment': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),+ 'creation_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})+ },+ u'manager.workoutlog': {+ 'Meta': {'ordering': "['date', 'reps']", 'object_name': 'WorkoutLog'},+ 'date': ('wger.utils.fields.Html5DateField', [], {}),+ 'exercise': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['exercises.Exercise']"}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'reps': ('wger.utils.fields.Html5IntegerField', [], {}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),+ 'weight': ('wger.utils.fields.Html5DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ },+ u'manager.workoutsession': {+ 'Meta': {'ordering': "['date']", 'object_name': 'WorkoutSession'},+ 'date': ('wger.utils.fields.Html5DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),+ 'impression': ('django.db.models.fields.CharField', [], {'default': "'2'", 'max_length': '2'}),+ 'notes': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),+ 'time_end': ('django.db.models.fields.TimeField', [], {}),+ 'time_start': ('django.db.models.fields.TimeField', [], {}),+ 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),+ 'workout': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['manager.Workout']"})+ }+ }++ complete_apps = ['manager']\ No newline at end of filediff --git a/wger/manager/models.py b/wger/manager/models.pyindex 2fb45c08d..01210283a 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -650,6 +650,78 @@ class WorkoutLog(models.Model):return self+class WorkoutSession(models.Model):+ '''+ Model for a workout session+ '''++ IMPRESSION_BAD = '1'+ IMPRESSION_NEUTRAL = '2'+ IMPRESSION_GOOD = '3'++ IMPRESSION = (+ (IMPRESSION_BAD, _("Bad")),+ (IMPRESSION_NEUTRAL, _('Neutral')),+ (IMPRESSION_GOOD, _('Good')),+ )++ user = models.ForeignKey(User,+ verbose_name=_('User'),+ editable=False)+ '''+ The user the workout session belongs to+ '''++ workout = models.ForeignKey(Workout,+ verbose_name=_('Workout'),+ editable=False)+ '''+ The workout the session belongs to+ '''++ date = Html5DateField(verbose_name=_('Date'),+ editable=False,+ auto_now_add=True)+ '''+ The date the workout session was performed+ '''++ notes = models.TextField(verbose_name=_('Notes'),+ null=True,+ blank=True,+ help_text=_('Any notes you might want to save about this workout '+ 'session.'))+ '''+ User notes about the workout+ '''++ impression = models.CharField(verbose_name=_('General impression'),+ max_length=2,+ choices=IMPRESSION,+ default=IMPRESSION_NEUTRAL,+ help_text=_('Your impression about this workout session. '+ 'Did you exercise as well as you could?'))+ '''+ The user's general impression of workout+ '''++ time_start = models.TimeField(verbose_name=_('Start time'))+ '''+ Time the workout session started+ '''++ time_end = models.TimeField(verbose_name=_('Finish time'))+ '''+ Time the workout session ended+ '''++ class Meta:+ '''+ Set other properties+ '''+ ordering = ["date", ]++class UserProfile(models.Model):GENDER_MALE = '1'GENDER_FEMALE = '2'diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex ed677c50a..0a161915b 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -15,6 +15,7 @@ from wger.manager.views.day import DayCreateViewfrom wger.manager.views import miscfrom wger.manager.views import icalfrom wger.manager.views import user+from wger.manager.views import workout_sessionfrom wger.utils.constants import USER_TAB@@ -86,6 +87,14 @@ urlpatterns = patterns('wger.manager.views',ical.export,name='workout-ical'),+ # Workout session+ url(r'^workout/session/(?P<workout_pk>\d+)/add$',+ workout_session.WorkoutSessionAddView.as_view(),+ name='workout-session-add'),+ url(r'^workout/session/(?P<pk>\d+)/edit$',+ workout_session.WorkoutSessionUpdateView.as_view,+ name='workout-session-edit'),+# Timerurl(r'^workout/(?P<day_pk>\d+)/timer$','workout.timer',diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.pynew file mode 100644index 000000000..81044d3fc--- /dev/null+++ b/wger/manager/views/workout_session.py@@ -0,0 +1,96 @@+# -*- 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.forms import ModelForm, SplitDateTimeWidget++from django.http import HttpResponseForbidden+from django.core.urlresolvers import reverse+from django.utils.translation import ugettext as _++from django.views.generic import UpdateView+from django.views.generic import CreateView++from wger.manager.models import Workout, WorkoutSession++from wger.manager.forms import WorkoutLogForm++from wger.utils.generic_views import WgerFormMixin+from wger.utils.generic_views import WgerPermissionMixin+++logger = logging.getLogger('wger.custom')++'''+Workout session+'''+++class WorkoutSessionUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):+ '''+ Generic view to edit an existing workout session entry+ '''+ model = WorkoutSession+ form_class = WorkoutLogForm+ login_required = True++ def get_context_data(self, **kwargs):+ context = super(WorkoutSessionUpdateView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('workout-log-edit', kwargs={'pk': self.object.id})+ context['title'] = _('Edit log entry for %s') % self.object.exercise.name++ return context++ def get_success_url(self):+ return reverse('workout-log', kwargs={'pk': self.object.workout_id})+++class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):+ '''+ Generic view to add a new workout session entry+ '''+ model = WorkoutSession+ login_required = True++ def dispatch(self, request, *args, **kwargs):+ '''+ Check for ownership+ '''+ workout = Workout.objects.get(pk=kwargs['workout_pk'])+ if workout.user != request.user:+ return HttpResponseForbidden()++ return super(WorkoutSessionAddView, self).dispatch(request, *args, **kwargs)++ def get_context_data(self, **kwargs):+ context = super(WorkoutSessionAddView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('workout-session-add',+ kwargs={'workout_pk': self.kwargs['workout_pk']})+ context['title'] = _('New workout session')+ return context++ def get_success_url(self):+ return reverse('workout-log', kwargs={'pk': self.kwargs['workout_pk']})++ def form_valid(self, form):+ '''+ Set the workout and the user+ '''++ workout = Workout.objects.get(pk=self.kwargs['workout_pk'])+ form.instance.workout = workout+ form.instance.user = self.request.user+ return super(WorkoutSessionAddView, self).form_valid(form)