Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow to delete all weight logs belonging to a session

Roland Geider1519e52eaa07
diff --git a/wger/manager/fixtures/test-workout-session.json b/wger/manager/fixtures/test-workout-session.json
index dc71aa377..78665f04f 100644
--- a/wger/manager/fixtures/test-workout-session.json
+++ b/wger/manager/fixtures/test-workout-session.json
@@ -8,7 +8,7 @@
"workout": 1,
"time_end": "18:30:00",
"user": 1,
- "date": "2012-10-15",
+ "date": "2012-10-01",
"notes": "Notes come here"
}
},
diff --git a/wger/manager/templates/calendar/partial_overview_table.html b/wger/manager/templates/calendar/partial_overview_table.html
index 694ca57bd..d42c610cc 100644
--- a/wger/manager/templates/calendar/partial_overview_table.html
+++ b/wger/manager/templates/calendar/partial_overview_table.html
@@ -30,6 +30,12 @@
{% trans "Delete" %}
</a>
</li>
+ <li>
+ <a href="{% url 'manager:session:delete' value.session.pk 'logs' %}" class="wger-modal-dialog">
+ <span class="glyphicon glyphicon-trash"></span>
+ {% trans "Delete with logs" %}
+ </a>
+ </li>
</ul>
</div>
{% else %}
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index 4c388cb7e..68ce5edd0 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -20,7 +20,7 @@ from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse, reverse_lazy
from wger.core.tests import api_base_test
-from wger.manager.models import Workout, WorkoutSession
+from wger.manager.models import Workout, WorkoutSession, WorkoutLog
from wger.manager.tests.testcase import WorkoutManagerTestCase, WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
@@ -99,6 +99,27 @@ class DeleteTestWorkoutTestCase(WorkoutManagerDeleteTestCase):
pk = 3
+class WorkoutSessionDeleteLogsTestCase(WorkoutManagerTestCase):
+ '''
+ Tests that deleting a session can also delete all weight logs
+ '''
+
+ def test_delete_logs(self):
+ self.user_login('admin')
+
+ session = WorkoutSession.objects.get(pk=1)
+ count_before = WorkoutLog.objects.filter(user__username=session.user.username,
+ date=session.date).count()
+ self.assertEqual(count_before, 1)
+
+ response = self.client.post(reverse('manager:session:delete',
+ kwargs={'pk': 1, 'logs': 'logs'}))
+ self.assertEqual(response.status_code, 302)
+ count_after = WorkoutLog.objects.filter(user__username=session.user.username,
+ date=session.date).count()
+ self.assertEqual(count_after, 0)
+
+
class WorkoutSessionTestCase(WorkoutManagerTestCase):
'''
Tests other workout session methods
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 5245425ee..2f77844f1 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -112,7 +112,7 @@ patterns_session = patterns('',
url(r'^(?P<pk>\d+)/edit$',
workout_session.WorkoutSessionUpdateView.as_view(),
name='edit'),
- url(r'^(?P<pk>\d+)/delete$',
+ url(r'^(?P<pk>\d+)/delete/(?P<logs>(session|logs))?$',
workout_session.WorkoutSessionDeleteView.as_view(),
name='delete'),
)
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index ed5f44b35..d42aad944 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -26,7 +26,7 @@ from django.views.generic import UpdateView, DeleteView
from django.views.generic import CreateView
from wger.manager.forms import WorkoutSessionForm
-from wger.manager.models import Workout, WorkoutSession
+from wger.manager.models import Workout, WorkoutSession, WorkoutLog
from wger.utils.generic_views import WgerFormMixin, WgerDeleteMixin
from wger.utils.generic_views import WgerPermissionMixin
@@ -128,8 +128,22 @@ class WorkoutSessionDeleteView(WgerDeleteMixin, DeleteView):
messages = ugettext_lazy('Successfully deleted')
login_required = True
+ def delete(self, request, *args, **kwargs):
+ '''
+ Delete the workout session and, if wished, all associated weight logs as well
+ '''
+ if self.kwargs['logs'] == 'logs':
+ WorkoutLog.objects.filter(user=self.request.user, date=self.get_object().date).delete()
+
+ return super(WorkoutSessionDeleteView, self).delete(request, *args, **kwargs)
+
def get_context_data(self, **kwargs):
+
+ logs = '' if not self.kwargs['logs'] else self.kwargs['logs']
context = super(WorkoutSessionDeleteView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:session:delete', kwargs={'pk': self.object.id})
+ context['form_action'] = reverse('manager:session:delete', kwargs={'pk': self.object.id,
+ 'logs': logs})
context['title'] = _(u'Delete {0}?').format(self.object)
+ if self.kwargs['logs'] == 'logs':
+ context['delete_message'] = _('This will delete all weight logs for this day as well.')
return context