Skip to content

Commit 5dd0aa0

Browse files
levkowetzlevkowetz
committed
Merged [7073] from rcross@amsl.com:
changes to official proceedings generation code to support new agenda schema - Legacy-Id: 7177 Note: SVN reference [7073] has been migrated to Git commit 35a9436
2 parents 2d420fa + 35a9436 commit 5dd0aa0

5 files changed

Lines changed: 61 additions & 37 deletions

File tree

‎changelog‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
ietfdb (5.0.0) ietf; urgency=medium
2+
3+
With this release, a journey which started in 2008 with a *major* redesign
4+
of the IETF database schema has reached its goal. We've now converted the
5+
datatracker completely to the schema designed then, swapping out all the
6+
models that were changed, converted the database, swapped out all the GUI
7+
code that was built against the old models, and polished off a host of minor
8+
issues arising from the conversion. All this while completing and
9+
integrating 10 major functionality enhancement projects and releasing more
10+
than 50 minor releases, with not a single day of downtime. A history of
11+
release notes is available here: https://datatracker.ietf.org/release/
12+
13+
In addition to bringing in the last scheduled polishing of the conversion,
14+
this release also brings in an upgrade of the Django framework from version
15+
1.2 to 1.6, which gives us a number of new tools and possibilities for
16+
future work.
17+
18+
There are still some parts of the schema that need an overhaul, and plans
19+
exist for addressing those, but overall we should be in good shape for the
20+
near future, with some room to grow :-)
21+
22+
-- Henrik Levkowetz <henrik@levkowetz.com> 28 Jan 2014 0:04:11 +0100
23+
124
ietfdb (4.95) ietf; urgency=medium
225

326
This release upgrades Django from version 1.2 to version 1.6, including a

‎ietf/secr/proceedings/proc_utils.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
from django.shortcuts import render_to_response
88
from ietf.group.models import Group, Role
99
from ietf.group.utils import get_charter_text
10-
from ietf.meeting.models import Session, TimeSlot, Meeting
10+
from ietf.meeting.helpers import get_schedule, meeting_updated
11+
from ietf.meeting.models import Session, TimeSlot, Meeting, ScheduledSession
1112
from ietf.doc.models import Document, RelatedDocument, DocEvent
1213
from itertools import chain
1314
from ietf.secr.proceedings.models import Registration
@@ -248,9 +249,12 @@ def create_proceedings(meeting, group, is_final=False):
248249

249250
if not os.path.exists(target):
250251
os.makedirs(target)
251-
shutil.copy(source,target)
252+
try:
253+
shutil.copy(source,target)
254+
rfc.bytes = os.path.getsize(source)
255+
except IOError:
256+
pass
252257
rfc.url = url_root + "rfc/%s" % filename
253-
rfc.bytes = os.path.getsize(source)
254258
rfc.num = "RFC %s" % rfc_num
255259
# check related documents
256260
# check obsoletes
@@ -372,16 +376,12 @@ def gen_acknowledgement(context):
372376

373377
def gen_agenda(context):
374378
meeting = context['meeting']
375-
376-
timeslots = TimeSlot.objects.filter(meeting=meeting)
377-
378-
# sort by area:group then time
379-
sort1 = sorted(timeslots, key = mycomp)
380-
sort2 = sorted(sort1, key = lambda a: a.time)
379+
schedule = get_schedule(meeting)
380+
scheduledsessions = ScheduledSession.objects.filter(schedule=schedule).exclude(session__isnull=True)
381381

382382
html = render_to_response('proceedings/agenda.html',{
383383
'meeting': meeting,
384-
'timeslots': sort2}
384+
'scheduledsessions': scheduledsessions}
385385
)
386386

387387
path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'agenda.html')

‎ietf/secr/proceedings/views.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from ietf.secr.utils.decorators import check_permissions, sec_only
2020
from ietf.secr.utils.document import get_rfc_num, get_full_path
2121
from ietf.secr.utils.group import get_my_groups, groups_by_session
22-
from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material
22+
from ietf.secr.utils.meeting import get_upload_root, get_proceedings_path, get_material, get_timeslot
2323

2424
from ietf.doc.models import Document, DocAlias, DocEvent, State, NewRevisionDocEvent, RelatedDocument
2525
from ietf.group.models import Group
@@ -82,9 +82,9 @@ def get_extras(meeting):
8282
Gather "extras" which are one off groups. ie iab-wcit(86)
8383
'''
8484
groups = []
85-
sessions = Session.objects.filter(meeting=meeting).exclude(group__parent__acronym__in=('app','gen','int','ops','rai','rtg','sec','tsv','irtf')).filter(timeslot__type='session')
85+
sessions = Session.objects.filter(meeting=meeting).exclude(group__parent__acronym__in=('app','gen','int','ops','rai','rtg','sec','tsv','irtf'))
8686
for session in sessions:
87-
if session.materials.all():
87+
if get_timeslot(session).type.slug == 'session' and session.materials.all():
8888
groups.append(session.group)
8989
return groups
9090

@@ -226,7 +226,8 @@ def ajax_generate_proceedings(request, meeting_num):
226226
context = {'meeting':meeting,
227227
'areas':areas,
228228
'others':others,
229-
'extras':extras}
229+
'extras':extras,
230+
'request':request}
230231
proceedings_url = get_proceedings_url(meeting)
231232

232233
# the acknowledgement page can be edited manually so only produce if it doesn't already exist

‎ietf/secr/templates/proceedings/agenda.html‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,50 +11,50 @@ <h3>Agenda of IETF {{ meeting.number }}</h2>
1111
*** Click on a name of the group to get a meeting agenda ***</p>
1212

1313
<table id="agenda">
14-
{% for slot in timeslots %}
14+
{% for ss in scheduledsessions %}
1515
{% ifchanged %}
1616
<tr class="meeting-date">
1717
<td colspan="6">
18-
<h2 class="ietf-divider">{{ slot.time|date:"l"|upper }}, {{ slot.time|date:"F j, Y" }}</h2>
18+
<h2 class="ietf-divider">{{ ss.timeslot.time|date:"l"|upper }}, {{ ss.timeslot.time|date:"F j, Y" }}</h2>
1919
</td>
2020
</tr>
2121
{% endifchanged %}
2222
{% ifchanged %}
2323
<tr class="time-title">
2424
<td colspan="1">
25-
<b>{{slot.time|date:"Hi"}}-{{slot.end_time|date:"Hi"}}</b>
25+
<b>{{ss.timeslot.time|date:"Hi"}}-{{ss.timeslot.end_time|date:"Hi"}}</b>
2626
</td>
2727
<td colspan="5">
28-
<b>{{slot.name}}</b>
29-
{% if slot.type.name != 'Session' %}
30-
{% if slot.show_location %} - {{slot.get_location}}{% endif %}
28+
<b>{{ss.timeslot.name}}</b>
29+
{% if ss.timeslot.type.name != 'Session' %}
30+
{% if ss.timeslot.show_location %} - {{ss.timeslot.get_location}}{% endif %}
3131
{% endif %}
3232
</td>
3333
</tr>
3434
{% endifchanged %}
35-
{% if slot.type.name = 'Session' %} {% if slot.session.group %}
36-
<tr id="{{meeting.number}}-{{slot.time|date:"D-Hi"|lower}}-{{slot.session.group.parent.acronym|upper}}-{{slot.session.group.acronym|lower}}" class="grouprow">
37-
<td style="width:200px">{% if slot.show_location %}{{slot.get_location}}{% endif %}</td>
38-
<td style="width:50px">{{slot.session.group.parent.acronym|upper}}</td>
35+
{% if ss.timeslot.type.name = 'Session' %} {% if ss.session.group %}
36+
<tr id="{{meeting.number}}-{{ss.timeslot.time|date:"D-Hi"|lower}}-{{ss.session.group.parent.acronym|upper}}-{{ss.session.group.acronym|lower}}" class="grouprow">
37+
<td style="width:200px">{% if ss.timeslot.show_location %}{{ss.timeslot.get_location}}{% endif %}</td>
38+
<td style="width:50px">{{ss.session.group.parent.acronym|upper}}</td>
3939
<td style="width:100px">
40-
{% if slot.session.group.charter %}<a href="{{slot.session.group.charter.get_absolute_url}}">{{slot.session.group.acronym}}</a>
41-
{% else %}{{slot.session.group.acronym}}{% endif %}</td>
40+
{% if ss.session.group.charter %}<a href="http://datatracker.ietf.org{{ss.session.group.charter.get_absolute_url}}">{{ss.session.group.acronym}}</a>
41+
{% else %}{{ss.session.group.acronym}}{% endif %}</td>
4242
<td>
43-
{% if slot.session.agenda %}<a href="/meeting/{{ meeting.number }}/agenda/{{ slot.session.group.acronym }}/">{{slot.session.group.name}}</a>
44-
{% else %}{{slot.session.group.name}}{% endif %}
45-
{% if slot.session.group.state.name = "BOF" %} BOF {% endif %}
46-
{% if slot.session.agenda_note %}
47-
<br/><span class="note">{{slot.session.agenda_note}}</span>{% endif %}</td>
43+
{% if ss.session.agenda %}<a href="http://datatracker.ietf.org/meeting/{{ meeting.number }}/agenda/{{ ss.session.group.acronym }}/">{{ss.session.group.name}}</a>
44+
{% else %}{{ss.session.group.name}}{% endif %}
45+
{% if ss.session.group.state.name = "BOF" %} BOF {% endif %}
46+
{% if ss.session.agenda_note %}
47+
<br/><span class="note">{{ss.session.agenda_note}}</span>{% endif %}</td>
4848
</tr>
4949

5050
{% endif %} {% endif %}
51-
{% if slot.type.name = 'Plenary' %}
51+
{% if ss.timeslot.type.name = 'Plenary' %}
5252
<tr class="grouprow">
53-
<td style="width:200px">{% if slot.show_location %}{{slot.get_location}}{% endif %}</td>
53+
<td style="width:200px">{% if ss.timeslot.show_location %}{{ss.timeslot.get_location}}{% endif %}</td>
5454
<td></td>
5555
<td></td>
56-
<td>{% if slot.session.agenda %}<a href="{{ slot.session.agenda.get_absolute_url }}">Agenda</a>
57-
{% else %}{{slot.session.group.name}}{% endif %}
56+
<td>{% if ss.session.agenda %}<a href="http://datatracker.ietf.org{{ ss.session.agenda.get_absolute_url }}">Agenda</a>
57+
{% else %}{{ss.session.group.name}}{% endif %}
5858
</td>
5959
</tr>
6060
{% endif %}

‎ietf/secr/templates/proceedings/overview.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ <h2>IETF Overview</h2>
9696
</tr>
9797
<tr>
9898
<td valign="Top" width="264">Project Manager</td>
99-
<td valign="Top" width="180">Wanda Lo </td>
99+
<td valign="Top" width="180">Stephanie McCammon</td>
100100
</tr>
101101
<tr>
102102
<td valign="Top" width="264">Meeting Registrar</td>
103-
<td valign="Top" width="180">Stephanie McCammon</td>
103+
<td valign="Top" width="180">Maddy Conner</td>
104104
</tr>
105105
<tr>
106106
<td valign="Top" width="264">Project Manager</td>

0 commit comments

Comments
 (0)