Search past events and paginated results

Author: Mateja

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) 

web/forms/event_form.py

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

web/templates/pages/search_events.html

@@ -17,17 +17,17 @@
 						</div>
 						<div class="col-md-12"><hr></div>
 					</div>
-					<div class="row">
-						<div class="col-md-4">
-						<label for="id_include_past">{{ form.all_events.label }}</label> 
-						{{ form.all_events }}
-						</div>
-					</div>
 					<div class="row">
 						<div class="col-md-4">
 							<label for="id_country">{{ form.fields.country.label }}</label>
 							{{ form.country }}
 
+							<div class="search-checkbox">
+								<hr>
+								{{ form.past }}
+								<label for="id_include_past">{{ form.past.label }}</label> 
+							</div>
+
 							<div class="search-checkbox">
 								<hr>
 								<label>{{ form.fields.theme.label }}</label>

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)
+				include_past_events = form.cleaned_data.get('past',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,include_past_events)
 				country = {'country_code': country_filter}
 		else:
 			form = SearchEventForm(country_code=country['country_code'])