Skip to content

Commit

Permalink
fix: /meeting/materials splits out named sessions the same way /meeti…
Browse files Browse the repository at this point in the history 
…ng/proceedings does (#5715)

* fix: /meeting/materials splits out named sessions the same way /meeting/proceedings does

* test: Test separation of named sessions in the materials
  • Loading branch information
@pselkirk
pselkirk authored Jun 9, 2023
1 parent fbe876b commit 0567b3d
Show file tree
Hide file tree
Showing 4 changed files with 142 additions and 99 deletions.
60 changes: 60 additions & 0 deletions ietf/meeting/tests_views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,66 @@ def test_interim_materials(self):

self.do_test_materials(meeting, session)

def test_named_session(self):
"""Session with a name should appear separately in the materials"""
meeting = MeetingFactory(type_id='ietf', number='100')
meeting.importantdate_set.create(name_id='revsub',date=date_today() + datetime.timedelta(days=20))
group = GroupFactory()
plain_session = SessionFactory(meeting=meeting, group=group)
named_session = SessionFactory(meeting=meeting, group=group, name='I Got a Name')
for doc_type_id in ('agenda', 'minutes', 'bluesheets', 'slides', 'draft'):
# Set up sessions materials that will have distinct URLs for each session.
# This depends on settings.MEETING_DOC_HREFS and may need updating if that changes.
SessionPresentationFactory(
session=plain_session,
document__type_id=doc_type_id,
document__uploaded_filename=f'upload-{doc_type_id}-plain',
document__external_url=f'external_url-{doc_type_id}-plain',
)
SessionPresentationFactory(
session=named_session,
document__type_id=doc_type_id,
document__uploaded_filename=f'upload-{doc_type_id}-named',
document__external_url=f'external_url-{doc_type_id}-named',
)

url = urlreverse('ietf.meeting.views.materials', kwargs={'num': meeting.number})
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
q = PyQuery(r.content)

plain_label = q(f'div#{group.acronym}')
self.assertEqual(plain_label.text(), group.acronym)
plain_row = plain_label.closest('tr')
self.assertTrue(plain_row)

named_label = q(f'div#{slugify(named_session.name)}')
self.assertEqual(named_label.text(), named_session.name)
named_row = named_label.closest('tr')
self.assertTrue(named_row)

for material in (sp.document for sp in plain_session.sessionpresentation_set.all()):
if material.type_id == 'draft':
expected_url = urlreverse(
'ietf.doc.views_doc.document_main',
kwargs={'name': material.canonical_name()},
)
else:
expected_url = material.get_href(meeting)
self.assertTrue(plain_row.find(f'a[href="{expected_url}"]'))
self.assertFalse(named_row.find(f'a[href="{expected_url}"]'))

for material in (sp.document for sp in named_session.sessionpresentation_set.all()):
if material.type_id == 'draft':
expected_url = urlreverse(
'ietf.doc.views_doc.document_main',
kwargs={'name': material.canonical_name()},
)
else:
expected_url = material.get_href(meeting)
self.assertFalse(plain_row.find(f'a[href="{expected_url}"]'))
self.assertTrue(named_row.find(f'a[href="{expected_url}"]'))

@override_settings(MEETING_MATERIALS_SERVE_LOCALLY=True)
def test_meeting_materials_non_utf8(self):
meeting = make_meeting_test_data()
Expand Down
21 changes: 19 additions & 2 deletions ietf/meeting/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ def materials(request, num=None):
).distinct().select_related('meeting__schedule', 'group__state', 'group__parent')).order_by('group__acronym')

plenaries = sessions.filter(name__icontains='plenary')
ietf = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu')
ietf = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu').order_by('group__parent__acronym', 'group__acronym')
irtf = sessions.filter(group__parent__acronym = 'irtf')
training = sessions.filter(group__acronym__in=['edu','iaoc'], type_id__in=['regular', 'other', ])
iab = sessions.filter(group__parent__acronym = 'iab')
Expand All @@ -179,12 +179,26 @@ def materials(request, num=None):
for type_name in ProceedingsMaterialTypeName.objects.all()
]

plenaries, _ = organize_proceedings_sessions(plenaries)
irtf, _ = organize_proceedings_sessions(irtf)
training, _ = organize_proceedings_sessions(training)
iab, _ = organize_proceedings_sessions(iab)
other, _ = organize_proceedings_sessions(other)

ietf_areas = []
for area, area_sessions in itertools.groupby(
ietf,
key=lambda s: s.group.parent
):
meeting_groups, not_meeting_groups = organize_proceedings_sessions(area_sessions)
ietf_areas.append((area, meeting_groups, not_meeting_groups))

with timezone.override(meeting.tz()):
return render(request, "meeting/materials.html", {
'meeting': meeting,
'proceedings_materials': proceedings_materials,
'plenaries': plenaries,
'ietf': ietf,
'ietf_areas': ietf_areas,
'training': training,
'irtf': irtf,
'iab': iab,
Expand Down Expand Up @@ -3671,6 +3685,7 @@ def organize_proceedings_sessions(sessions):
if s.current_status != 'notmeet' or s.sessionpresentation_set.exists():
by_name[s.name].append(s) # for notmeet, only include sessions with materials
for sess_name, ss in by_name.items():
session = ss[0] if ss else None
def _format_materials(items):
"""Format session/material for template
Expand All @@ -3697,6 +3712,7 @@ def _format_materials(items):
entry = {
'group': group,
'name': sess_name,
'session': session,
'canceled': all_canceled,
'has_materials': s.sessionpresentation_set.exists(),
'agendas': _format_materials((s, s.agenda()) for s in ss),
Expand All @@ -3705,6 +3721,7 @@ def _format_materials(items):
'recordings': _format_materials((s, s.recordings()) for s in ss),
'slides': _format_materials((s, s.slides()) for s in ss),
'drafts': _format_materials((s, s.drafts()) for s in ss),
'last_update': session.last_update if hasattr(session, 'last_update') else None
}
if is_meeting:
meeting_groups.append(entry)
Expand Down
118 changes: 48 additions & 70 deletions ietf/templates/meeting/group_materials.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,120 +5,98 @@
{% load tz %}
<tr>
<td>
{% if session.name %}
<div id="{{ session.name|slugify }}">{{ session.name }}</div>
{% if entry.name %}
<div id="{{ entry.name|slugify }}">{{ entry.name }}</div>
{% else %}
<div id="{{ session.group.acronym }}">
<a href="{% url 'ietf.group.views.group_home' acronym=session.group.acronym %}">{{ session.group.acronym }}</a>
<div id="{{ entry.group.acronym }}">
<a href="{% url 'ietf.group.views.group_home' acronym=entry.group.acronym %}">{{ entry.group.acronym }}</a>
</div>
{% if session.group.state.slug == "bof" %}
<span class="badge rounded-pill bg-success">{{ session.group.state.slug|upper }}</span>
{% if entry.group.state.slug == "bof" %}
<span class="badge rounded-pill bg-success">{{ entry.group.state.slug|upper }}</span>
{% endif %}
{% endif %}
</td>
{% if session.all_meeting_sessions_cancelled %}
{% if entry.canceled %}
<td colspan="{% if user|has_role:'Secretariat' or user_groups %}6{% else %}5{% endif %}">
<span class="badge rounded-pill bg-danger">Session cancelled</span>
</td>
{% else %}
<td>
{% if session.all_meeting_agendas %}
{% for agenda in session.all_meeting_agendas %}
{% if session.all_meeting_agendas|length == 1 %}
{% if agenda.time > old %}
<i class="small bi bi-bell"
title="Last Update: {{ agenda.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
{% endif %}
<a href="{{ session.all_meeting_agendas.0|meeting_href:session.meeting }}">Agenda</a>
<br>
{% else %}
<a href="{{ agenda|meeting_href:session.meeting }}">
Agenda {{ agenda.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}
</a>
<br>
{% endif %}
{% endfor %}
{% else %}
{% for agenda in entry.agendas %}
{% if entry.agendas|length == 1 and agenda.time > old %}
<i class="small bi bi-bell"
title="Last Update: {{ agenda.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
{% endif %}
<a href="{{ agenda.material|meeting_href:meeting }}">
Agenda {% if agenda.time %}{{agenda.time|date:"D G:i"}}{% endif %}
</a>
<br>
{% empty %}
{% if show_agenda == "True" %}<span class="badge rounded-pill bg-warning">No agenda</span>{% endif %}
{% endif %}
{% endfor %}
</td>
<td>
{% if session.all_meeting_minutes %}
{% if session.all_meeting_minutes|length == 1 %}
<a href="{{ session.all_meeting_minutes.0|meeting_href:session.meeting }}">Minutes</a>
<br>
{% else %}
{% for minutes in session.all_meeting_minutes %}
<a href="{{ minutes|meeting_href:session.meeting }}">
Minutes {{ minutes.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}
</a>
<br>
{% endfor %}
{% endif %}
{% else %}
{% for minutes in entry.minutes %}
<a href="{{ minutes.material|meeting_href:meeting }}">
Minutes {% if minutes.time %}{{minutes.time|date:"D G:i"}}{% endif %}
</a>
<br>
{% empty %}
{% if show_agenda == "True" %}<span class="badge rounded-pill bg-warning">No minutes</span>{% endif %}
{% endif %}
{% if session.type_id == 'regular' and show_agenda == "True" %}
{% if session.all_meeting_bluesheets %}
{% if session.all_meeting_bluesheets|length == 1 %}
<a href="{{ session.all_meeting_bluesheets.0|meeting_href:session.meeting }}">Bluesheets</a>
<br>
{% else %}
{% for bluesheets in session.all_meeting_bluesheets %}
<a href="{{ bluesheets|meeting_href:session.meeting }}">
Bluesheets
<br>
<span class="small float-end">{{ bluesheets.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i" }}</span>
</a>
<br>
{% endfor %}
{% endif %}
{% else %}
{% endfor %}
{% if entry.session.type_id == 'regular' and show_agenda == "True" %}
{% for bluesheet in entry.bluesheets %}
<a href="{{ bluesheet.material|meeting_href:meeting }}">
Bluesheets
{% if bluesheet.time %}
<br><span class="small float-end">{{ bluesheet.time|date:"D G:i" }}</span>
{% endif %}
</a>
<br>
{% empty %}
<span class="badge rounded-pill bg-warning">No bluesheets</span>
{% endif %}
{% endfor %}
{% endif %}
</td>
<td>
{% with session.all_meeting_slides as slides %}
{% for slide in slides %}
{% for slide in entry.slides %}
{% if slide.time > old %}
<i class="small bi bi-bell"
title="Last Update: {{ slide.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
{% endif %}
<a href="{{ slide|meeting_href:session.meeting }}">{{ slide.title|clean_whitespace }}</a>
<a href="{{ slide.material|meeting_href:meeting }}">{{ slide.material.title|clean_whitespace }}</a>
<br>
{% empty %}
<span class="badge rounded-pill bg-warning">No slides</span>
{% endfor %}
{% endwith %}
</td>
<td>
{% with session.all_meeting_drafts as drafts %}
{% for draft in drafts %}
{% for draft in entry.drafts %}
{% if draft.time > old %}
<i class="small bi bi-bell"
title="Last Update: {{ draft.time|utc|date:"Y-m-d H:i:s" }} UTC"></i>
{% endif %}
<a href="{{ draft.get_href }}">{{ draft.name }}</a>
<a href="{% url "ietf.doc.views_doc.document_main" name=draft.material.canonical_name %}">
{{ draft.material.canonical_name }}
</a>
<br>
{% empty %}
<span class="badge rounded-pill bg-warning">No Internet-Drafts</span>
{% endfor %}
{% endwith %}
</td>
<td>
{% if session.last_update %}
{{ session.last_update|utc|date:"Y-m-d" }}
{% if entry.last_update %}
{{ entry.last_update|utc|date:"Y-m-d" }}
<br>
<small class="text-muted">{{ session.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
<small class="text-muted">{{ entry.last_update|utc|date:"H:i:s" }}&nbsp;UTC</small>
{% endif %}
</td>
{% if user|has_role:"Secretariat" or user_groups %}
<td>
{% if user|has_role:"Secretariat" or session.group in user_groups %}
<div class="float-end">{% include "meeting/edit_materials_button.html" %}</div>
{% if user|has_role:"Secretariat" or entry.group in user_groups %}
<div class="float-end">{% include "meeting/edit_materials_button.html" with session=entry.session only %}</div>
{% endif %}
</td>
{% endif %}
{% endif %}
</tr>
</tr>
42 changes: 15 additions & 27 deletions ietf/templates/meeting/materials.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,16 @@ <h2 class="mt-4" id="plenaries">Plenaries</h2>
</tr>
</thead>
<tbody>
{% for session in plenaries %}
{% for entry in plenaries %}
{% include "meeting/group_materials.html" %}
{% endfor %}
</tbody>
</table>
{% endif %}
<!-- Working groups -->
{% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %}
{% for sessions in areas %}
<h2 class="mt-4" id="{{ sessions.list.0.group.parent.acronym }}">
{{ sessions.list.0.group.parent.acronym|upper }} <small>{{ sessions.grouper }}</small>
{% for area, meeting_groups, not_meeting_groups in ietf_areas %}
<h2 class="mt-4" id="{{ area.acronym }}">
{{ area.acronym|upper }} <small>{{ area.name }}</small>
</h2>
<table class="table table-sm table-striped tablesorter">
<thead>
Expand All @@ -79,10 +78,8 @@ <h2 class="mt-4" id="{{ sessions.list.0.group.parent.acronym }}">
</tr>
</thead>
<tbody>
{% for session in sessions.list|dictsort:"group.acronym" %}
{% ifchanged session.group.acronym %}
{% include "meeting/group_materials.html" %}
{% endifchanged %}
{% for entry in meeting_groups %}
{% include "meeting/group_materials.html" %}
{% endfor %}
</tbody>
</table>
Expand Down Expand Up @@ -110,11 +107,8 @@ <h2 class="mt-4" id="training">Training</h2>
</tr>
</thead>
<tbody>
{% for session in training %}
{% ifchanged %}
{# TODO: Find a better way to represent purposed sessions in both materials and proceedings #}
{% include "meeting/group_materials.html" %}
{% endifchanged %}
{% for entry in training %}
{% include "meeting/group_materials.html" %}
{% endfor %}
</tbody>
</table>
Expand Down Expand Up @@ -152,10 +146,8 @@ <h2 class="mt-4" id="iab">
</tr>
</thead>
<tbody>
{% for session in iab %}
{% ifchanged session.group.acronym %}
{% include "meeting/group_materials.html" %}
{% endifchanged %}
{% for entry in iab %}
{% include "meeting/group_materials.html" %}
{% endfor %}
</tbody>
</table>
Expand Down Expand Up @@ -192,10 +184,8 @@ <h2 class="mt-4" id="irtf">
</tr>
</thead>
<tbody>
{% for session in irtf|dictsort:"group.acronym" %}
{% ifchanged session.group.acronym %}
{% include "meeting/group_materials.html" %}
{% endifchanged %}
{% for entry in irtf %}
{% include "meeting/group_materials.html" %}
{% endfor %}
</tbody>
</table>
Expand Down Expand Up @@ -231,10 +221,8 @@ <h2 class="mt-4" id="other">
</tr>
</thead>
<tbody>
{% for session in other|dictsort:"group.acronym" %}
{% ifchanged session.group.acronym %}
{% include "meeting/group_materials.html" %}
{% endifchanged %}
{% for entry in other %}
{% include "meeting/group_materials.html" %}
{% endfor %}
</tbody>
</table>
Expand All @@ -245,4 +233,4 @@ <h2 class="mt-4" id="other">
{% block js %}
<script src="{% static "ietf/js/list.js" %}">
</script>
{% endblock %}
{% endblock %}

0 comments on commit 0567b3d

Please sign in to comment.