diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py index 8d09bbbef..78b835c6c 100644 --- a/ietf/proceedings/models.py +++ b/ietf/proceedings/models.py @@ -234,16 +234,18 @@ class MeetingTime(models.Model): def morning_br_info(self): br_info = NonSession.objects.get(models.Q(day_id=self.day_id) | models.Q(day_id__isnull=True), meeting=self.meeting, non_session_ref=2) # Hack, hack. Please update the database instead! - return "%s %s" % (br_info.time_desc, "Continental Breakfast") #return "%s %s" % (br_info.time_desc, br_info.non_session_ref) + return "%s %s" % (br_info.time_desc, "Continental Breakfast") def lunch_br_info(self): return NonSession.objects.get(meeting=self.meeting, non_session_ref=3).time_desc def an_br1_info(self): an_br1_info = NonSession.objects.get(meeting=self.meeting, day_id=self.day_id, non_session_ref=4) - return "%s %s" % (an_br1_info.time_desc, an_br1_info.non_session_ref) + #return "%s %s" % (an_br1_info.time_desc, an_br1_info.non_session_ref) + return "%s %s" % (an_br1_info.time_desc, "Afternoon Refreshment Break") def an_br2_info(self): an_br2_info = NonSession.objects.get(meeting=self.meeting, day_id=self.day_id, non_session_ref=5) - return "%s %s" % (an_br2_info.time_desc, an_br2_info.non_session_ref) + #return "%s %s" % (an_br2_info.time_desc, an_br2_info.non_session_ref) + return "%s %s" % (an_br2_info.time_desc, "Afternoon Refreshment Break") def fbreak_info(self): fbreak_info = NonSession.objects.get(meeting=self.meeting, day_id=5, non_session_ref=6) return "%s %s" % (fbreak_info.time_desc, fbreak_info.non_session_ref) diff --git a/ietf/templates/meeting/agenda.txt b/ietf/templates/meeting/agenda.txt index c45d918c8..973160dca 100644 --- a/ietf/templates/meeting/agenda.txt +++ b/ietf/templates/meeting/agenda.txt @@ -10,7 +10,7 @@ xml:lang="en-US">Agenda of the {{ meeting_num|ordinal }} IETF Meeti {% filter center:72 %}Agenda of the {{ meeting_num|ordinal }} IETF Meeting{% endfilter %} {% filter center:72 %}{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date|date:"F" meeting_info.end_date|date:"F" %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }}{% endfilter %} -Updated As of {% now "F j, Y, H:i:s (T)" %} +Updated as of {% now "F j, Y, H:i:s (T)" %} {{ meeting_info.start_date|date:"l"|upper }}, {{ meeting_info.start_date|date:"F j, Y" }} {{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }} - {{ meetingvenue_info.reg_area_name }} @@ -22,12 +22,12 @@ Updated As of {% now "F j, Y, H:i:s (T)" %} {% if day.list.0.reg_info %}{{ day.list.0.reg_info }} - {{ meetingvenue_info.reg_area_name }} {% endif %}{% ifequal day.list.0.day_id "5" %}{{ day.list.0.fbreak_info }} - {{ meetingvenue_info.break_area_name }}{% else %}{{ day.list.0.morning_br_info }} - {{ meetingvenue_info.break_area_name }} {% endifequal %}{% for item in day.list %}{% ifequal item.session_name_id 3 %}{{ day.list.0.lunch_br_info }} Break -{% endifequal %}{% ifequal item.session_name_id 4 %}{{ day.list.0.an_br1_info }} -{% endifequal %}{% ifequal item.session_name_id 5 %}{{ day.list.0.an_br2_info }} +{% endifequal %}{% ifequal item.session_name_id 4 %}{{ day.list.0.an_br1_info }} - {{ meetingvenue_info.break_area_name }} +{% endifequal %}{% ifequal item.session_name_id 5 %}{{ day.list.0.an_br2_info }} - {{ meetingvenue_info.break_area_name }} {% endifequal %}{{ item.time_desc }} {{ item.session_name }}{% ifequal item.sessions.0.acronym "plenaryw" %}{{ item.sessions.0.room_id.room_name }} {{ plenaryw_agenda|escape }}{% else %}{% ifequal item.sessions.0.acronym "plenaryt" %}{{ item.sessions.0.room_id.room_name }} {{ plenaryt_agenda|escape }}{% else %}{% for session in item.sessions|dictsort:"area" %} -{{ session.room_id.room_name|ljust:20 }} {{ session.area|upper|ljust:5 }} {{ session.acronym|lower|ljust:10 }} {{ session.acronym_name }} {{ session.group_type_str }}{% if session.special_agenda_note %} - {{ session.special_agenda_note|upper }}{% endif %}{% endfor %} +{{ session.room_id.room_name|ljust:16 }} {{ session.area|upper|ljust:4 }} {{ session.acronym|ljust:7 }} {{ session.acronym_name }} {{ session.group_type_str }}{% if session.special_agenda_note %} - {{ session.special_agenda_note }}{% endif %}{% endfor %} {% endifequal %}{% endifequal %} {% endfor %} {% endfor %}