Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow workout logs to be edited and deleted from calendar views
Roland Geideraf6591752c8f
diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.htmlindex 4aedbb4ea..58a4f2173 100644--- a/wger/manager/templates/mobile/workout/calendar.html+++ b/wger/manager/templates/mobile/workout/calendar.html@@ -25,10 +25,48 @@ $(document).ready(function() {{{calendar|safe}}{% for date in logs %}+{% regroup logs|get_item:date by exercise as grouped_logs %}++{# #}+{# Popups to edit or delete the logs #}+{# #}+{% for i in grouped_logs %}+{% for log in i.list %}+<div data-role="popup"+ id="log-popup-{{log.pk}}"+ data-overlay-theme="a">++ <div data-role="header" data-theme="b">+ <h3>{% trans "Options" %} - {{log.reps}} × {{log.weight}}</h3>+ </div>++ <div role="main" class="ui-content">+ <a href="{% url 'workout-log-delete' log.pk %}"+ title="{% trans 'Delete' %}"+ data-role="button">+ <img src="{% static 'images/icons/trash.svg' %}"+ width="22"+ height="22"+ alt="{% trans 'Delete' %}">+ {% trans 'Delete' %}+ </a>+ <a href="{% url 'workout-log-edit' log.pk %}"+ title="{% trans 'Edit' %}"+ data-role="button">+ <img src="{% static 'images/icons/edit.svg' %}"+ width="22"+ height="22"+ alt="{% trans 'Edit' %}">+ {% trans 'Edit' %}+ </a>+ </div>+</div>+{% endfor %}+{% endfor %}+<div id="log-{{date|date:'Y-m-d'}}" class="calendar-log-data"><h3>{{date}}</h3>- {% regroup logs|get_item:date by exercise as grouped_logs %}{# TODO: what if some of the entries don't belong to a workout? #}{% with tmp=grouped_logs|first %}@@ -67,12 +105,15 @@ $(document).ready(function() {{% endwith %}{% endwith %}+ {# #}+ {# Logs #}+ {# #}<ul class="grouper-list">{% for i in grouped_logs %}<li>{{i.grouper}}<ul>{% for log in i.list %}- <li>{{log.reps}} × {{log.weight}}</li>+ <li><a href="#log-popup-{{log.pk}}" data-rel="popup">{{log.reps}} × {{log.weight}}</a></li>{% endfor %}</ul></li>diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.htmlindex 6ab49a876..c27be213a 100644--- a/wger/manager/templates/workout/calendar.html+++ b/wger/manager/templates/workout/calendar.html@@ -68,7 +68,27 @@ $(document).ready(function() {<li>{{i.grouper}}<ul>{% for log in i.list %}- <li>{{log.reps}} × {{log.weight}}</li>+ <li>+ {{log.reps}} × {{log.weight}}+ <span class="editoptions">+ <a href="{% url 'workout-log-delete' log.pk %}"+ title="{% trans 'Delete' %}"+ class="modal-dialog">+ <img src="{% static 'images/icons/trash.svg' %}"+ width="16"+ height="16"+ alt="{% trans 'Delete' %}">+ </a>+ <a href="{% url 'workout-log-edit' log.pk %}"+ title="{% trans 'Edit' %}"+ class="modal-dialog">+ <img src="{% static 'images/icons/edit.svg' %}"+ width="16"+ height="16"+ alt="{% trans 'Edit' %}">+ </a>+ </span>+ </li>{% endfor %}</ul></li>diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex a78423625..3112e50bb 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -25,6 +25,7 @@ from wger.manager.models import WorkoutSessionfrom wger.manager.tests.testcase import WorkoutManagerTestCasefrom wger.manager.tests.testcase import WorkoutManagerAddTestCase+from wger.manager.tests.testcase import WorkoutManagerDeleteTestCasefrom wger.manager.tests.testcase import ApiBaseResourceTestCaselogger = logging.getLogger('wger.custom')@@ -175,6 +176,16 @@ class WeightLogAddTestCase(WorkoutManagerAddTestCase):'exercise': 1}+class WeightLogDeleteTestCase(WorkoutManagerDeleteTestCase):+ '''+ Tests deleting a WorkoutLog+ '''++ object_class = WorkoutLog+ url = reverse_lazy('workout-log-delete', kwargs={'pk': 1})+ pk = 1++class WeightLogEntryEditTestCase(WorkoutManagerTestCase):'''Tests editing individual weight log entriesdiff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 16d08cbb8..f3bbacdd8 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -55,6 +55,9 @@ urlpatterns = patterns('wger.manager.views',url(r'^workout/log/edit-entry/(?P<pk>\d+)$',log.WorkoutLogUpdateView.as_view(),name='workout-log-edit'),+ url(r'^workout/log/delete-entry/(?P<pk>\d+)$',+ log.WorkoutLogDeleteView.as_view(),+ name='workout-log-delete'),url(r'^workout/(?P<workout_pk>\d+)/log/add$',log.WorkoutLogAddView.as_view(),name='workout-log-add'),diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex 6d02f1541..d773c423c 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -26,11 +26,14 @@ from django.http import HttpResponseRedirectfrom django.http import HttpResponseForbiddenfrom django.core.context_processors import csrffrom django.core.urlresolvers import reverse+from django.core.urlresolvers import reverse_lazyfrom django.utils.translation import ugettext as _+from django.utils.translation import ugettext_lazyfrom django.forms.models import modelformset_factoryfrom django.views.generic import UpdateViewfrom django.views.generic import CreateViewfrom django.views.generic import DetailView+from django.views.generic import DeleteViewfrom wger.manager.models import Workoutfrom wger.manager.models import WorkoutSession@@ -41,6 +44,7 @@ from wger.manager.forms import HelperDateFormfrom wger.manager.forms import HelperWorkoutSessionFormfrom wger.manager.forms import WorkoutLogFormfrom wger.utils.generic_views import WgerFormMixin+from wger.utils.generic_views import WgerDeleteMixinfrom wger.utils.generic_views import WgerPermissionMixinfrom wger.weight.helpers import process_log_entries@@ -57,6 +61,7 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''model = WorkoutLogform_class = WorkoutLogForm+ success_url = reverse_lazy('workout-calendar')login_required = Truecustom_js = '''$(document).ready(function () {init_weight_log_datepicker();@@ -69,9 +74,6 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):return context- def get_success_url(self):- return reverse('workout-log', kwargs={'pk': self.object.workout_id})-class WorkoutLogAddView(WgerFormMixin, CreateView, WgerPermissionMixin):'''@@ -112,6 +114,18 @@ class WorkoutLogAddView(WgerFormMixin, CreateView, WgerPermissionMixin):return super(WorkoutLogAddView, self).form_valid(form)+class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):+ '''+ Delete a workout log+ '''++ model = WorkoutLog+ success_url = reverse_lazy('workout-calendar')+ title = ugettext_lazy('Delete workout log')+ form_action_urlname = 'workout-log-delete'+ login_required = True++def add(request, pk):'''Add a new workout logdiff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 0f6c3ca75..b6b0352a7 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -190,11 +190,14 @@ class WorkoutDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):model = Workoutsuccess_url = reverse_lazy('workout-overview')- title = ugettext_lazy('Delete workout')- form_action_urlname = 'workout-delete'- messages = ugettext_lazy('Workout was successfully deleted')+ title = ugettext_lazy('Delete workout log')+ messages = ugettext_lazy('Workout log was successfully deleted')login_required = True+ def get_context_data(self, **kwargs):+ context = super(WorkoutDeleteView, self).get_context_data(**kwargs)+ context['form_action'] = reverse('workout-delete', kwargs={'pk': self.object.id})+class WorkoutEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):'''