altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Fix agenda.html

Browse source 
- Legacy-Id: 654
This commit is contained in:
Michael Lee 2007-06-26 17:40:29 +00:00
parent fadd223250
commit 76b254f3d8
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ietf/proceedings/models.py
View file

@ -237,11 +237,17 @@ class MeetingTime(models.Model):
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)
an_br1_info = NonSession.objects.exclude(time_desc="").get(meeting=self.meeting, day_id=self.day_id, non_session_ref=4)
if an_br1_info:
return "%s %s" % (an_br1_info.time_desc, an_br1_info.non_session_ref)
else:
return ""
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)
an_br2_info = NonSession.objects.exclude(time_desc="").get(meeting=self.meeting, day_id=self.day_id, non_session_ref=5)
if an_br2_info:
return "%s %s" % (an_br2_info.time_desc, an_br2_info.non_session_ref)
else:
return ""
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)

18
ietf/templates/meeting/agenda.html
View file

@ -37,10 +37,24 @@ Updated as of {{ last_update_info.updated_date }} {{ last_update_info.updated_ti
{{ day.list.0.lunch_br_info }} Break<br>
{% endifequal %}
{% ifequal item.session_name_id 4 %}
{{ day.list.0.an_br1_info }} - {{ meetingvenue_info.break_area_name }}<br>
{% if day.list.0.an_br1_info %}
{{ day.list.0.an_br1_info }} - {{ meetingvenue_info.break_area_name }}<br>
{% endif %}
{% endifequal %}
{% ifequal item.session_name_id 5 %}
{{ day.list.0.an_br2_info }} - {{ meetingvenue_info.break_area_name }}<br>
{% if day.list.0.an_br2_info %}
{{ day.list.0.an_br2_info }} - {{ meetingvenue_info.break_area_name }}<br>
{% endif %}
{% endifequal %}
{% ifequal item.session_name_id 8 %}
{% if day.list.0.an_br2_info %}
{{ day.list.0.an_br2_info }} - {{ meetingvenue_info.break_area_name }}<br>
{% endif %}
{% endifequal %}
{% ifequal item.session_name_id 10 %}
{% if day.list.0.an_br2_info %}
{{ day.list.0.an_br2_info }} - {{ meetingvenue_info.break_area_name }}<br>
{% endif %}
{% endifequal %}
<b>{{ item.time_desc }} {{ item.session_name }} </b>
{% ifequal item.sessions.0.acronym "plenaryw" %}