Merge lp:~cjohnston/summit/add-all-meetings into lp:summit

[Chris Johnston]

Creates a page that lists all meetings for an event

[Joe Talbott (joetalbott)]

Nothing jumps out at me. Those loops on L240 and L245 could get ugly if you have a lot of tracks and meetings but I don't thing that's the case right now.

I'm not familiar enough with the codebase to really comment on the templates and CSS stuff.

review: Approve

[Chris Johnston (cjohnston)]

I don't see tracks ever getting too much, but adding meetings in maybe. This code is just duplicated from elsewhere in summit, so it may be worthwhile to look at both of them.

[Chris Johnston (cjohnston)]

I'm going to merge it in, it can be fixed and used for the next UDS however we are running short of time now.

[Tarmac WebDev (tarmac-webdev)]

Attempt to merge into lp:summit failed due to conflicts:

text conflict in summit/schedule/templates/schedule/actions.html

[lp:~cjohnston/summit/add-all-meetings]

544. By Chris Johnston <email address hidden> on 2013-05-09

Fixes conflict

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[Joe Talbott (joetalbott)]

Looks good to me.

review: Approve

=== modified file 'summit/schedule/templates/schedule/actions.html'
--- summit/schedule/templates/schedule/actions.html	2013-05-08 20:26:52 +0000
+++ summit/schedule/templates/schedule/actions.html	2013-05-09 23:52:27 +0000
@@ -5,28 +5,41 @@
     <h3>Quick Links</h3>
     <div>
         <ul class="list">
+            
+{% ifequal summit.state "schedule" %}
+    <li><a href="{% url all_meetings summit.name %}">All meetings</a></li>
+    {% if summit_organizer %}
+        <li><a href="/{{ summit.name }}/create_meeting" title="Create Private Meeting">Create a meeting</a></li>
+        <li><a href="/{{ summit.name }}/review" title="Review Proposed Meetings">Review proposed meetings</a></li>
+    {% else %}
+        <li class="propose"><a href="/{{ summit.name }}/propose_meeting">Propose a meeting</a></li>
+    {% endif %}
+    {% if attendee %}
+        <li><a href="{% url summit.schedule.views.created_meetings summit.name attendee.user.username %}">My proposed meetings</a></li>
+    {% endif %}
+{% endifequal %}
 
 {% ifchangeschedule summit attendee %}
-        {% if schedule.date %}
-        <li><a href="/{{ summit.name }}/{{schedule.date|date:'Y-m-d'}}/display?edit">Schedule Meetings</a></li>
+    {% if schedule.date %}
+        <li><a href="/{{ summit.name }}/{{schedule.date|date:'Y-m-d'}}/display?edit">Schedule meetings</a></li>
+    {% else %}
+        {% if viewdate %}
+            <li><a href="/{{ summit.name }}/{{viewdate|date:'Y-m-d'}}/display?edit">Schedule meetings</a></li>
         {% else %}
-            {% if viewdate %}
-            <li><a href="/{{ summit.name }}/{{viewdate|date:'Y-m-d'}}/display?edit">Schedule Meetings</a></li>
-            {% else %}
-            <li><a href="/{{ summit.name }}/{{summit.date_start|date:'Y-m-d'}}/display?edit">Schedule Meetings</a></li>
-            {% endif %}
+            <li><a href="/{{ summit.name }}/{{summit.date_start|date:'Y-m-d'}}/display?edit">Schedule meetings</a></li>
         {% endif %}
+    {% endif %}
 {% endifchangeschedule %}
 
 {% ifequal summit.state "sponsor" %}
-        <li><a href="/{{ summit.name }}/sponsorship">Request sponsorship</a></li>
-        {% if perms.sponsor.add_sponsorshipscore %}
-            <li><a href="/{{ summit.name }}/suggestsponsorship">Suggest sponsorship</a></li>
-        {% endif %}
+    <li><a href="/{{ summit.name }}/sponsorship">Request sponsorship</a></li>
+    {% if perms.sponsor.add_sponsorshipscore %}
+        <li><a href="/{{ summit.name }}/suggestsponsorship">Suggest sponsorship</a></li>
+    {% endif %}
 {% else %}
-{% if not user.is_authenticated %}
-    <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
-{% endif %}
+    {% if not user.is_authenticated %}
+        <p><a href="/openid/login?next={{login_next}}">Log in now</a></p>
+    {% endif %}
 {% endifequal %}
 
 {% ifequal summit.state "review" %}
@@ -35,19 +48,6 @@
     {% endif %}
 {% endifequal %}
 
-
-{% ifequal summit.state "schedule" %}
-        {% if summit_organizer %}
-            <li><a href="/{{ summit.name }}/create_meeting" title="Create Private Meeting">Create a meeting</a></li>
-            <li><a href="/{{ summit.name }}/review" title="Review Proposed Meetings">Review proposed meetings</a></li>
-        {% else %}
-            <li class="propose"><a href="/{{ summit.name }}/propose_meeting">Propose a meeting</a></li>
-        {% endif %}
-        {% if attendee %}
-            <li><a href="{% url summit.schedule.views.created_meetings summit.name attendee.user.username %}">My proposed meetings</a></li>
-        {% endif %}
-{% endifequal %}
-
 {% if attendee %}
     <li><a href="{% url registration summit.name %}">Update registration</a></li>
 {% endif %}

=== added file 'summit/schedule/templates/schedule/all_meetings.html'
--- summit/schedule/templates/schedule/all_meetings.html	1970-01-01 00:00:00 +0000
+++ summit/schedule/templates/schedule/all_meetings.html	2013-05-09 23:52:27 +0000
@@ -0,0 +1,135 @@
+{% extends "base.html" %}
+
+{% block page_name %}
+All meetings - {{ summit.title }}
+{% endblock %}
+
+{% block extrahead %}
+{{ block.super }}
+<style>
+TABLE img.icon {
+    vertical-align: bottom;
+    width: 16px;
+    height: 16px;
+}
+
+table.basic span.main-agenda-item-tracks {
+    font-size: 0.8em;
+}
+
+div.agenda-details {
+    display: none;
+    padding: 5px;
+    position: absolute;
+    margin-left: 20px;
+    font-size: 0.9em;
+    color: #FFFFFF;
+    background-color: #101010;
+    border: #000000 1px solid;
+    border-radius: 5px;
+    min-width: 200px;
+    max-width: 500px;
+    z-index: 100;
+}
+
+div.meeting-description {
+    white-space: pre-wrap;
+}
+
+div.agenda-details LI {
+    font-size: 1.0em;
+}
+
+div.schedule-head {
+    position: relative;
+    overflow: visible;
+    z-index: 10;
+}
+
+div.schedule-head .schedule-qrcode {
+    height: 63px;
+    vertical-align: top;
+    margin-left: -3px;
+    margin-top: -3px;
+}
+
+div.schedule-head .schedule-date {
+    font-weight: normal;
+    font-size: 36px;
+    margin-left: 5px;
+}
+
+div.schedule-head .schedule-crew, .last-updated {
+    font-size: 0.7pc;
+}
+
+</style>
+{% endblock %}
+
+{% block sub_nav %}
+{% endblock %}
+
+{% block content %}
+<div class="row">
+<article class="span-12">
+
+{% for track, meetings in schedule.items %}
+<div class="schedule-head">
+    <h2>{{ track.title }}</h2>
+</div>
+<table class="basic">
+{% for meeting in meetings %}
+<tr style="background-color: {{ meeting.track_color }}; {% if meeting.private %}border: 1px; border-style: solid; border-color: #FF0000;{% endif %}">
+<td width="75%">
+    <span onMouseOver="show_meeting_details({{meeting.id}});" onMouseOut="hide_meeting_details({{meeting.id}});">
+    <a href="{{ meeting.meeting_page_url }}" style="color: #000000;" class="main-agenda-item-name">
+        {{ meeting.title }}
+    </a>
+<div id="meeting-{{meeting.id}}-details" class="agenda-details">
+<div class="arrow"></div>
+<div class="meeting-description">{{meeting.description}}</div>
+{% if meeting.participant_set.count %}
+<br /><b>Participants:</b>
+<div>{% for participant in meeting.participant_set.all %}
+    <div>
+        {% if participant.required %}
+        <img class="icon" src="/media/img/required.png" title="required" alt="(required)">
+        {% else %}
+        <img class="icon" src="/media/img/attending.png" alt="attending">
+        {% endif %}{{ participant.attendee.user }}</div>
+{% endfor %}</div>
+{% endif %}
+{% if meeting.tracks.count > 0 %}
+<br /><b>Tracks:</b>
+<ul>{% for track in meeting.tracks.all %}
+    <li style="color: #{{track.color}};">{{ track.title }}</li>
+{% endfor %}</ul>
+{% endif %}
+</div>
+</td>
+</tr>
+{% endfor %}
+</table>
+{% endfor%}
+</article>
+</div>
+{% block closure %}
+
+<script language="JavaScript">
+
+function show_meeting_details(meeting_id) {
+    var elem_id = 'meeting-'+meeting_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='block';
+}
+
+function hide_meeting_details(meeting_id) {
+    var elem_id = 'meeting-'+meeting_id+'-details'
+    var details = document.getElementById(elem_id)
+    details.style.display='none';
+}
+
+</script>
+{% endblock %}
+
+{% endblock %}

=== modified file 'summit/schedule/tests/reverse_url.py'
--- summit/schedule/tests/reverse_url.py	2013-02-27 03:39:43 +0000
+++ summit/schedule/tests/reverse_url.py	2013-05-09 23:52:27 +0000
@@ -218,3 +218,9 @@
         rev_args = ['uds-test', 'test+user']
         reverse_url = reverse('summit.schedule.views.user_ical', args=rev_args)
         self.assertEquals(reverse_url, '/uds-test/participant/test+user.ical')
+
+    def test_all_meetings_url(self):
+        rev_args = ['uds-test']
+        response = self.client.get(reverse('all_meetings', args=rev_args))
+        self.assertEquals(response.status_code, 200)
+        self.assertTemplateUsed(response, 'schedule/all_meetings.html')

=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py	2013-04-08 20:50:49 +0000
+++ summit/schedule/views.py	2013-05-09 23:52:27 +0000
@@ -924,6 +924,30 @@
     )
 
 
+@summit_only_required
+def all_meetings(request, summit):
+
+    schedule = SortedDict()
+
+    for track in summit.track_set.all():
+        if not track in schedule:
+            schedule[track] = list()
+
+        # Add meetings from this slot
+        for meeting in track.meeting_set.filter(approved='APPROVED'):
+            schedule[track].append(meeting)
+
+    context = {
+        'summit': summit,
+        'schedule': schedule,
+    }
+    return render_to_response(
+        "schedule/all_meetings.html",
+        context,
+        context_instance=RequestContext(request),
+    )
+
+
 @summit_required
 def created_meetings(request, summit, attendee, username):
 

=== modified file 'summit/urls.py'
--- summit/urls.py	2013-04-04 13:05:26 +0000
+++ summit/urls.py	2013-05-09 23:52:27 +0000
@@ -77,6 +77,11 @@
     (r'^(?P<summit_name>[\w-]+)/edit_meeting/(?P<meeting_id>\d+)/(?P<meeting_slug>[%+\.\w-]+)/$',
      'edit_meeting'),
     (r'^(?P<summit_name>[\w-]+)/review/$', 'review_pending'),
+    url(
+        r'^(?P<summit_name>[\w-]+)/all/$',
+        'all_meetings',
+        name='all_meetings',
+    ),
     (r'^(?P<summit_name>[\w-]+)/review_meeting/(?P<meeting_id>\d+)/$',
      'meeting_review'),
     (r'^(?P<summit_name>[\w-]+)/attend_meeting/(?P<meeting_id>\d+)/$',