Rewrote html and text agenda templates to take schedule as data.

 - Legacy-Id: 6495

Author: levkowetz

ietf/meeting/models.py

@@ -3,6 +3,8 @@
 import pytz, datetime
 from urlparse import urljoin
 import copy
+import os
+
 import debug
 
 from django.db import models
@@ -463,6 +465,11 @@ def __unicode__(self):
     def base_url(self):
         return "/meeting/%s/agenda/%s" % (self.meeting.number, self.name)
 
+    # temporary property to pacify the places where Schedule.scheduledsession_set is used
+    @property
+    def scheduledsession_set(self):
+        return self.assignments
+
 #     def url_edit(self):
 #         return "/meeting/%s/agenda/%s/edit" % (self.meeting.number, self.name)
 # 
@@ -584,6 +591,15 @@ def calc_badness1(self, assignments):
         self.badness = badness
         return badness
 
+    def area_list(self):
+        return ( self.assignments.filter(session__group__type__slug__in=['wg', 'rg', 'ag'],
+                                         session__group__parent__isnull=False)
+                 .order_by('session__group__parent__acronym')
+                 .values_list('session__group__parent__acronym', flat=True)
+                 .distinct() )
+
+    def groups(self):
+        return Group.objects.filter(type__slug__in=['wg', 'rg', 'ag'], session__scheduledsession__schedule=self).distinct().order_by('parent__acronym', 'acronym')
 
 class ScheduledSession(models.Model):
     """
@@ -593,13 +609,16 @@ class ScheduledSession(models.Model):
     """
     timeslot = models.ForeignKey('TimeSlot', null=False, blank=False, help_text=u"")
     session  = models.ForeignKey('Session', null=True, default=None, help_text=u"Scheduled session")
-    schedule = models.ForeignKey('Schedule', null=False, blank=False, help_text=u"Who made this agenda")
+    schedule = models.ForeignKey('Schedule', null=False, blank=False, related_name='assignments')
     extendedfrom = models.ForeignKey('ScheduledSession', null=True, default=None, help_text=u"Timeslot this session is an extension of")
     modified = models.DateTimeField(default=datetime.datetime.now)
     notes    = models.TextField(blank=True)
     badness  = models.IntegerField(default=0, blank=True, null=True)
     pinned   = models.BooleanField(default=False, help_text="Do not move session during automatic placement")
 
+    class Meta:
+        ordering = ["timeslot__time", "session__group__parent__name", "session__group__acronym", "session__name", ]
+
     # use to distinguish this from FakeScheduledSession in placement.py
     faked   = "real"
 
@@ -724,7 +743,6 @@ def json_dict(self, selfurl):
         ss["pinned"]   = self.pinned
         return ss
 
-
 class Constraint(models.Model):
     """
     Specifies a constraint on the scheduling.
@@ -1142,3 +1160,20 @@ def badness_fast(self, timeslot, scheduleslot, session_pk_list):
             self.badness_log(1, "badgroup: %s badness = %u\n" % (self.group.acronym, badness))
         return badness
 
+    def agenda_text(self):
+        doc = self.agenda()
+        if doc:
+            path = os.path.join(settings.AGENDA_PATH, self.meeting.number, "agenda", doc.external_url)
+            if os.path.exists(path):
+                with open(path) as f:
+                    return f.read()
+            else:
+                "No agenda file found"
+        else:
+            return "The agenda has not been uploaded yet."
+
+    def type(self):
+        if self.group.type.slug in [ "wg" ]:
+            return "BOF" if self.group.state.slug in ["bof", "bof-conc"] else "WG"
+        else:
+            return ""

ietf/meeting/urls.py

@@ -7,13 +7,13 @@
 
 urlpatterns = patterns('',
     (r'^(?P<meeting_num>\d+)/materials.html$', views.materials),
-    (r'^agenda/$',          views.agenda_html_request),
+    (r'^agenda/$',          views.agenda),
     (r'^agenda-utc(?:.html)?$', views.html_agenda_utc),
-    (r'^agenda(?:.html)?$', views.agenda_html_request),
+    (r'^agenda(?:.html)?$', views.agenda),
     (r'^agenda/edit$', views.edit_agenda),
     (r'^requests.html$', redirect_to, {"url": '/meeting/requests', "permanent": True}),
     (r'^requests$', views.meeting_requests),
-    (r'^agenda.txt$', views.text_agenda),
+    (r'^agenda(?P<ext>.txt)$', views.agenda),
     (r'^agenda/agenda.ics$', views.ical_agenda),
     (r'^agenda.ics$', views.ical_agenda),
     (r'^agenda.csv$', views.csv_agenda),
@@ -22,12 +22,12 @@
     (r'^(?P<num>\d+)/schedule/edit$',        views.edit_agenda),
     (r'^(?P<num>\d+)/schedule/(?P<schedule_name>[A-Za-z0-9-:_]+)/edit$',      views.edit_agenda),
     (r'^(?P<num>\d+)/schedule/(?P<schedule_name>[A-Za-z0-9-:_]+)/details$',   views.edit_agenda_properties),
-    (r'^(?P<num>\d+)/schedule/(?P<schedule_name>[A-Za-z0-9-:_]+)(?:.html)?/?$', views.agenda_html_request),
-    (r'^(?P<num>\d+)/agenda(?:.html)?/?$',     views.agenda_html_request),
+    (r'^(?P<num>\d+)/schedule/(?P<name>[A-Za-z0-9-:_]+)(?P<ext>.html)?/?$', views.agenda),
+    (r'^(?P<num>\d+)/agenda(?P<ext>.html)?/?$',     views.agenda),
     (r'^(?P<num>\d+)/agenda-utc(?:.html)?/?$', views.html_agenda_utc),
     (r'^(?P<num>\d+)/requests.html$', redirect_to, {"url": '/meeting/%(num)s/requests', "permanent": True}),
     (r'^(?P<num>\d+)/requests$', views.meeting_requests),
-    (r'^(?P<num>\d+)/agenda.txt$', views.text_agenda),
+    (r'^(?P<num>\d+)/agenda(?P<ext>.txt)$', views.agenda),
     (r'^(?P<num>\d+)/agenda.ics$', views.ical_agenda),
     (r'^(?P<num>\d+)/agenda.csv$', views.csv_agenda),
     (r'^(?P<num>\d+)/agendas/edit$',                       views.edit_agendas),

ietf/meeting/views.py

@@ -432,15 +432,13 @@ def iphone_agenda(request, num, name):
                 "wg_list" : wgs, "rg_list" : rgs, "area_list" : areas},
             context_instance=RequestContext(request))
 
-
-def text_agenda(request, num=None, name=None):
-    timeslots, update, meeting, venue, ads, plenaryw_agenda, plenaryt_agenda = agenda_info(num)
-    plenaryw_agenda = "   "+plenaryw_agenda.strip().replace("\n", "\n   ")
-    plenaryt_agenda = "   "+plenaryt_agenda.strip().replace("\n", "\n   ")
-    return HttpResponse(render_to_string("meeting/agenda.txt",
-        {"timeslots":timeslots, "update":update, "meeting":meeting, "venue":venue, "ads":ads,
-            "plenaryw_agenda":plenaryw_agenda, "plenaryt_agenda":plenaryt_agenda, },
-        RequestContext(request)), mimetype="text/plain")
+def agenda(request, num=None, name=None, ext=".html"):
+    mimetype = {".html":"text/html", ".txt": "text/plain", ".ics":"text/calendar", ".csv":"text/csv"}
+    meeting = get_meeting(num)
+    schedule = get_schedule(meeting, name)
+    updated = Switches().from_object(meeting).updated()
+    return HttpResponse(render_to_string("meeting/agenda"+ext,
+        {"schedule":schedule, "updated": updated}, RequestContext(request)), mimetype=mimetype[ext])
 
 def read_agenda_file(num, doc):
     # XXXX FIXME: the path fragment in the code below should be moved to