Merge remote-tracking branch 'upstream/master'

Author: ialja

api/processors.py

@@ -126,6 +126,21 @@ def get_created_events(creator, limit=None, order=None, country_code=None, past=
 		events = events = events[:limit]
 	return events
 
+def get_nearby_events(event, limit=None, past=False):
+
+	"""
+	Select ten events which are near by the current event 
+	"""
+
+	events = Event.objects.filter(status='APPROVED').filter(country=event.country).exclude(pk=event.pk)
+
+	if not past:
+		events = events.filter(end_date__gte=datetime.datetime.now())
+	if limit:
+		events = events[:limit]
+
+	return events
+
 def list_themes():
 	themes = EventTheme.objects.all()
 

web/templates/layout/near_event_tile.html

@@ -0,0 +1,16 @@
+{% load static %}
+<div class="col-sm-3 col-xs-6">
+	<a href="{% url 'web.view_event' event.id event.slug %}" class="thumbnail clearfix">
+		<h4>{{ event.title }}</h4>
+		<div class="caption">
+			<span class="countdown pull-left caption">
+				{{ event.start_date|date:"F j, Y" }}
+			</span>
+		</div>
+		{% if event.picture %}
+			<img src="{{ event.picture.url }}" alt="{{ event.title }} Image">
+		{% else %}
+			<img src="{% static 'img/event_default_picture.png' %}" alt="{{ event.title }} Image">
+		{% endif %}
+	</a>
+</div>

web/templates/pages/view_event.html

@@ -188,11 +188,22 @@ <h1>{{ event.title }}</h1>
 			<div class="col-md-12 first">
 				<hr>
 			</div>
-			<div id="view-event-map-wrapper" class=" col-md-12 first">
+			<div id="view-event-map-wrapper" class="col-md-12 first">
 				<div id="view-event-map"></div>
 			</div>
+			</div>
+			<div class="col-md-12 first">
+				<hr>
+			</div>
+			{% if nearby %}
+			<div class="col-md-12 first">
+				<h3>Nearby events:</h3>
+				{% for event in nearby %}
+					{% include 'layout/near_event_tile.html' %}
+				{% endfor %}
+			</div>
+			{% endif %}
 		</div>
-	</div>
 {% endblock content %}
 
 {% block custom_js %}

web/tests/test_events_processors.py

@@ -11,6 +11,7 @@
 from web.processors.event import create_or_update_event
 from api.processors import get_approved_events
 from api.processors import get_next_or_previous
+from api.processors import get_nearby_events
 
 
 class EventTestCase(TestCase):
@@ -205,3 +206,21 @@ def test_get_next_or_previous_pending_event(self):
 
 		self.assertEqual(None, previous_event_2)
 
+	def test_get_nearby_events(self):
+		target_event = self.create_event(status="APPROVED")
+		nearby_event = self.create_event(status="APPROVED")
+		nearby = get_nearby_events(target_event)
+
+		self.assertEqual(1, len(nearby))
+		self.assertEqual(nearby_event.pk, nearby[0].pk)
+
+		self.create_event(status="APPROVED", country_code="HR")
+		nearby = get_nearby_events(target_event)
+		
+		self.assertEqual(1, len(nearby))
+
+		self.create_event(status="PENDING")
+		nearby = get_nearby_events(target_event)
+
+		self.assertEqual(1, len(nearby))
+

web/views/events.py

@@ -16,6 +16,7 @@
 from api.processors import get_pending_events
 from api.processors import get_created_events
 from api.processors import get_next_or_previous
+from api.processors import get_nearby_events
 from web.forms.event_form import AddEventForm
 from web.forms.event_form import SearchEventForm
 from web.processors.event import get_initial_data
@@ -191,11 +192,13 @@ def view_event_by_country(request, country_code):
 def view_event(request, event_id, slug):
 	event = get_event_by_id(event_id)
 	next_event = get_next_or_previous(event, country_code=event.country)
+	nearby = get_nearby_events(event, limit=10)
 
 	return render_to_response(
 		'pages/view_event.html', {
 			'event': event,
 			'next_event': next_event,
+			'nearby': nearby
 		}, context_instance=RequestContext(request))