Skip to content

Commit 5b05555

Browse files
alireza83alireza83
committed
Ticket# 1644 : add "last updated" timestamps on meeting materials page
Added UTC time to the tooltip of Agenda and slides and an new column of Updated. Updated column present the latest time stamp for agenda and slides. - Legacy-Id: 13908
1 parent 263551d commit 5b05555

3 files changed

Lines changed: 72 additions & 49 deletions

File tree

‎ietf/meeting/views.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,13 @@ def materials(request, num=None):
128128
training = sessions.filter(group__acronym__in=['edu','iaoc'], type_id__in=['session', 'other', ])
129129
iab = sessions.filter(group__parent__acronym = 'iab')
130130

131+
for topic in [plenaries, ietf, training, irtf, iab]:
132+
for event in topic:
133+
date_list = []
134+
for slide_event in event.all_meeting_slides(): date_list.append(slide_event.time)
135+
for agenda_event in event.all_meeting_agendas(): date_list.append(agenda_event.time)
136+
if date_list: setattr(event, 'last_update', sorted(date_list, reverse=True)[0])
137+
131138
return render(request, "meeting/materials.html", {
132139
'meeting_num': meeting.number,
133140
'plenaries': plenaries,

‎ietf/templates/meeting/group_materials.html‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{# Copyright The IETF Trust 2015, All Rights Reserved #}{% load origin %}{% origin %}
22
{% load ietf_filters proceedings_filters managed_groups %}
3+
{% load tz %}
34
<tr>
45
<td>
56
{% comment %}
@@ -27,7 +28,7 @@
2728
<td>
2829
{% if session.all_meeting_agendas %}
2930
{% if session.all_meeting_agendas|length == 1 %}
30-
<a href="{{ session.all_meeting_agendas.0|meeting_href:session.meeting }}">Agenda</a><br>
31+
<a title="Last Update: {{ session.all_meeting_agendas.0.time|utc|date:"Y-m-d H:i:s" }} UTC" href="{{ session.all_meeting_agendas.0|meeting_href:session.meeting }}">Agenda</a><br>
3132
{% else %}
3233
{% for agenda in session.all_meeting_agendas %}
3334
<a href="{{agenda|meeting_href:session.meeting}}">Agenda {{agenda.sessionpresentation_set.first.session.official_timeslotassignment.timeslot.time|date:"D G:i"}}</a></br>
@@ -57,7 +58,7 @@
5758
<td>
5859
{% with session.all_meeting_slides as slides %}
5960
{% for slide in slides %}
60-
<a href="{{ slide|meeting_href:session.meeting}}">{{ slide.title|clean_whitespace }}</a>
61+
<a title="Last Update: {{ slide.time|utc|date:"Y-m-d H:i:s" }} UTC" href="{{ slide|meeting_href:session.meeting}}">{{ slide.title|clean_whitespace }}</a>
6162
<br>
6263
{% empty %}
6364
<span class="label label-warning">No slides</span>
@@ -67,12 +68,17 @@
6768
<td>
6869
{% with session.all_meeting_drafts as drafts %}
6970
{% for draft in drafts %}
70-
<a href="{{ draft.href }}">{{ draft.name }}</a><br>
71+
<a title="Last Update: {{ draft.time|utc|date:"Y-m-d H:i:s" }} UTC" href="{{ draft.href }}">{{ draft.name }}</a><br>
7172
{% empty %}
7273
<span class="label label-warning">No drafts</span>
7374
{% endfor %}
7475
{% endwith %}
7576
</td>
77+
<td>
78+
{% if session.last_update %}
79+
{{ session.last_update|utc|date:"Y-m-d" }}<br><small>{{ session.last_update|utc|date:"H:i:s" }} UTC</small>
80+
{% endif %}
81+
</td>
7682
{% if user|has_role:"Secretariat" or user|managed_groups %}
7783
<td>
7884
<div>{% include "meeting/edit_materials_button.html" %}</div>

‎ietf/templates/meeting/materials.html‎

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,22 @@ <h2 class="anchor-target" id="plenaries">Plenaries</h2>
4040
<table class="table table-condensed table-striped tablesorter">
4141
<thead>
4242
<tr>
43-
{% if user|has_role:"Secretariat" or user|managed_groups %}
43+
{% if user|has_role:"Secretariat" or user|managed_groups %}
4444
<th class="col-md-1">Group</th>
4545
<th class="col-md-1">Agenda</th>
4646
<th class="col-md-1">Minutes</th>
47-
<th class="col-md-5">Slides</th>
48-
<th class="col-md-2">Drafts</th>
49-
<th class="col-md-2">&nbsp;</th>
50-
{% else %}
47+
<th class="col-md-3">Slides</th>
48+
<th class="col-md-4">Drafts</th>
49+
<th class="col-md-1">Updated</th>
50+
<th class="col-md-1">&nbsp;</th>
51+
{% else %}
5152
<th class="col-md-1">Group</th>
5253
<th class="col-md-1">Agenda</th>
5354
<th class="col-md-1">Minutes</th>
54-
<th class="col-md-6">Slides</th>
55-
<th class="col-md-3">Drafts</th>
56-
{% endif %}
55+
<th class="col-md-4">Slides</th>
56+
<th class="col-md-4">Drafts</th>
57+
<th class="col-md-1">Updated</th>
58+
{% endif %}
5759
</tr>
5860
</thead>
5961

@@ -72,20 +74,22 @@ <h2 class="anchor-target" id="{{sessions.list.0.group.parent.acronym}}">{{sessio
7274
<table class="table table-condensed table-striped tablesorter">
7375
<thead>
7476
<tr>
75-
{% if user|has_role:"Secretariat" or user|managed_groups %}
77+
{% if user|has_role:"Secretariat" or user|managed_groups %}
7678
<th class="col-md-1">Group</th>
7779
<th class="col-md-1">Agenda</th>
7880
<th class="col-md-1">Minutes</th>
79-
<th class="col-md-5">Slides</th>
80-
<th class="col-md-2">Drafts</th>
81-
<th class="col-md-2">&nbsp;</th>
82-
{% else %}
81+
<th class="col-md-3">Slides</th>
82+
<th class="col-md-4">Drafts</th>
83+
<th class="col-md-1">Updated</th>
84+
<th class="col-md-1">&nbsp;</th>
85+
{% else %}
8386
<th class="col-md-1">Group</th>
8487
<th class="col-md-1">Agenda</th>
8588
<th class="col-md-1">Minutes</th>
86-
<th class="col-md-6">Slides</th>
87-
<th class="col-md-3">Drafts</th>
88-
{% endif %}
89+
<th class="col-md-4">Slides</th>
90+
<th class="col-md-4">Drafts</th>
91+
<th class="col-md-1">Updated</th>
92+
{% endif %}
8993
</tr>
9094
</thead>
9195

@@ -106,20 +110,22 @@ <h2 class="anchor-target" id="training">Training</h2>
106110
<table class="table table-condensed table-striped tablesorter">
107111
<thead>
108112
<tr>
109-
{% if user|has_role:"Secretariat" or user|managed_groups %}
110-
<th class="col-md-1">Group</th>
111-
<th class="col-md-1">Agenda</th>
112-
<th class="col-md-1">Minutes</th>
113-
<th class="col-md-5">Slides</th>
114-
<th class="col-md-2">Drafts</th>
115-
<th class="col-md-2">&nbsp;</th>
116-
{% else %}
117-
<th class="col-md-1">Group</th>
118-
<th class="col-md-1">Agenda</th>
119-
<th class="col-md-1">Minutes</th>
120-
<th class="col-md-6">Slides</th>
121-
<th class="col-md-3">Drafts</th>
122-
{% endif %}
113+
{% if user|has_role:"Secretariat" or user|managed_groups %}
114+
<th class="col-md-1">Group</th>
115+
<th class="col-md-1">Agenda</th>
116+
<th class="col-md-1">Minutes</th>
117+
<th class="col-md-3">Slides</th>
118+
<th class="col-md-4">Drafts</th>
119+
<th class="col-md-1">Updated</th>
120+
<th class="col-md-1">&nbsp;</th>
121+
{% else %}
122+
<th class="col-md-1">Group</th>
123+
<th class="col-md-1">Agenda</th>
124+
<th class="col-md-1">Minutes</th>
125+
<th class="col-md-4">Slides</th>
126+
<th class="col-md-4">Drafts</th>
127+
<th class="col-md-1">Updated</th>
128+
{% endif %}
123129
</tr>
124130
</thead>
125131

@@ -140,20 +146,22 @@ <h2 class="anchor-target" id="iab">IAB <small>Internet Architecture Board</small
140146
<table class="table table-condensed table-striped tablesorter">
141147
<thead>
142148
<tr>
143-
{% if user|has_role:"Secretariat" or user|managed_groups %}
149+
{% if user|has_role:"Secretariat" or user|managed_groups %}
144150
<th class="col-md-1">Group</th>
145151
<th class="col-md-1">Agenda</th>
146152
<th class="col-md-1">Minutes</th>
147-
<th class="col-md-5">Slides</th>
148-
<th class="col-md-2">Drafts</th>
149-
<th class="col-md-2">&nbsp;</th>
150-
{% else %}
153+
<th class="col-md-3">Slides</th>
154+
<th class="col-md-4">Drafts</th>
155+
<th class="col-md-1">Updated</th>
156+
<th class="col-md-1">&nbsp;</th>
157+
{% else %}
151158
<th class="col-md-1">Group</th>
152159
<th class="col-md-1">Agenda</th>
153160
<th class="col-md-1">Minutes</th>
154-
<th class="col-md-6">Slides</th>
155-
<th class="col-md-3">Drafts</th>
156-
{% endif %}
161+
<th class="col-md-4">Slides</th>
162+
<th class="col-md-4">Drafts</th>
163+
<th class="col-md-1">Updated</th>
164+
{% endif %}
157165
</tr>
158166
</thead>
159167

@@ -173,20 +181,22 @@ <h2 class="anchor-target" id="irtf">IRTF <small>Internet Research Task Force</sm
173181
<table class="table table-condensed table-striped tablesorter">
174182
<thead>
175183
<tr>
176-
{% if user|has_role:"Secretariat" or user|managed_groups %}
184+
{% if user|has_role:"Secretariat" or user|managed_groups %}
177185
<th class="col-md-1">Group</th>
178186
<th class="col-md-1">Agenda</th>
179187
<th class="col-md-1">Minutes</th>
180-
<th class="col-md-5">Slides</th>
181-
<th class="col-md-2">Drafts</th>
182-
<th class="col-md-2">&nbsp;</th>
183-
{% else %}
188+
<th class="col-md-3">Slides</th>
189+
<th class="col-md-4">Drafts</th>
190+
<th class="col-md-1">Updated</th>
191+
<th class="col-md-1">&nbsp;</th>
192+
{% else %}
184193
<th class="col-md-1">Group</th>
185194
<th class="col-md-1">Agenda</th>
186195
<th class="col-md-1">Minutes</th>
187-
<th class="col-md-6">Slides</th>
188-
<th class="col-md-3">Drafts</th>
189-
{% endif %}
196+
<th class="col-md-4">Slides</th>
197+
<th class="col-md-4">Drafts</th>
198+
<th class="col-md-1">Updated</th>
199+
{% endif %}
190200
</tr>
191201
</thead>
192202

0 commit comments

Comments
 (0)