Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add workout session form to the weight log entry page

Roland Geider530d3088274d
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 110b3084d..47566402b 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -178,11 +178,20 @@ class SetFormMobile(ModelForm):
class HelperDateForm(Form):
'''
- A helper form with only a date input
+ A helper form used in the workout log view
'''
date = DateField(input_formats=DATE_FORMATS, widget=Html5DateInput())
+class HelperWorkoutSessionForm(ModelForm):
+ '''
+ A helper form used in the workout log view
+ '''
+ class Meta:
+ model = WorkoutSession
+ exclude = ('date', )
+
+
class WorkoutLogForm(ModelForm):
'''
Helper form for a WorkoutLog.
diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.html
index 257c42dfb..b0e4746f3 100644
--- a/wger/manager/templates/day/log.html
+++ b/wger/manager/templates/day/log.html
@@ -21,20 +21,15 @@ $(document).ready(function () {
{{formset.management_form}}
<table class="workout-log-table">
-<tr>
- <td>
- {% trans dateform.date.label %}
- </td>
- <td>
- <div class= "ym-fbox-text {% if dateform.date.errors %}ym-error{% endif %}">
- {{dateform.date}}
- </div>
-
- <div class="ym-fbox-text {% if dateform.date.errors %}ym-error{% endif %}">
- <span class="ym-message">{{dateform.date.errors}}</span>
- </div>
- </td>
-</tr>
+{% yaml_form_field dateform.date %}
+
+{% for field in session_form %}
+ {% if field.name == 'impression' %}
+ {% yaml_form_field field "ym-fbox-select" %}
+ {% else %}
+ {% yaml_form_field field %}
+ {% endif %}
+{% endfor %}
</table>
<h3>{% trans "Exercises" %}</h3>
diff --git a/wger/manager/templates/mobile/day/log.html b/wger/manager/templates/mobile/day/log.html
index 82eacb44f..56e5d96fe 100644
--- a/wger/manager/templates/mobile/day/log.html
+++ b/wger/manager/templates/mobile/day/log.html
@@ -19,6 +19,14 @@
<table class="workout-log-table">
{% yaml_form_field dateform.date %}
+
+{% for field in session_form %}
+ {% if field.name == 'impression' %}
+ {% yaml_form_field field "ym-fbox-select" %}
+ {% else %}
+ {% yaml_form_field field %}
+ {% endif %}
+{% endfor %}
</table>
<h3>{% trans "Exercises" %}</h3>
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index b6fc9f1c7..558d22f9b 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -59,6 +59,10 @@ class WeightLogTestCase(WorkoutManagerTestCase):
count_before = WorkoutLog.objects.count()
response = self.client.post(reverse('day-log', kwargs={'pk': 1}),
{'date': '2012-01-01',
+ 'notes': 'My cool impression',
+ 'impression': '3',
+ 'time_start': datetime.time(10, 0),
+ 'time_end': datetime.time(12, 0),
'form-0-reps': 10,
'form-0-weight': 10,
'form-TOTAL_FORMS': 3,
@@ -68,11 +72,10 @@ class WeightLogTestCase(WorkoutManagerTestCase):
count_after = WorkoutLog.objects.count()
+ # Logged out users get a 302 redirect to login page
+ # Users not owning the workout, a 403, forbidden
if fail:
- # Logged out users get a 302 redirect to login page
- # Users not owning the workout, a 403, forbidden
self.assertTrue(response.status_code in (302, 403))
-
self.assertEqual(count_before, count_after)
else:
self.assertEqual(response.status_code, 302)
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index fee65749c..af1e0245b 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -14,13 +14,12 @@
import datetime
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.core.urlresolvers import reverse_lazy
from wger.manager.models import Workout, WorkoutSession
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import ApiBaseResourceTestCase
@@ -46,8 +45,6 @@ class AddWorkoutSessionTestCase(WorkoutManagerAddTestCase):
'time_start': datetime.time(10, 0),
'time_end': datetime.time(13, 0)
}
- #user_success = 'test'
- #user_fail = 'admin'
class EditWorkoutSessionTestCase(WorkoutManagerEditTestCase):
@@ -58,8 +55,6 @@ class EditWorkoutSessionTestCase(WorkoutManagerEditTestCase):
object_class = WorkoutSession
url = 'workout-session-edit'
pk = 3
- #user_success = 'test'
- #user_fail = 'admin'
data = {
'user': 1,
'workout': 2,
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index ce3397e4f..533d68d3c 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -41,6 +41,7 @@ from wger.manager.models import WorkoutLog
from wger.manager.models import Schedule
from wger.manager.forms import HelperDateForm
+from wger.manager.forms import HelperWorkoutSessionForm
from wger.manager.forms import WorkoutLogForm
from wger.utils.generic_views import WgerFormMixin
@@ -166,7 +167,6 @@ def add(request, pk):
# Make a copy of the POST data and go through it. The reason for this is
# that the form expects a value for the exercise which is not present in
# the form (for space and usability reasons)
-
post_copy = request.POST.copy()
for form_id in form_to_exercise:
@@ -176,21 +176,29 @@ def add(request, pk):
# Pass the new data to the forms
formset = WorkoutLogFormSet(data=post_copy)
dateform = HelperDateForm(data=post_copy)
+ session_form = HelperWorkoutSessionForm(data=post_copy)
- if dateform.is_valid():
+ # If all the data is valid, save and redirect to log overview page
+ if dateform.is_valid() and session_form.is_valid() and formset.is_valid():
log_date = dateform.cleaned_data['date']
- # If the data is valid, save and redirect to log overview page
- if formset.is_valid():
- instances = formset.save(commit=False)
- for instance in instances:
+ # Workout Session
+ instance = session_form.save(commit=False)
+ instance.date = log_date
+ instance.user = request.user
+ instance.workout = day.training
+ instance.save()
+
+ # Log entries
+ instances = formset.save(commit=False)
+ for instance in instances:
- instance.user = request.user
- instance.workout = day.training
- instance.date = log_date
- instance.save()
+ instance.user = request.user
+ instance.workout = day.training
+ instance.date = log_date
+ instance.save()
- return HttpResponseRedirect(reverse('workout-log', kwargs={'pk': day.training_id}))
+ return HttpResponseRedirect(reverse('workout-log', kwargs={'pk': day.training_id}))
else:
# Initialise the formset with a queryset that won't return any objects
# (we only add new logs here and that seems to be the fastest way)
@@ -198,6 +206,7 @@ def add(request, pk):
formatted_date = date_format(datetime.date.today(), "SHORT_DATE_FORMAT")
dateform = HelperDateForm(initial={'date': formatted_date})
+ session_form = HelperWorkoutSessionForm()
# Pass the correct forms to the exercise list
for exercise in exercise_list:
@@ -211,6 +220,7 @@ def add(request, pk):
template_data['exercise_list'] = exercise_list
template_data['formset'] = formset
template_data['dateform'] = dateform
+ template_data['session_form'] = session_form
template_data['form_action'] = reverse('day-log', kwargs={'pk': pk})
return render_to_response('day/log.html',
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index 9a43d444b..04dcaad4d 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -15,7 +15,6 @@
# 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
@@ -26,8 +25,6 @@ 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