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

Fixed the plenary display code for the text agenda to use the non-proxy plenary information to identify the plenaries, matching other previous changes from the agenda branch.

Browse source 
- Legacy-Id: 6383
This commit is contained in:
Henrik Levkowetz 2013-10-08 06:42:53 +00:00
parent dbc17624f8
commit bb148003b5
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/meeting/helpers.py
View file

@ -81,13 +81,11 @@ class NamedTimeSlot(object):
def is_plenary(self):
return self.timeslot.is_plenary
@property
def is_plenaryw(self):
return self.timeslot.is_plenary_type("plenaryw")
return self.timeslot.is_plenary_type("opsplenary")
@property
def is_plenaryt(self):
return self.timeslot.is_plenary_type("plenaryt")
return self.timeslot.is_plenary_type("techplenary")
@property
def tzname(self):

3
ietf/meeting/models.py
View file

@ -355,9 +355,8 @@ class TimeSlot(models.Model):
def is_plenary(self):
return self.type_id == "plenary"
@property
def is_plenary_type(self, name, agenda=None):
return self.scheduledsessions_at_same_time(agenda)[0].acronym == name
return self.type_id == "plenary" and self.sessions.all()[0].short == name
@property
def slot_decor(self):

4
ietf/templates/meeting/agenda.txt
View file

@ -14,9 +14,9 @@
{{ slot.meeting_date|date:"l"|upper }}, {{ slot.meeting_date|date:"F j, Y" }}{% if slot.reg_info %}
{{ slot.registration.time_desc }} {{ slot.registration.name }}{% if venue.reg_area_name %} - {{ venue.reg_area_name }}{% endif %}{% endif %}
{% endifchanged %}{% if slot.session_name %}{% if slot.break_info %}{{ slot.break_info.time_desc }} {{ slot.break_info.name }}{% if venue.break_area_name and slot.break_info.show_location %} - {{ venue.break_area_name }}{% endif %}
{% endif %}{{ slot.time_desc }} {{ slot.session_name }}{% if slot.is_plenary %} - {{ slot.room_name }}{% endif %}{% if slot.has_plenaryw %}
{% endif %}{{ slot.time_desc }} {{ slot.session_name }}{% if slot.is_plenary %} - {{ slot.room_name }}{% endif %}{% if slot.is_plenaryw %}
{{ plenaryw_agenda }}{% endif %}{% if slot.has_plenaryt %}
{{ plenaryw_agenda }}{% endif %}{% if slot.is_plenaryt %}
{{ plenaryt_agenda }}{% endif %}{% if not slot.is_plenary %}{% for ss in slot.scheduledsessions_by_area|dictsort:"area" %}{% if ss.info.session %}
{{ ss.info.room_name|ljust:14 }} {% if ss.info.area %}{{ ss.info.area|upper|ljust:4 }} {{ ss.info.acronym|ljust:10 }} {% endif %}{{ ss.info.acronym_name }} {{ ss.info.group_type_str }}{% if ss.info.special_agenda_note %} - {{ ss.info.special_agenda_note }}{% endif %}{% endif %}{% endfor %}{% endif %}