Self hosted FLOSS fitness/workout, nutrition and weight tracker
Create or add a new workout session from the gym mode page
Roland Geider6cd1748d9c04
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.htmlindex 306be9d2f..0777945dc 100644--- a/wger/manager/templates/workout/timer.html+++ b/wger/manager/templates/workout/timer.html@@ -233,7 +233,6 @@ $(document).ready(function() {// Bind the button to save the workout session form$('#save_button_form').bind("click", function(e) {e.preventDefault();- console.log($('#session-form').serialize());$.post( $('#session-form').attr('action'),$('#session-form').serialize(),function( data ) {@@ -245,6 +244,9 @@ $(document).ready(function() {{% endblock %}{% block content %}+{# #}+{# Start page #}+{# #}<div id="timer-container" style="position: relative; top:-40px; margin:0px, padding: 0px;"><ul id="workout-timer"><li class="timer-step" id="div-warmup" data-number="0">@@ -265,7 +267,11 @@ $(document).ready(function() {data-iconpos="right"data-theme="d">{% trans "Start!" %}</a></li>+{% for step in step_list %}+ {# #}+ {# exercise page #}+ {# #}{% if step.type == 'exercise' %}<li class="timer-step exercise-step"id="div-{{step.current_step}}"@@ -339,6 +345,10 @@ $(document).ready(function() {<span style="width: {{step.step_percent|stringformat:'f'}}%;"></span></div></li>++ {# #}+ {# pause page #}+ {# #}{% else %}<li class="timer-step pause-step"id="div-{{step.current_step}}"@@ -386,11 +396,15 @@ $(document).ready(function() {</li>{% endif %}{% endfor %}++{# #}+{# last page #}+{# #}<li class="timer-step" id="workout-complete"><h2>{% trans "Workout complete!" %}</h2><div class="filler_div">- <form action="{% url 'workout-session-add' workout.id %}" id="session-form">+ <form action="{{ form_action }}" id="session-form">{% csrf_token %}{{ session_form.time_start }}{{ session_form.time_end }}diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.pyindex d5b37c23b..30d8d48c7 100644--- a/wger/manager/tests/test_timer.py+++ b/wger/manager/tests/test_timer.py@@ -14,11 +14,15 @@import loggingimport math+import datetime+from django.contrib.auth.models import Userfrom django.core.urlresolvers import reverse-from wger.exercises.models import Exercisefrom wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.exercises.models import Exercise+from wger.manager.models import WorkoutSession+from wger.manager.models import Workoutlogger = logging.getLogger('wger.custom')@@ -97,3 +101,34 @@ class WorkoutTimerTestCase(WorkoutManagerTestCase):self.user_login('admin')self.timer(fail=False)+++class WorkoutTimerWorkoutSessionTestCase(WorkoutManagerTestCase):+ '''+ Other tests+ '''++ def test_workout_session(self):+ '''+ Tests that the correct urls and forms for workout session is passed+ '''+ self.user_login('test')+ WorkoutSession.objects.all().delete()++ response = self.client.get(reverse('workout-timer', kwargs={'day_pk': 5}))+ self.assertEqual(response.context['form_action'],+ reverse('workout-session-add', kwargs={'workout_pk': 3}))++ session = WorkoutSession()+ session.user = User.objects.get(username='test')+ session.workout = Workout.objects.get(pk=2)+ session.date = datetime.date.today()+ session.notes = 'Something here'+ session.impression = '2'+ session.time_start = datetime.time(11, 00)+ session.time_end = datetime.time(13, 00)+ session.save()++ response = self.client.get(reverse('workout-timer', kwargs={'day_pk': 5}))+ self.assertEqual(response.context['form_action'],+ reverse('workout-session-edit', kwargs={'pk': session.pk}))diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 46b4b8b77..862abd7e7 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -16,9 +16,10 @@import loggingimport uuid+import datetimefrom django.template import RequestContext-from django.shortcuts import render_to_response+from django.shortcuts import render_to_response, renderfrom django.shortcuts import get_object_or_404from django.http import HttpResponseRedirectfrom django.core.context_processors import csrf@@ -33,6 +34,7 @@ from django.views.generic import DeleteViewfrom django.views.generic import UpdateViewfrom wger.manager.models import Workout+from wger.manager.models import WorkoutSessionfrom wger.manager.models import WorkoutLogfrom wger.manager.models import Schedulefrom wger.manager.models import Day@@ -312,12 +314,21 @@ def timer(request, day_pk):for i, s in enumerate(step_list):step_list[i]['step_percent'] = (i + 1) * 100.0 / len(step_list)+ # Depending on whether there is already a workout session for today, update+ # the current one or create a new one (this will be the most usual case)+ if WorkoutSession.objects.filter(user=request.user, date=datetime.date.today()).exists():+ session = WorkoutSession.objects.get(user=request.user, date=datetime.date.today())+ url = reverse('workout-session-edit', kwargs={'pk': session.pk})+ session_form = WorkoutSessionHiddenFieldsForm(instance=session)+ else:+ url = reverse('workout-session-add', kwargs={'workout_pk': day.training_id})+ session_form = WorkoutSessionHiddenFieldsForm()+# Render templatecontext['day'] = daycontext['step_list'] = step_listcontext['canonical_day'] = canonical_daycontext['workout'] = day.training- context['session_form'] = WorkoutSessionHiddenFieldsForm()- return render_to_response('workout/timer.html',- context,- context_instance=RequestContext(request))+ context['session_form'] = session_form+ context['form_action'] = url+ return render(request, 'workout/timer.html', context)