added buttons to fusion

rowers/views.py

@@ -2320,6 +2320,85 @@ def workout_comparison_list(request,id=0,message='',successmessage='',
     except Rower.DoesNotExist:
 	raise Http404("User has no rower instance")
 
+# List of workouts to compare a selected workout to
+@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
+def workout_fusion_list(request,id=0,message='',successmessage='',
+                            startdatestring="",enddatestring="",
+                            startdate=timezone.now()-datetime.timedelta(days=365),
+                            enddate=timezone.now()):
+
+    try:
+	r = Rower.objects.get(user=request.user)
+	u = User.objects.get(id=r.user.id)
+        if request.method == 'POST':
+            dateform = DateRangeForm(request.POST)
+            if dateform.is_valid():
+	        startdate = dateform.cleaned_data['startdate']
+	        enddate = dateform.cleaned_data['enddate']
+        else:
+            dateform = DateRangeForm(initial={
+                'startdate':startdate,
+                'enddate':enddate,
+                })
+
+        if startdatestring:
+            startdate = iso8601.parse_date(startdatestring)
+        if enddatestring:
+            enddate = iso8601.parse_date(enddatestring)
+
+        startdate = datetime.datetime.combine(startdate,datetime.time())
+        enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
+        enddate = enddate+datetime.timedelta(days=1)
+                
+        if enddate < startdate:
+	    s = enddate
+	    enddate = startdate
+	    startdate = s
+        
+	workouts = Workout.objects.filter(user=r,
+                                          startdatetime__gte=startdate,
+                                          startdatetime__lte=enddate).order_by("-date", "-starttime").exclude(id=id)
+
+        query = request.GET.get('q')
+        if query:
+            query_list = query.split()
+            workouts = workouts.filter(
+                reduce(operator.and_,
+                       (Q(name__icontains=q) for q in query_list)) |
+                reduce(operator.and_,
+                       (Q(notes__icontains=q) for q in query_list))
+                )
+
+        paginator = Paginator(workouts,15) # show 25 workouts per page
+        page = request.GET.get('page')
+
+        try:
+            workouts = paginator.page(page)
+        except PageNotAnInteger:
+            workouts = paginator.page(1)
+        except EmptyPage:
+            workouts = paginator.page(paginator.num_pages)
+        try:
+	    row = Workout.objects.get(id=id)
+        except Workout.DoesNotExist:
+	    raise Http404("Workout doesn't exist")
+
+	
+	return render(request, 'fusion_list.html',
+		      {'id':id,
+		       'workout':row,
+		       'workouts': workouts,
+		       'last_name':u.last_name,
+		       'first_name':u.first_name,
+		       'message': message,
+		       'successmessage':successmessage,
+                       'dateform':dateform,
+                       'startdate':startdate,
+                       'enddate':enddate,
+		       })
+    except Rower.DoesNotExist:
+	raise Http404("User has no rower instance")
+
 # Basic 'EDIT' view of workout
 def workout_view(request,id=0):
     try:
@@ -5048,7 +5127,7 @@ def workout_fusion_view(request,id1=0,id2=1):
                            'workout2':w2,
                           })
         
-
+
     form = FusionMetricChoiceForm(instance=w2)
     
     return render(request, 'fusion.html',