Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add view to enter a single workout weight log
Roland Geider21160cbf57bc
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.htmlindex d61b12c76..387dbc045 100644--- a/wger/manager/templates/workout/timer.html+++ b/wger/manager/templates/workout/timer.html@@ -147,6 +147,19 @@ $(document).ready(function() {}});+ // Bind the buttons that create new logs+ $('.save_log').bind("click", function(e) {+ e.preventDefault();+ var form = $(this).siblings('form');++ $.post( form.attr('action'), form.serialize(), function(data) {+ //response+ }+ );++ console.log(form.attr('action'));+ });+// Bind necessary click events to advance the workout$('#container ul li').each(function(intIndex) {$(this).find('a').bind("click", function() {@@ -204,16 +217,37 @@ $(document).ready(function() {{% if step.type == 'exercise' %}<li class="timer-step" id="div-{{step.current_step}}" data-step="{{step.current_step}}"><h2>{{step.exercise}}</h2>+ <form action="{% url 'workout-log-add' workout.pk %}" method="POST">+ {% csrf_token %}+ <input name="exercise"+ id="id-exercise-{{step.current_step}}"+ value="{{step.exercise.pk}}"+ type="hidden">+ <input name="date"+ id="id-date-{{step.current_step}}"+ value="{% now 'o-m-j' %}"+ type="hidden"><div class="filler_div"><div data-role="fieldcontain">- <label for="reps-field-{{step.current_step}}">{% trans "Repetitions" %}:</label>- <input name="reps-field" id="reps-field-{{step.current_step}}" placeholder="{% trans 'Repetitions' %}" value="{{step.reps}}" type="text">+ <label for="id-reps-{{step.current_step}}">{% trans "Repetitions" %}:</label>+ <input name="reps"+ id="id-reps-{{step.current_step}}"+ placeholder="{% trans 'Repetitions' %}"+ value="{{step.reps}}"+ type="text"+ autocomplete="off"></div><div data-role="fieldcontain">- <label for="weight-field-{{step.current_step}}">{% trans "Weight" %}:</label>- <input name="weight-field" id="weight-field-{{step.current_step}}" placeholder="{% trans 'Weight' %}" value="{{step.weight}}" type="text">+ <label for="id-weight-{{step.current_step}}">{% trans "Weight" %}:</label>+ <input name="weight"+ id="id-weight-{{step.current_step}}"+ placeholder="{% trans 'Weight' %}"+ value="{{step.weight}}"+ type="text"+ autocomplete="off"></div></div>+ </form><div class="sub_header">{% if step.weight %}@@ -222,7 +256,7 @@ $(document).ready(function() {{{step.reps}} {% trans "reps" %}{% endif %}</div>- <a class="next bottom_button"+ <a class="next bottom_button save_log"href="#"data-role="button"data-icon="arrow-r"@@ -236,7 +270,9 @@ $(document).ready(function() {<div class="ui-grid-a"><div class="ui-block-a">- <div class="sub_header"><span id="counter-{{step.current_step}}">{{step.time}}</span> {% trans "sec" %}</div>+ <div class="sub_header">+ <span id="counter-{{step.current_step}}">{{step.time}}</span> {% trans "sec" %}+ </div></div><div class="ui-block-b"><a class="start" href="#" data-role="button" id="button-{{step.current_step}}">{% trans "start" %}</a>diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex de51fc33b..b6fc9f1c7 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -15,11 +15,12 @@import loggingimport datetime-from django.core.urlresolvers import reverse+from django.core.urlresolvers import reverse, reverse_lazyfrom wger.manager.models import WorkoutLogfrom wger.manager.tests.testcase import WorkoutManagerTestCase+from wger.manager.tests.testcase import WorkoutManagerAddTestCasefrom wger.manager.tests.testcase import ApiBaseResourceTestCaselogger = logging.getLogger('wger.custom')@@ -101,7 +102,21 @@ class WeightLogTestCase(WorkoutManagerTestCase):self.add_weight_log(fail=True)-class WeightLogEntryTestCase(WorkoutManagerTestCase):+class WeightLogAddTestCase(WorkoutManagerAddTestCase):+ '''+ Tests editing a Workout+ '''++ object_class = WorkoutLog+ url = reverse_lazy('workout-log-add', kwargs={'workout_pk': 1})+ pk = 6+ data = {'reps': 10,+ 'weight': 120.5,+ 'date': datetime.date.today(),+ 'exercise': 1}+++class WeightLogEntryEditTestCase(WorkoutManagerTestCase):'''Tests editing individual weight log entries'''diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex c5f00b8c8..8fa3e621b 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -2,17 +2,16 @@ from django.conf.urls import patterns, urlfrom django.contrib.auth.decorators import login_requiredfrom django.core.urlresolvers import reverse_lazyfrom django.views.generic import TemplateView-from django.views.generic import TemplateViewfrom wger.manager.views import schedulefrom wger.manager.views import schedule_stepfrom wger.manager.views.workout import WorkoutEditViewfrom wger.manager.views.workout import WorkoutDeleteViewfrom wger.manager.views.log import WorkoutLogDetailView+from wger.manager.views.log import WorkoutLogAddViewfrom wger.manager.views.log import WorkoutLogUpdateViewfrom wger.manager.views.day import DayEditViewfrom wger.manager.views.day import DayCreateView-from wger.manager.views import setfrom wger.manager.views import miscfrom wger.utils.constants import USER_TAB@@ -73,6 +72,9 @@ urlpatterns = patterns('wger.manager.views',url(r'^workout/log/edit-entry/(?P<pk>\d+)$',WorkoutLogUpdateView.as_view(),name='workout-log-edit'),+ url(r'^workout/(?P<workout_pk>\d+)/log/add$',+ WorkoutLogAddView.as_view(),+ name='workout-log-add'),url(r'^workout/calendar$','log.calendar',name='workout-calendar'),diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex 63698dd22..042470aa7 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -18,7 +18,6 @@ import loggingimport uuidimport datetimefrom calendar import HTMLCalendar-#from datetime import datefrom itertools import groupbyfrom django.template import RequestContext@@ -33,6 +32,7 @@ from django.utils.formats import date_formatfrom django.forms.models import modelformset_factoryfrom django.views.generic import UpdateView+from django.views.generic import CreateViewfrom django.views.generic import DetailViewfrom wger.manager.models import Workout@@ -75,6 +75,45 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):return reverse('workout-log', kwargs={'pk': self.object.workout_id})+class WorkoutLogAddView(WgerFormMixin, CreateView, WgerPermissionMixin):+ '''+ Generic view to add a new workout log weight entry+ '''+ model = WorkoutLog+ 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(WorkoutLogAddView, self).dispatch(request, *args, **kwargs)++ def get_context_data(self, **kwargs):+ context = super(WorkoutLogAddView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('workout-log-add',+ kwargs={'workout_pk': self.kwargs['workout_pk']})+ context['title'] = _('New log entry')++ 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(WorkoutLogAddView, self).form_valid(form)++def add(request, pk):'''Add a new workout logdiff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 3bc643c3e..17e409c78 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -309,6 +309,7 @@ def timer(request, pk):context['step_list'] = step_listcontext['canonical_day'] = canonical_day+ context['workout'] = day.trainingreturn render_to_response('workout/timer.html',context,context_instance=RequestContext(request))