Skip to content

Commit 1a9401a

Browse files
rjsparksrjsparks
committed
preparing to merge forward
 - Legacy-Id: 10715
1 parent 4a45328 commit 1a9401a

File tree

7 files changed

+139
-5
lines changed

7 files changed

+139
-5
lines changed

‎ietf/group/info.py‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import itertools
3737
import re
3838
from tempfile import mkstemp
39+
import datetime
3940
from collections import OrderedDict
4041

4142
from django.shortcuts import render, redirect
@@ -333,6 +334,8 @@ def construct_group_menu_context(request, group, selected, group_type, others):
333334
entries.append(("About", urlreverse("group_about", kwargs=kwargs)))
334335
if group.features.has_materials and get_group_materials(group).exists():
335336
entries.append(("Materials", urlreverse("ietf.group.info.materials", kwargs=kwargs)))
337+
if group.type_id in ('rg','wg'):
338+
entries.append(("Meetings", urlreverse("ietf.group.info.meetings", kwargs=kwargs)))
336339
entries.append(("Email expansions", urlreverse("ietf.group.info.email", kwargs=kwargs)))
337340
entries.append(("History", urlreverse("ietf.group.info.history", kwargs=kwargs)))
338341
if group.features.has_documents:
@@ -714,3 +717,47 @@ def email_aliases(request, acronym=None, group_type=None):
714717

715718
return render(request,'group/email_aliases.html',{'aliases':aliases,'ietf_domain':settings.IETF_DOMAIN,'group':group})
716719

720+
def meetings(request, acronym=None, group_type=None):
721+
group = get_group_or_404(acronym,group_type) if acronym else None
722+
723+
four_years_ago = datetime.datetime.now()-datetime.timedelta(days=4*365)
724+
725+
sessions = group.session_set.filter(status__in=['sched','schedw','appr','canceled'],meeting__date__gt=four_years_ago)
726+
727+
def sort_key(session):
728+
if session.meeting.type.slug=='ietf':
729+
official_sessions = session.timeslotassignments.filter(schedule=session.meeting.agenda)
730+
if official_sessions:
731+
return official_sessions.first().timeslot.time
732+
elif session.meeting.date:
733+
return datetime.datetime.combine(session.meeting.date,datetime.datetime.min.time())
734+
else:
735+
return session.requested
736+
else:
737+
# TODO: use timeslots for interims once they have them
738+
return datetime.datetime.combine(session.meeting.date,datetime.datetime.min.time())
739+
740+
for s in sessions:
741+
s.time=sort_key(s)
742+
743+
sessions = sorted(sessions,key=lambda s:s.time,reverse=True)
744+
745+
today = datetime.date.today()
746+
future = []
747+
in_progress = []
748+
past = []
749+
for s in sessions:
750+
if s.meeting.date > today:
751+
future.append(s)
752+
elif s.meeting.end_date() >= today:
753+
in_progress.append(s)
754+
else:
755+
past.append(s)
756+
757+
return render(request,'group/meetings.html',
758+
construct_group_menu_context(request, group, "meetings", group_type, {
759+
'group':group,
760+
'future':future,
761+
'in_progress':in_progress,
762+
'past':past,
763+
}))

‎ietf/group/urls.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
(r'^chartering/create/(?P<group_type>(wg|rg))/$', 'ietf.group.edit.edit', {'action': "charter"}, "group_create"),
1111
(r'^concluded/$', 'ietf.group.info.concluded_groups'),
1212
(r'^email-aliases/$', 'ietf.group.info.email_aliases'),
13-
1413
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/$', 'ietf.group.info.group_home', None, "group_home"),
1514
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
1615
)

‎ietf/group/urls_info_details.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
(r'^about/$', 'ietf.group.info.group_about', None, 'group_about'),
1010
(r'^history/$','ietf.group.info.history'),
1111
(r'^email/$', 'ietf.group.info.email'),
12+
(r'^meetings/$', 'ietf.group.info.meetings'),
1213
(r'^deps/dot/$', 'ietf.group.info.dependencies_dot'),
1314
(r'^deps/pdf/$', 'ietf.group.info.dependencies_pdf'),
1415
(r'^init-charter/', 'ietf.group.edit.submit_initial_charter'),

‎ietf/meeting/models.py‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,12 @@ def get_meeting_date (self,offset):
9595
return self.date + datetime.timedelta(days=offset)
9696

9797
def end_date(self):
98-
return self.get_meeting_date(5)
98+
if self.type.slug == 'ietf':
99+
return self.get_meeting_date(5)
100+
else:
101+
# TODO: Once interims have timeslots assigned,
102+
# look for the last ending timeslot instead
103+
return self.date
99104

100105
def get_00_cutoff(self):
101106
start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)

‎ietf/templates/group/meetings-row.html‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<table class="table table-condensed table-striped">
2+
<thead>
3+
<tr>
4+
<th class="col-md-2"></th>
5+
<th class="col-md-2"></th>
6+
<th class="col-md-1"></th>
7+
<th class="col-md-1"></th>
8+
<th class="col-md-6"></th>
9+
</tr>
10+
</thead>
11+
<tbody>
12+
{% for s in sessions %}
13+
<tr>
14+
<td>{% ifchanged s.meeting %}{% if s.meeting.type.slug == 'ietf' %}IETF{% endif %}{{s.meeting.number}}{% endifchanged %}</td>
15+
<td>
16+
{% if s.status.slug == "sched" %}
17+
{% if s.meeting.type.slug == 'ietf' %}{{s.time|date:"D M d, Y Hi"}}{% else %}{{s.time|date:"D M d, Y"}}{% endif %}
18+
{% else %}
19+
Not yet scheduled ({{s.status.slug}})
20+
{% endif %}
21+
</td>
22+
<td>{% if s.minutes %}<a href="{{ s.minutes.get_absolute_url }}">Minutes</a>{% endif %}</td>
23+
<td>{% if s.agenda %}<a href="{{ s.agenda.get_absolute_url }}">Agenda</a>{% endif %}</td>
24+
<td>{% if s.meeting.type.slug == 'ietf' %}<a href="{% url 'ietf.meeting.views.session_details' num=s.meeting.number acronym=s.group.acronym %}">Materials</a>{% endif %}</td>
25+
{% endfor %}
26+
</tbody>
27+
</table>

‎ietf/templates/group/meetings.html‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{% extends "group/group_base.html" %}
2+
{# Copyright The IETF Trust 2015, All Rights Reserved #}
3+
{% load origin %}
4+
5+
{% block title %}Meetings{% if group %} for {{group.acronym}}{% endif %}{% endblock %}
6+
7+
{% block group_content %}
8+
{% origin %}
9+
{% if in_progress %}
10+
<div class="panel panel-default">
11+
<div class="panel-heading">
12+
Meetings in progress
13+
</div>
14+
<div class="panel-body">
15+
{% with in_progress as sessions %}
16+
{% include "group/meetings-row.html" %}
17+
{% endwith %}
18+
</div>
19+
</div>
20+
{% endif %}
21+
22+
{% if future %}
23+
<div class="panel panel-default">
24+
<div class="panel-heading">
25+
Future Meetings
26+
</div>
27+
<div class="panel-body">
28+
{% with future as sessions %}
29+
{% include "group/meetings-row.html" %}
30+
{% endwith %}
31+
</div>
32+
</div>
33+
{% endif %}
34+
35+
{% if past %}
36+
<div class="panel panel-default">
37+
<div class="panel-heading">
38+
Past Meetings
39+
</div>
40+
<div class="panel-body">
41+
{% with past as sessions %}
42+
{% include "group/meetings-row.html" %}
43+
{% endwith %}
44+
</div>
45+
</div>
46+
{% endif %}
47+
48+
<div>This page shows meetings within the last four years. For earlier meetings, please see the proceedings.</div>
49+
50+
{% endblock %}

‎ietf/templates/meeting/session_details.html‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ <h2>{{ session.time }}{% if session.name %} : {{ session.name }}{% endif %}</h2>
1414
{% if session.filtered_sessionpresentation_set %}
1515
<p>Materials:</p>
1616

17-
<ul>
17+
<table class="table table-condensed table-striped">
1818
{% for pres in session.filtered_sessionpresentation_set %}
19-
<li><a href="{% url 'doc_view' name=pres.document.name rev=pres.rev%}">{{ pres.document.name }}-{{ pres.rev }}</a></li>
19+
<tr>
20+
<td>
21+
<a href="{% url 'doc_view' name=pres.document.name rev=pres.rev%}">{{pres.document.title}} ({{ pres.document.name }}-{{ pres.rev }})
22+
</a>
23+
</td>
24+
</tr>
2025
{% endfor %}
21-
</ul>
26+
</table>
2227
{% endif %}
2328
{% endfor %}
2429

0 commit comments

Comments
 (0)