From 9e5d36c1d173b897761a7a39284607863fb1a430 Mon Sep 17 00:00:00 2001
From: Michael Lee <michael.lee@neustar.biz>
Date: Wed, 16 May 2007 04:32:17 +0000
Subject: [PATCH] * Roll back WgMeetingSession.group_acronym_id per Bill  * add
 a method, acronym_name to ResolveAcronym  * Sunday sessions displaying is
 done  * Need to figure out how to increment date by one day in a template  -
 Legacy-Id: 135

---
 ietf/meeting/views.py              | 16 +++++++++-------
 ietf/proceedings/models.py         | 14 +++++++++++++-
 ietf/templates/meeting/agenda.html | 16 +++++++++++-----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 7b20a3d28..154039ad7 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -4,8 +4,7 @@ from django.shortcuts import render_to_response as render
 import django.newforms as forms
 from django.utils.html import escape, linebreaks
 import ietf.utils
-from ietf.proceedings import models
-#from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, SessionName
+from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, SessionName, NonSession, MeetingVenue
 from django.views.generic.list_detail import object_list
 
 def default(request):
@@ -19,7 +18,7 @@ def showlist(request):
 
 def list(request, template):
     """ Get A List of All Meetings That are in the system """  
-    meetings  = models.Meeting.objects.all()
+    meetings  = Meeting.objects.all()
     
     return render(template,
         {
@@ -32,10 +31,13 @@ def show_html_materials(request, meeting_num=None):
 	return render("meeting/list.html",{})
 
 def show_html_agenda(request, meeting_num=None):
-    meeting_info=models.Meeting.objects.filter(meeting_num=meeting_num)[0]
-    queryset_list=models.WgMeetingSession.objects.filter(meeting_num=meeting_num)
-    queryset_list_sun=models.WgMeetingSession.objects.filter(meeting=meeting_num, sched_time_id1__day_id=0).order_by('sched_time_id1__time_desc')
-    return object_list(request,queryset=queryset_list, template_name='meeting/agenda.html',allow_empty=True, extra_context={'qs_sun':queryset_list_sun, 'meeting_info':meeting_info, 'meeting_num':meeting_num})
+    meeting_info=Meeting.objects.filter(meeting_num=meeting_num)[0]
+    nonsession_info=NonSession.objects.filter(meeting=meeting_num)[0]
+    meetingvenue_info=MeetingVenue.objects.filter(meeting_num=meeting_num)[0]
+    queryset_list=MeetingTime.objects.filter(meeting=meeting_num).exclude(day_id=0).order_by("day_id","time_desc") 
+    #queryset_list=WgMeetingSession.objects.filter(meeting_num=meeting_num, group_acronym_id > -3) 
+    queryset_list_sun=WgMeetingSession.objects.filter(meeting=meeting_num, sched_time_id1__day_id=0).order_by('sched_time_id1__time_desc')
+    return object_list(request,queryset=queryset_list, template_name='meeting/agenda.html',allow_empty=True, extra_context={'qs_sun':queryset_list_sun, 'meeting_info':meeting_info, 'meeting_num':meeting_num, 'nonsession_info':nonsession_info, 'meetingvenue_info':meetingvenue_info})
 
 def show(request):
     return 0
diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py
index 24287b903..b8860fbf3 100644
--- a/ietf/proceedings/models.py
+++ b/ietf/proceedings/models.py
@@ -21,6 +21,18 @@ class ResolveAcronym(object):
 	if interim:
 	    return "i" + acronym
 	return acronym
+    def acronym_name(self):
+        try:
+            interim = self.interim
+        except AttributeError:
+            interim = False
+        if self.irtf:
+            acronym_name = IRTF.objects.get(pk=self.group_acronym_id).irtf_name
+        else:
+            acronym_name = Acronym.objects.get(pk=self.group_acronym_id).name
+        if interim:
+            return "i" + acronym
+        return acronym_name
 
 class Meeting(models.Model):
     meeting_num = models.IntegerField(primary_key=True)
@@ -155,7 +167,7 @@ class MeetingRoom(models.Model):
 class WgMeetingSession(models.Model, ResolveAcronym):
     session_id = models.AutoField(primary_key=True)
     meeting = models.ForeignKey(Meeting, db_column='meeting_num')
-    group_acronym = models.ForeignKey(Acronym, primary_key=True, unique=True, editable=False)
+    group_acronym_id = models.IntegerField()
     irtf = models.BooleanField()
     num_session = models.IntegerField()
     length_session1 = models.CharField(blank=True, maxlength=100)
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 671a5bd17..37c8ef3ed 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -5,7 +5,7 @@
 <center> 
 <strong> Agenda of the {{ meeting_num }}th IETF Meeting </strong> <br/> 
 <strong> {{ meeting_info.start_date|date:"F j, Y" }} - {{ meeting_info.end_date|date:"F j, Y" }} </strong><br />
-Updated As of : <br />
+Updated As of : {% now "F j, Y" %}<br />
 </center> 
 
 <a href="/meeting/{{meeting_num}}/agenda.txt"> Text Format of the Agenda </a> <br />
@@ -15,10 +15,16 @@ Updated As of : <br />
 </P>
 
 <p><b>SUNDAY, {{ meeting_info.start_date|date:"F j, Y" }}</b><br>
-
+{% filter escape %} {{ nonsession_info.time_desc }} {{ nonsession_info.non_session_ref }} - {{ meetingvenue_info.reg_area_name }} {% endfilter %}
+<br>
 {% for item in qs_sun %}
-{{ item.sched_time_id1.time_desc }} {{ item.group_acronym.name }} - {{ item.sched_room_id1.room_name }}<br>
+{{ item.sched_time_id1.time_desc }} {{ item.acronym_name }} - {{ item.sched_room_id1.room_name }}<br>
+{% endfor %}
+{% regroup object_list by day_id as days %}
+{% for day in days %}
+<b>Day: {{ meeting_info.start_date }} {{ day.grouper }}</b><br>
+{% for item in day.list %}
+<b>{{ item.time_desc }} </b><br>
+{% endfor %}
 {% endfor %}
-
-
 {% endblock %}