diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 33143ef5e..c24e1940a 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -50,4 +50,3 @@ def show_html_agenda(request, meeting_num=None):
def show(request):
return 0
-
diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py
index c4fee10a5..4f47b6303 100644
--- a/ietf/proceedings/models.py
+++ b/ietf/proceedings/models.py
@@ -59,6 +59,8 @@ class Meeting(models.Model):
overview2 = models.TextField(blank=True)
def __str__(self):
return "IETF %d" % (self.meeting_num)
+ def get_meeting_date (self,offset):
+ return self.start_date + datetime.timedelta(days=offset)
class Meta:
db_table = 'meetings'
class Admin:
@@ -135,10 +137,18 @@ class SessionName(models.Model):
pass
class MeetingTime(models.Model):
+ DAY_CHOICES=(
+ ('0', 'SUNDAY'),
+ ('1', 'MONDAY'),
+ ('2', 'TUESDAY'),
+ ('3', 'WEDNESDAY'),
+ ('4', 'THURSDAY'),
+ ('5', 'FRIDAY'),
+ )
time_id = models.AutoField(primary_key=True)
time_desc = models.CharField(maxlength=100)
meeting = models.ForeignKey(Meeting, db_column='meeting_num', unique=True)
- day_id = models.IntegerField()
+ day_id = models.IntegerField(choices=DAY_CHOICES)
session_name = models.ForeignKey(SessionName)
def __str__(self):
return "[%d] |%s| %s" % (self.meeting_id, (self.meeting.start_date + datetime.timedelta(self.day_id)).strftime('%A'), self.time_desc)
@@ -158,6 +168,8 @@ class MeetingTime(models.Model):
return WgMeetingSession.objects.filter(
models.Q(combined_time_id1=self.time_id) |
models.Q(combined_time_id2=self.time_id))
+ def meeting_date(self):
+ return self.meeting.get_meeting_date(self.day_id)
class Meta:
db_table = 'meeting_times'
class Admin:
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index 007a4e054..6f9826dac 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -13,19 +13,17 @@ Updated As of : {% now "F j, Y" %}
*** Click on an acronym of the group to get a charter page ***
*** Click on a name of the group to get a meeting agenda ***
SUNDAY, {{ meeting_info.start_date|date:"F j, Y" }}
-{% filter escape %} {{ nonsession_info.time_desc }} {{ nonsession_info.non_session_ref }} - {{ meetingvenue_info.reg_area_name }} {% endfilter %}
+
{{ meeting_info.start_date|date:"l, F j, Y" }}
+{{ nonsession_info.time_desc }} {{ nonsession_info.non_session_ref }} - {{ meetingvenue_info.reg_area_name }
{% for item in qs_sun %}
{{ item.sched_time_id1.time_desc }} {{ item.acronym_name }} - {{ item.sched_room_id1.room_name }}
{% endfor %}
{% regroup object_list by day_id as days %}
{% for day in days %}
-Day: {{ meeting_info.start_date }} {{ day.grouper }}
+Day: {{ day.list.1.meeting_date|date:"l, F j, Y" }}
{% for item in day.list %}
{{ item.time_desc }} {{ item.session_name }}
-
{% for session in item.sessions %}
{{ session.sched_room_id1.room_name }} {{ session.area }} {{ session.acronym }} {{ session.acronym_name }}
{% endfor %}