Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use the REST API to save logs

Roland Geider41c5cd427636
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.html
index da7b8b8e5..1de6f2a7d 100644
--- a/wger/manager/templates/workout/timer.html
+++ b/wger/manager/templates/workout/timer.html
@@ -281,10 +281,14 @@ $(document).ready(function() {
data-step="{{step.current_step}}"
data-number="{{step.step_nr}}">
<h2>{{step.exercise}}</h2>
- <form action="{% url 'manager:log:add' workout.pk %}"
+ <form action="/api/v2/workoutlog/"
method="POST"
id="form-{{step.current_step}}">
{% csrf_token %}
+ <input name="workout"
+ id="id-workout"
+ value="{{workout.pk}}"
+ type="hidden">
<input name="exercise"
id="id-exercise-{{step.current_step}}"
value="{{step.exercise.pk}}"
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index f5bff7be5..e1f0fca14 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -289,21 +289,6 @@ class WeightlogTestCase(WorkoutManagerTestCase):
self.assertEqual(l.get_workout_session(), session1)
-class WeightLogAddTestCase(WorkoutManagerAddTestCase):
- '''
- Tests adding a WorkoutLog
- '''
-
- object_class = WorkoutLog
- url = reverse_lazy('manager:log:add', kwargs={'workout_pk': 1})
- data = {'reps': 10,
- 'weight': 120.5,
- 'repetition_unit': 2,
- 'weight_unit': 1,
- 'date': datetime.date.today(),
- 'exercise': 1}
-
-
class WeightLogDeleteTestCase(WorkoutManagerDeleteTestCase):
'''
Tests deleting a WorkoutLog
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 0cd898b62..4885af181 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -40,10 +40,7 @@ patterns_log = [
name='edit'),
url(r'^(?P<pk>\d+)/delete$',
log.WorkoutLogDeleteView.as_view(),
- name='delete'),
- url(r'^(?P<workout_pk>\d+)/add$', # not used?
- log.WorkoutLogAddView.as_view(),
- name='add'),
+ name='delete')
]
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 263f8fbcc..7df167e04 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -78,46 +78,6 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
return context
-class WorkoutLogAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
- '''
- Generic view to add a new workout log weight entry
- '''
- model = WorkoutLog
- login_required = True
- form_class = WorkoutLogForm
-
- 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('manager:log:add',
- kwargs={'workout_pk': self.kwargs['workout_pk']})
- context['title'] = _('New log entry')
-
- return context
-
- def get_success_url(self):
- return reverse('manager:log: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)
-
-
class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
Delete a workout log