From 8b2e90f2124619203aaaa54b5263548aa2b38fc2 Mon Sep 17 00:00:00 2001
From: Michael Lee <michael.lee@neustar.biz>
Date: Thu, 17 May 2007 04:43:21 +0000
Subject: [PATCH] * Display more session data  * Add 'area' to class
 ResolveAcronym  * MeetingTime.session returns WgMeetingSession objects, BUT
 STILL NEED TO FIGURE OUT WHICH sched_room_id[1|2|3] TO USE  - Legacy-Id: 137

---
 ietf/proceedings/models.py         | 12 +++++++++++-
 ietf/templates/meeting/agenda.html |  6 +++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py
index b8860fbf3..c4fee10a5 100644
--- a/ietf/proceedings/models.py
+++ b/ietf/proceedings/models.py
@@ -1,5 +1,5 @@
 from django.db import models
-from ietf.idtracker.models import Acronym, PersonOrOrgInfo, IRTF
+from ietf.idtracker.models import Acronym, PersonOrOrgInfo, IRTF, AreaGroup
 import datetime
 
 # group_acronym is either an IETF Acronym
@@ -33,6 +33,16 @@ class ResolveAcronym(object):
         if interim:
             return "i" + acronym
         return acronym_name
+    def area(self):
+        try:
+            interim = self.interim
+        except AttributeError:
+            interim = False
+        if self.irtf:
+            area = "IRTF"
+        else:
+            area = AreaGroup.objects.get(group=self.group_acronym_id).area
+        return area 
 
 class Meeting(models.Model):
     meeting_num = models.IntegerField(primary_key=True)
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 37c8ef3ed..007a4e054 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -24,7 +24,11 @@ Updated As of : {% now "F j, Y" %}<br />
 {% 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>
+<b>{{ item.time_desc }} {{ item.session_name }} </b><br>
+
+{% for session in item.sessions %}
+{{ session.sched_room_id1.room_name }} {{ session.area }} {{ session.acronym }} {{ session.acronym_name }} <br>
+{% endfor %}
 {% endfor %}
 {% endfor %}
 {% endblock %}