Search form and pagination

rowers/views.py

@@ -1,11 +1,14 @@
 import time
+import operator
 from django.views.generic.base import TemplateView
+from django.db.models import Q
 from django.shortcuts import render
 from django.http import HttpResponse, HttpResponseRedirect
 from django.contrib.auth import authenticate, login, logout
 from rowers.forms import LoginForm,DocumentsForm,UploadOptionsForm
 from django.core.urlresolvers import reverse
 from django.template import RequestContext
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.conf import settings
 from django.utils.datastructures import MultiValueDictKeyError
 from django.utils import timezone,translation
@@ -1772,7 +1775,26 @@ def workouts_view(request,message='',successmessage=''):
 	#    successmessage = 'New Workouts have been created from email'
 
 	workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime")
-	
+        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,25) # 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)
+            
 	return render(request, 'list_workouts.html',
 		      {'workouts': workouts,
 		       'message': message,
@@ -1787,6 +1809,27 @@ def workout_comparison_list(request,id=0,message='',successmessage=''):
 	r = Rower.objects.get(user=request.user)
 	u = User.objects.get(id=r.user.id)
 	workouts = Workout.objects.filter(user=r).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)
+
 	row = Workout.objects.get(id=id)
 	
 	return render(request, 'comparison_list.html',
@@ -3942,6 +3985,16 @@ def graphs_view(request):
     try:
 	r = Rower.objects.get(user=request.user)
 	workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime")
+        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))
+                )
+
 	g = GraphImage.objects.filter(workout__in=workouts).order_by("-creationdatetime")
 	if (len(g)<=5):
 	    return render(request, 'list_graphs.html',