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

Merged in [12835] from rcross@amsl.com:

Browse source 
Fixes #2202.  Interim sessions appear unordered.  Switch templates to use ordered assignments() related object manager.  Also removed now unused template filters.
 - Legacy-Id: 12839
Note: SVN reference [12835] has been migrated to Git commit 8607be0e21
This commit is contained in:
Henrik Levkowetz 2017-02-14 16:22:54 +00:00
parent 3949616482 8607be0e21
commit 29567adf34
3 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ietf/doc/templatetags/ietf_filters.py
View file

@ -571,16 +571,6 @@ def document_content(doc):
path = os.path.join(doc.get_file_path(),doc.filename_with_rev())
return get_document_content(doc.name,path,markup=False)
@register.filter
def session_start_time(session):
timeslot = session.official_timeslotassignment().timeslot
return timeslot.time
@register.filter
def session_end_time(session):
timeslot = session.official_timeslotassignment().timeslot
return timeslot.time + timeslot.duration
@register.filter
def format_timedelta(timedelta):
s = timedelta.seconds

6
ietf/templates/meeting/interim_announcement.txt
View file

@ -1,11 +1,11 @@
{% load ietf_filters %}{% if is_change %}MEETING DETAILS HAVE CHANGED. SEE LATEST DETAILS BELOW.
{% endif %}The {{ group.name }} ({{ group.acronym }}) {% if group.type.slug == "rg" %}Research Group{% elif group.state.slug == "active" %}Working Group{% elif group.state.slug == 'bof' %}BOF{% endif %} will hold
{% if meeting.session_set.count == 1 %}a{% if meeting.city %}n {% else %} virtual {% endif %}interim meeting on {{ meeting.date }} from {{ meeting.session_set.first | session_start_time | date:"H:i" }} to {{ meeting.session_set.first | session_end_time | date:"H:i" }} {{ meeting.time_zone }}.
{% if meeting.session_set.count == 1 %}a{% if meeting.city %}n {% else %} virtual {% endif %}interim meeting on {{ meeting.date }} from {{ meeting.agenda.assignments.first.timeslot.time | date:"H:i" }} to {{ meeting.agenda.assignments.first.timeslot.end_time | date:"H:i" }} {{ meeting.time_zone }}.
{% else %}a multi-day {% if not meeting.city %}virtual {% endif %}interim meeting.
{% for session in meeting.session_set.all %}Session {{ forloop.counter }}:
{{ session | session_start_time | date:"Y-m-d" }} {{ session | session_start_time | date:"H:i" }} to {{ session | session_end_time | date:"H:i" }} {{ meeting.time_zone }}
{% for assignment in meeting.agenda.assignments.all %}Session {{ forloop.counter }}:
{{ assignment.timeslot.time | date:"Y-m-d" }} {{ assignment.timeslot.time | date:"H:i" }} to {{ assignment.timeslot.end_time | date:"H:i" }} {{ meeting.time_zone }}
{% endfor %}{% endif %}
{% if meeting.city %}Meeting Location:
{{ meeting.city }}, {{ meeting.country }}

12
ietf/templates/meeting/interim_request_details.html
View file

@ -26,18 +26,18 @@
<dd>{{ meeting.country }}</dd>
<dt>Timezone</dt>
<dd>{{ meeting.time_zone }}</dd>
{% for session in sessions %}
{% for assignment in meeting.agenda.assignments.all %}
<br>
<dt>Date</dt>
<dd>{{ session.official_timeslotassignment.timeslot.time|date:"Y-m-d" }}
<dd>{{ assignment.timeslot.time|date:"Y-m-d" }}
<dt>Start Time</dt>
<dd>{{ session.official_timeslotassignment.timeslot.time|date:"H:i" }}
<dd>{{ assignment.timeslot.time|date:"H:i" }}
<dt>Duration</dt>
<dd>{{ session.requested_duration|format_timedelta }}
<dd>{{ assignment.session.requested_duration|format_timedelta }}
<dt>Remote Instructions</dt>
<dd>{{ session.remote_instructions }}
<dd>{{ assignment.session.remote_instructions }}
<dt>Additional Info</dt>
<dd>{{ session.agenda_note }}</dd>
<dd>{{ assignment.session.agenda_note }}</dd>
{% endfor %}
</dl>