* 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

Author: Michael Lee

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 @@ def acronym_name(self):
         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)

ietf/templates/meeting/agenda.html

@@ -24,7 +24,11 @@
 {% 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 %}