Self hosted FLOSS fitness/workout, nutrition and weight tracker
Update the set workout set order via the API
Roland Geiderfa7dde2fd696
diff --git a/wger/core/static/js/workout-manager.js b/wger/core/static/js/workout-manager.jsindex 0772beb19..88fc7b810 100644--- a/wger/core/static/js/workout-manager.js+++ b/wger/core/static/js/workout-manager.js@@ -112,15 +112,23 @@ function setup_sortable() {update : function (event, ui) {// Monkey around the HTML, till we find the IDs of the set and the dayvar day_element = ui.item.parent().parent().find('tr').first().attr('id'); //day-xy- var day_id = day_element.match(/\d+/);+ var day_id = day_element.match(/\d+/)[0];// returns something in the form "set-1,set-2,set-3,"var order = $(this).sortable('toArray');- //$("#ajax-info").show();- //$("#ajax-info").addClass('success');- $.get('/' + get_current_language() + "/workout/api/edit-set" + "?do=set_order&day_id=" + day_id + "&order=" + order);-+ $.each(order, function (index, value) {+ if (value) {+ var set_pk = value.match(/\d+/)[0];+ $.ajax({+ url:'/api/v2/set/' + set_pk + '/',+ type: 'PATCH',+ data: {'order': index + 1}+ }).done(function(data) {+ //console.log(data);+ });+ }+ });// TODO: it seems to be necessary to call the view two times before it returns// current data.diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 691e5f27f..fecc515a5 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -154,7 +154,4 @@ urlpatterns = patterns('',url(r'^workout/set/(?P<pk>\d+)/edit/$',set.edit,name='set-edit'),-- # AJAX- url(r'^workout/api/edit-set$', set.api_edit_set),)\ No newline at end of filediff --git a/wger/manager/views/set.py b/wger/manager/views/set.pyindex 82c53cc5f..fedd19191 100644--- a/wger/manager/views/set.py+++ b/wger/manager/views/set.py@@ -216,35 +216,3 @@ def edit(request, pk):context['formsets'] = formsetscontext['form_action'] = reverse('set-edit', kwargs={'pk': pk})return render(request, 'set/edit.html', context)---@login_required-def api_edit_set(request):- '''- Allows to edit the order of the sets via an AJAX call- '''-- if request.is_ajax():-- # Set the order of the reps- if request.GET.get('do') == 'set_order':- day_id = request.GET.get('day_id')- new_set_order = request.GET.get('order')-- order = 0- for i in new_set_order.strip(',').split(','):- if not i:- continue- set_id = i.split('-')[1]- order += 1-- set_obj = get_object_or_404(Set, pk=set_id, exerciseday=day_id)-- # Check if the user is the owner of the object- if set_obj.exerciseday.training.user == request.user:- set_obj.order = order- set_obj.save()- else:- return HttpResponseForbidden()-- return HttpResponse(_('Success'))