Merge pull request #252 from ialja/past-events

Add the ability to display past events on the map

Author: ercchy

static/js/index.js

@@ -13,7 +13,6 @@ var Codeweek = window.Codeweek || {};
 		placeinfowindow = null,
 		overlapSpiderifier = null;
 
-
 	function createMap(events, lat, lng, zoomVal) {
 		var markerData = JSON.parse(events),
 			markerData_len = markerData.length,
@@ -212,6 +211,7 @@ var Codeweek = window.Codeweek || {};
 			$('#country').html(country_name);
 	}
 
+
 	function initialize(events, lon, lan) {
 		map = createMap(events, lon, lan, 3);
 		//setAutocomplete();
@@ -250,6 +250,12 @@ var Codeweek = window.Codeweek || {};
 				document.location.hash = "!" + country_code;
 			});
 
+			$("#past-link").click(function (event) {
+		
+				var newUrl = $(this).attr('href') + document.location.hash;
+				$(this).attr('href', newUrl);
+			});
+
 			$("#zoomEU").click(function (event) {
 				event.preventDefault();
 

static/scss/_base.scss

@@ -138,10 +138,30 @@ INDEX PAGE STYLES
 	padding-left: 0.5em;
 	padding-right: 0.5em;
 }
+
 #showcountries{
 	background-color: $whitesmoke;
 	padding-bottom: 25px;
 }
+
+#past-events{
+	position: absolute;
+	top: 0;
+	right: 0;
+	padding-top: 15px;
+	padding-bottom: 15px;
+	padding-left: 30px;
+	padding-right: 25px;
+	z-index: 0;
+	border-style: solid;
+	border-color: $primary-color;
+	border-width: 0px 0px 2px 2px;
+	background-color: $whitesmoke;
+	background: rgba($whitesmoke, 0.8);
+	font-size: 14px;
+	@include border-radius(15px);
+}
+
 .country-link {
 	margin: 1em 0;
 	height: 80px;

static/scss/mixins.scss

@@ -0,0 +1,6 @@
+@mixin border-radius($radius) {
+  -webkit-border-radius: 0 0 0 $radius;
+     -moz-border-radius: 0 0 0 $radius;
+      -ms-border-radius: 0 0 0 $radius;
+          border-radius: 0 0 0 $radius;
+}

web/templates/pages/index.html

@@ -29,6 +29,14 @@
 		</div>
 
 		<div class="container index-content">
+			<div id="past-events">
+				{% if past == 'yes' %}
+				<a id="past-link" href="{% url 'web.index' %}"><i class="fa fa-check-square-o"></i> 
+				{% else %}
+				<a id="past-link" href="{% url 'web.index' %}?past=yes"><i class="fa fa-square-o"></i>
+				{% endif %}
+				Show past events</a>
+			</div>
 			<div class="clearfix">
 				<div id="search-events-link">
 					<a class="btn btn-primary btn-lg"

web/tests/test_event_views.py

@@ -36,7 +36,6 @@ def test_index_view_without_approved_events(self):
 		self.assertEquals(200, response.status_code)
 		self.assertJSONEqual('[]', json.loads(response.context['map_events']))
 		self.assertEquals((46.0, 15.0), response.context['lan_lon'])
-		self.assertQuerysetEqual([], response.context['latest_events'])
 		self.assertTemplateUsed(response, 'pages/index.html')
 
 	def test_index_view_changing_remote_in_request(self):
@@ -77,8 +76,6 @@ def test_index_with_approved_events(self):
 		#assert
 		self.assertJSONEqual(expected_map_events_result, json.loads(response.context['map_events']))
 		self.assertEquals('SI', response.context['country']['country_code'])
-		self.assertEquals(1, len(response.context['latest_events']))
-		self.assertEquals(aproved.title, response.context['latest_events'][0].title)
 
 	def test_view_event_without_picture(self):
 		#setup

web/views/events.py

@@ -44,7 +44,13 @@
 
 def index(request, country_code=None):
 	template = 'pages/index.html'
-	events = get_approved_events()
+
+	past = request.GET.get('past', 'no')
+	if past == 'yes':
+		events = get_approved_events(past=True)
+	else:
+		events = get_approved_events()
+
 	map_events = serializers.serialize('json', events, fields=('geoposition', 'title', 'pk', 'slug', 'description', 'picture'))
 	user_ip = get_client_ip(forwarded=request.META.get('HTTP_X_FORWARDED_FOR'),
 	                        remote=request.META.get('REMOTE_ADDR'))
@@ -56,16 +62,14 @@ def index(request, country_code=None):
 	except GeoIPException:
 		lan_lon = (58.08695, 5.58121)
 
-	events = get_approved_events(order='pub_date', country_code=country.get('country_code', None))
-
 	all_countries = list_countries()
 	return render_to_response(
 		template, {
-			'latest_events': events,
 			'map_events': map_events,
 			'lan_lon': lan_lon,
 			'country': country,
 			'all_countries': all_countries,
+			'past': past
 		},
 		context_instance=RequestContext(request))