better use of forms in bulk actions

rowers/forms.py

@@ -1265,6 +1265,12 @@ class ForceCurveMultipleCompareForm(forms.Form):
         widget=forms.CheckboxSelectMultiple()
     )
 
+bulkactions = (
+    ('remove','remove'),
+)
+class WorkoutBulkActions(forms.Form):
+    action = forms.ChoiceField(
+        choices=bulkactions, label='Action', required=True, initial='remove')
 
 class WorkoutMultipleCompareForm(forms.Form):
     workouts = forms.ModelMultipleChoiceField(

rowers/templates/list_workouts.html

@@ -97,10 +97,7 @@
       <form enctype="multipart/form-data"  method="post">
 	<h3>Bulk Operation</h3>
 	<p>Please select workouts from the list to do a bulk operation on.</p>
-	<select name="selectworkouts_operation" id="selectworkouts_operation">
-	  <option value="">--Please choose an option--</option>
-	  <option value="remove">Remove</option>
-	</select>
+	{{ actionform.as_p }}
 	{% csrf_token %}
 	<input name='selectworkouts' type="submit" value="Submit">
     </li>

rowers/templates/workout_bulk_actions.html

@@ -7,23 +7,23 @@
 {% block main %}
   <h1>Bulk Actions</h1>
 <ul class="main-content">
-  <li class="grid_2">
-    <p>
-      Edit and confirm the action you want to perform on the following workouts:
-    </p>
-    {% for workout in workouts %}
-    <p>{{ workout }}</p>
-    {% endfor %}
-    <p>
-      Action: {{ action }}
-    </p>
-  </li>
-  <li class="grid_2">
-    <form action="" method="post">
+    <li class="grid_4">
+      <form action="" method="post">
+	<p>
+	  Edit and confirm the action you want to perform on the following workouts:
+	</p>
+	<p>
+	  {{ form.as_p }}
+	</p>
+	<p>
+	  {{ actionform.as_p }}
+	</p>
+    </li>
+    <li class="grid_2">
       {% csrf_token %}
       <input type="submit" value="Confirm">
+    </li>
     </form>
-  </li>
 </ul>
 
 

rowers/views/statements.py

@@ -96,6 +96,7 @@ from django.http import (
 )
 from django.contrib.auth import authenticate, login, logout
 from rowers.forms import (
+    WorkoutBulkActions,
     ForceCurveOptionsForm, HistoForm, TeamMessageForm,
     LoginForm, DocumentsForm, UploadOptionsForm, ImageForm, CourseForm,
     CourseConfirmForm, ResampleForm,

rowers/views/workoutviews.py

@@ -2040,7 +2040,6 @@ def workouts_bulk_actions(request):
     workouts = []
     try:
         for encid in workoutids:
-            print(encid)
             w = get_workout_by_opaqueid(request, encid)
             if w.user == r:
                 workouts.append(w)
@@ -2048,15 +2047,30 @@ def workouts_bulk_actions(request):
         pass
 
     if request.method == 'POST':
-        if action == 'remove':
-            for w in workouts:
-                messages.info(request,'Removed workout '+str(encoder.encode_hex(w.id)))
-                w.delete()
-        url = reverse('workouts_view')
-        return HttpResponseRedirect(url)
+        actionform = WorkoutBulkActions(request.POST)
+        form = WorkoutMultipleCompareForm(request.POST)
+        if form.is_valid() and actionform.is_valid():
+            workouts = form.cleaned_data['workouts']
+            action = actionform.cleaned_data['action']
+            if action == 'remove':
+                for w in workouts:
+                    messages.info(request,'Removed workout '+str(encoder.encode_hex(w.id)))
+                    w.delete()
+            url = reverse('workouts_view')
+            return HttpResponseRedirect(url)
+
+    else:
+        actionform = WorkoutBulkActions()
+        actionform.fields["action"].initial = action
+        form = WorkoutMultipleCompareForm()
+        form.fields["workouts"].queryset = Workout.objects.filter(id__in=[w.id for w in workouts])
+        form.fields["workouts"].initial = workouts
+
     
     return render(request,'workout_bulk_actions.html',
                   {'action':action,
+                   'actionform':actionform,
+                   'form':form,
                    'workouts':workouts})
 
 # List Workouts
@@ -2078,7 +2092,7 @@ def workouts_view(request, message='', successmessage='',
             
     if request.method == 'POST':
         if 'selectworkouts' in request.POST:
-            request.session['action']=request.POST['selectworkouts_operation']
+            request.session['action']=request.POST['action']
             request.session['ids'] = request.POST.getlist('workoutid')
             url = reverse('workouts_bulk_actions')
             return HttpResponseRedirect(url)
@@ -2261,10 +2275,13 @@ def workouts_view(request, message='', successmessage='',
         Click <a href="/rowers/workouts/setrpe">here</a> to update them. \
         You can switch off this warning in <a href="/rowers/me/edit">settings</a>.')
 
+    actionform = WorkoutBulkActions()
+
     return render(request, 'list_workouts.html',
                   {'workouts': workouts,
                    'active': 'nav-workouts',
                    'rower': r,
+                   'actionform': actionform,
                    'searchform': searchform,
                    'breadcrumbs': breadcrumbs,
                    'dateform': dateform,