Added page to display events from a department organiser

talks/events/urls.py

@@ -1,6 +1,6 @@
 from django.conf.urls import patterns, url
 
-from talks.events.views import (upcoming_events, show_person, show_event, events_for_day,
+from talks.events.views import (upcoming_events, show_person, show_event, events_for_day, show_department_organiser,
                                 events_for_month, events_for_year, list_event_groups,show_event_group, show_topic)
 from talks.contributors.views import (create_person, edit_person, edit_event, create_event, create_event_group,
                                       edit_event_group, delete_event, delete_event_group)
@@ -25,4 +25,5 @@
     url(r'^series/id/(?P<event_group_slug>[^/]+)/edit$', edit_event_group, name='edit-event-group'),
     url(r'^series/id/(?P<event_group_slug>[^/]+)/delete', delete_event_group, name='delete-event-group'),
     url(r'^topics/id/$', show_topic, name="show-topic"),
+    url(r'^department/id/(?P<org_id>[^/]+)$', show_department_organiser, name="show-department")
 )

talks/events/views.py

@@ -8,7 +8,7 @@
 
 from .models import Event, EventGroup, Person
 from talks.events.models import ROLES_SPEAKER
-from talks.events.datasources import TOPICS_DATA_SOURCE
+from talks.events.datasources import TOPICS_DATA_SOURCE, DEPARTMENT_DATA_SOURCE
 
 logger = logging.getLogger(__name__)
 
@@ -134,3 +134,13 @@ def show_topic(request):
         'events': events
     }
     return render(request, 'events/topic.html', context)
+
+
+def show_department_organiser(request, org_id):
+    org = DEPARTMENT_DATA_SOURCE.get_object_by_id(org_id)
+    events = Event.published.filter(department_organiser=org_id)
+    context = {
+        'org': org,
+        'events': events
+    }
+    return render(request, 'events/department.html', context)

talks/templates/events/department.html

@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+
+{% block title %}{{ org.name }}{% endblock %}
+
+
+{% block content %}
+
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <h3 class="panel-title">{{ org.name }}</h3>
+    </div>
+
+    <ul class="list-group">
+        {% for event in events.all %}
+        <li class="list-group-item">{{ event.formatted_date}} <a href="{% url 'show-event' event.slug %}">{{ event.title }}</a></li>
+        {% endfor %}
+    </ul>
+
+</div>
+
+<p><a href="//maps.ox.ac.uk/#/places/{{ org.id }}" target="_blank">See {{ org.name }} on <strong>maps.ox</strong></a></p>
+
+{% endblock %}

talks/templates/events/event.html

@@ -74,7 +74,7 @@ <h3 class="panel-title">{% if event.title %}{{ event.title }}{% else %}Untitled
         </li>
         {% endspaceless %}
         {% if event.api_organisation %}
-        <li class="list-group-item"><strong>Organising department</strong>: {{ event.api_organisation.name }}</li>
+        <li class="list-group-item"><strong>Organising department</strong>: <a href="{% url 'show-department' org_id=event.department_organiser %}">{{ event.api_organisation.name }}</a></li>
         {% endif %}
         {% if event.organisers %}
             <li class="list-group-item"><strong>Organiser{{ organisers|pluralize }}</strong>: {% for organiser in organisers %}<a href="{% url 'show-person' organiser.slug %}">{{ organiser.name }}{% if organiser.bio %} ({{ organiser.bio }}){% endif %}</a>{% if not forloop.last %}, {% endif %}