Merge pull request #260 from sparkica/paginated_search

Paginated search

Author: ercchy

api/processors.py

@@ -75,15 +75,18 @@ def get_next_or_previous (event, country_code=None, past=False, direction=True):
 	return next_event
 
 
-def get_filtered_events(search_filter=None, country_filter=None, theme_filter=None, audience_filter=None):
+def get_filtered_events(search_filter=None, country_filter=None, theme_filter=None, audience_filter=None, past_events=None):
 
 	"""
 	Filter events by given filter
 	"""
 	filter_args = ()
 
 	# default
-	filter_kwargs = {'status': 'APPROVED', 'end_date__gte': datetime.datetime.now()}
+	filter_kwargs = {'status': 'APPROVED'}
+
+	if not past_events:
+		filter_kwargs['end_date__gte']= datetime.datetime.now()
 
 	if search_filter:
 		filter_args = (Q(title__icontains=search_filter) | Q(description__icontains=search_filter) | Q(tags__name__icontains=search_filter) 

api/tests.py

@@ -370,6 +370,89 @@ def test_get_filtered_events_with_theme_filter_and_audience_filter_with_more_app
 		events = get_filtered_events(theme_filter=theme_filter, audience_filter=audience_filter)
 		self.assertEquals(2, events.count())
 
+	def test_get_filtered_events_with_theme_filter_and_audience_filter_with_past_approved_events(self):
+		event = Event.objects.create(
+			organizer='CodeCatz',
+			creator=User.objects.filter(pk=1)[0],
+			title='Programming for dummies',
+			description='Learn basics about programming in python',
+			location='Ljubljana',
+			start_date=datetime.datetime.now() - datetime.timedelta(days=2, hours=3),
+			end_date=datetime.datetime.now() - datetime.timedelta(days=1, hours=3),
+			event_url='http://example.com',
+			contact_person='[email protected]',
+			country='SI',
+			pub_date=datetime.datetime.now() - datetime.timedelta(days=2, hours=1))
+		theme = EventTheme.objects.filter(pk=1)
+		audience = EventAudience.objects.filter(pk=1)
+		event.theme.add(*theme)
+		event.audience.add(*audience)
+		event.status = 'APPROVED'
+		event.save()
+
+		test_event = Event.objects.get(title='asdasd')
+		test_event.status = 'APPROVED'
+		test_event.save()
+		theme_filter = EventTheme.objects.filter(pk=1)
+		audience_filter = EventAudience.objects.filter(pk=1)
+		events = get_filtered_events(theme_filter=theme_filter, audience_filter=audience_filter, past_events=True)
+		self.assertEquals(2, events.count())
+
+	def test_get_filtered_events_with_search_filter_searching_description_and_past_events(self):
+		event = Event.objects.create(
+			organizer='CodeCatz',
+			creator=User.objects.filter(pk=1)[0],
+			title='Programming for dummies',
+			description='Learn basics about programming in python',
+			location='Ljubljana',
+			start_date=datetime.datetime.now() - datetime.timedelta(days=4,hours=3),
+			end_date=datetime.datetime.now() - datetime.timedelta(days=3, hours=3),
+			event_url='http://example.com',
+			contact_person='[email protected]',
+			country='SI',
+			pub_date=datetime.datetime.now() - datetime.timedelta(days=4, hours=2))
+		theme = EventTheme.objects.filter(pk=1)
+		audience = EventAudience.objects.filter(pk=1)
+		event.theme.add(*theme)
+		event.audience.add(*audience)
+		event.status = 'APPROVED'
+		event.save()
+
+		search_filter = "python"
+		events = get_filtered_events(search_filter=search_filter, past_events=True)
+		self.assertEquals(1, events.count())
+		self.assertEquals(2, events[0].pk)
+
+
+	def test_get_filtered_events_with_search_filter_and_more_past_approved_events(self):
+		event = Event.objects.create(
+			organizer='CodeCatz',
+			creator=User.objects.filter(pk=1)[0],
+			title='Programming for dummies asdasd',
+			description='Learn basics about programming in python',
+			location='Ljubljana',
+			start_date=datetime.datetime.now() - datetime.timedelta(days=2, hours=3),
+			end_date=datetime.datetime.now() - datetime.timedelta(days=1, hours=1),
+			event_url='http://example.com',
+			contact_person='[email protected]',
+			country='SI',
+			pub_date=datetime.datetime.now() - datetime.timedelta(days=2, hours=1))
+		theme = EventTheme.objects.filter(pk=1)
+		audience = EventAudience.objects.filter(pk=1)
+		event.theme.add(*theme)
+		event.audience.add(*audience)
+		event.status = 'APPROVED'
+		event.save()
+
+		test_event = Event.objects.get(title='asdasd')
+		test_event.status = 'APPROVED'
+		test_event.save()
+		search_filter = "asdasd"
+		events = get_filtered_events(search_filter=search_filter, past_events=True)
+		self.assertEquals(2, events.count())
+
+
+
 	def test_event_without_creator_returns_exception(self):
 		with self.assertRaises(IntegrityError):
 			event = Event.objects.create(

web/forms/event_form.py

@@ -162,6 +162,12 @@ class SearchEventForm(forms.Form):
 		required=False,
 		widget=forms.TextInput(attrs={'placeholder': 'Search for event name or tag', 'class': 'form-control'})
 	)
+	past_events = forms.BooleanField(
+		label='Include past events',
+		required=False,
+		widget=forms.CheckboxInput(attrs={'class': 'search-form-element'}),
+		#choices=countries
+	)
 	country = forms.ChoiceField(
 		label='Select country',
 		required=False,

web/templates/pages/search_events.html

@@ -1,4 +1,5 @@
 {% extends 'base.html' %}
+{% load endless %}
 {% load static %}
 
 {% block title %}- Search Events{% endblock title %}
@@ -21,6 +22,12 @@
 							<label for="id_country">{{ form.fields.country.label }}</label>
 							{{ form.country }}
 
+							<div class="search-checkbox">
+								<hr>
+								{{ form.past_events }}
+								<label for="id_include_past">{{ form.past_events.label }}</label> 
+							</div>
+
 							<div class="search-checkbox">
 								<hr>
 								<label>{{ form.fields.theme.label }}</label>
@@ -38,9 +45,14 @@
 						<div class="col-md-8">
 							<div id="events-container">
 								{% if events %}
-									{% for event in events %}
+									{% paginate 6 events as pag_events %}
+
+									{% for event in pag_events %}
 										{% include 'layout/event_tile_long.html' %}
 									{% endfor %}
+
+									{% show_pages %}
+
 								{% else %}
 									<h3>
 										Sorry, no events matching your search criteria. Try expanding your search. 

web/views/events.py

@@ -269,8 +269,9 @@ def search_events(request):
 				country_filter = form.cleaned_data.get('country', None)
 				theme_filter = form.cleaned_data.get('theme', None)
 				audience_filter = form.cleaned_data.get('audience', None)
+				past_events = form.cleaned_data.get('past_events',None)
 
-				events = get_filtered_events(search_filter, country_filter, theme_filter, audience_filter)
+				events = get_filtered_events(search_filter, country_filter, theme_filter, audience_filter, past_events)
 				country = {'country_code': country_filter}
 		else:
 			form = SearchEventForm(country_code=country['country_code'])