Skip to content

Commit 516a5fc

Browse files
committed
Port /iesg/agenda/documents.txt to new schema, compose the table in
Python instead of using a template to make the code easier to read - Legacy-Id: 6400
1 parent 53c59e5 commit 516a5fc

2 files changed

Lines changed: 24 additions & 43 deletions

File tree

ietf/iesg/views.py

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -251,16 +251,31 @@ def agenda_package(request, date=None):
251251

252252

253253
def agenda_documents_txt(request):
254-
dates = TelechatDates.objects.all()[0].dates()
254+
dates = list(TelechatDate.objects.active().order_by('date').values_list("date", flat=True)[:4])
255+
255256
docs = []
256-
for date in dates:
257-
from ietf.doc.models import TelechatDocEvent
258-
for d in Document.objects.filter(docevent__telechatdocevent__telechat_date=date).distinct():
259-
if d.latest_event(TelechatDocEvent, type="scheduled_for_telechat").telechat_date == date:
260-
docs.append(d)
261-
t = loader.get_template('iesg/agenda_documents.txt')
262-
c = Context({'docs':docs,'special_stream_list':['ise','irtf']})
263-
return HttpResponse(t.render(c), mimetype='text/plain')
257+
for d in Document.objects.filter(docevent__telechatdocevent__telechat_date__in=dates).distinct():
258+
date = d.telechat_date()
259+
if date in dates:
260+
d.computed_telechat_date = date
261+
docs.append(d)
262+
docs.sort(key=lambda d: d.computed_telechat_date)
263+
264+
# output table
265+
rows = []
266+
rows.append("# Fields: telechat date, filename (draft-foo-bar or rfc1234), intended status, rfc editor submission flag (0=no, 1=yes), area acronym, AD name, version")
267+
for d in docs:
268+
row = (
269+
d.computed_telechat_date.isoformat(),
270+
d.name,
271+
unicode(d.intended_std_level),
272+
"1" if d.stream_id in ("ise", "irtf") else "0",
273+
unicode(d.area_acronym()).lower(),
274+
d.ad.plain_name() if d.ad else "None Assigned",
275+
d.rev,
276+
)
277+
rows.append("\t".join(row))
278+
return HttpResponse(u"\n".join(rows), mimetype='text/plain')
264279

265280
class RescheduleForm(forms.Form):
266281
telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False)

ietf/templates/iesg/agenda_documents.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)