From acda84208d07eac6be09e58e34c1b0b27fb69605 Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Wed, 17 Jun 2015 13:37:16 +0000 Subject: [PATCH] Summary: Make the meeting agenda code use the historic info available for groups. In the process, added some select_related/prefetch_related code to cut the number of database queries in the agenda down from 4000-5000 to about 50. Rewritten agenda CSV code to use Python arrays rather than a template for improved readability/reuse. Rewritten week view to assemble its data in Python. Plus a few other minor cleanups, e.g. lame_description is now gone. Fixes #1088. Branch ready for merge. - Legacy-Id: 9669 --- ietf/meeting/helpers.py | 112 ++++++++- ietf/meeting/models.py | 84 ++++--- ietf/meeting/views.py | 349 ++++++++++++++++---------- ietf/templates/meeting/agenda.csv | 7 - ietf/templates/meeting/agenda.html | 288 +++++++++++---------- ietf/templates/meeting/agenda.ics | 4 +- ietf/templates/meeting/agenda.txt | 6 +- ietf/templates/meeting/week-view.html | 21 +- ietf/utils/history.py | 35 +++ ietf/utils/pdf.py | 14 ++ 10 files changed, 584 insertions(+), 336 deletions(-) delete mode 100644 ietf/templates/meeting/agenda.csv create mode 100644 ietf/utils/pdf.py diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index bac9695b3..71c5cfb39 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -2,9 +2,12 @@ import datetime import pytz +import os +import re +from tempfile import mkstemp from django.http import HttpRequest -from django.db.models import Max, Q +from django.db.models import Max, Q, Prefetch, F from django.conf import settings from django.core.cache import cache from django.utils.cache import get_cache_key @@ -12,11 +15,13 @@ from django.shortcuts import get_object_or_404 import debug # pyflakes:ignore +from ietf.doc.models import Document from ietf.group.models import Group from ietf.ietfauth.utils import has_role, user_is_person from ietf.person.models import Person from ietf.meeting.models import Meeting -from ietf.utils.history import find_history_active_at +from ietf.utils.history import find_history_active_at, find_history_replacements_active_at +from ietf.utils.pipe import pipe def find_ads_for_meeting(meeting): ads = [] @@ -144,6 +149,109 @@ def meeting_updated(meeting): ts = tz.localize(ts) return ts +def preprocess_assignments_for_agenda(assignments_queryset, meeting): + # prefetch some stuff to prevent a myriad of small, inefficient queries + assignments_queryset = assignments_queryset.select_related( + "timeslot", "timeslot__location", "timeslot__type", + "session", + "session__group", "session__group__charter", "session__group__charter__group", + ).prefetch_related( + Prefetch("session__materials", + queryset=Document.objects.exclude(states__type=F("type"),states__slug='deleted').select_related("group").order_by("order"), + to_attr="prefetched_active_materials", + ), + "timeslot__meeting", + ) + + assignments = list(assignments_queryset) # make sure we're set in stone + + meeting_time = datetime.datetime.combine(meeting.date, datetime.time()) + + # replace groups with historic counterparts + for a in assignments: + if a.session: + a.session.historic_group = None + + groups = [a.session.group for a in assignments if a.session and a.session.group] + group_replacements = find_history_replacements_active_at(groups, meeting_time) + + for a in assignments: + if a.session and a.session.group: + a.session.historic_group = group_replacements.get(a.session.group_id) + + # replace group parents with historic counterparts + for a in assignments: + if a.session and a.session.historic_group: + a.session.historic_group.historic_parent = None + + parents = Group.objects.filter(pk__in=set(a.session.historic_group.parent_id for a in assignments if a.session and a.session.historic_group and a.session.historic_group.parent_id)) + parent_replacements = find_history_replacements_active_at(parents, meeting_time) + + for a in assignments: + if a.session and a.session.historic_group and a.session.historic_group.parent_id: + a.session.historic_group.historic_parent = parent_replacements.get(a.session.historic_group.parent_id) + + return assignments + +def read_agenda_file(num, doc): + # XXXX FIXME: the path fragment in the code below should be moved to + # settings.py. The *_PATH settings should be generalized to format() + # style python format, something like this: + # DOC_PATH_FORMAT = { "agenda": "/foo/bar/agenda-{meeting.number}/agenda-{meeting-number}-{doc.group}*", } + path = os.path.join(settings.AGENDA_PATH, "%s/agenda/%s" % (num, doc.external_url)) + if os.path.exists(path): + with open(path) as f: + return f.read() + else: + return None + +def convert_draft_to_pdf(doc_name): + inpath = os.path.join(settings.IDSUBMIT_REPOSITORY_PATH, doc_name + ".txt") + outpath = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf") + + try: + infile = open(inpath, "r") + except IOError: + return + + t,tempname = mkstemp() + os.close(t) + tempfile = open(tempname, "w") + + pageend = 0; + newpage = 0; + formfeed = 0; + for line in infile: + line = re.sub("\r","",line) + line = re.sub("[ \t]+$","",line) + if re.search("\[?[Pp]age [0-9ivx]+\]?[ \t]*$",line): + pageend=1 + tempfile.write(line) + continue + if re.search("^[ \t]*\f",line): + formfeed=1 + tempfile.write(line) + continue + if re.search("^ *INTERNET.DRAFT.+[0-9]+ *$",line) or re.search("^ *Internet.Draft.+[0-9]+ *$",line) or re.search("^draft-[-a-z0-9_.]+.*[0-9][0-9][0-9][0-9]$",line) or re.search("^RFC.+[0-9]+$",line): + newpage=1 + if re.search("^[ \t]*$",line) and pageend and not newpage: + continue + if pageend and newpage and not formfeed: + tempfile.write("\f") + pageend=0 + formfeed=0 + newpage=0 + tempfile.write(line) + + infile.close() + tempfile.close() + t,psname = mkstemp() + os.close(t) + pipe("enscript --margins 76::76: -B -q -p "+psname + " " +tempname) + os.unlink(tempname) + pipe("ps2pdf "+psname+" "+outpath) + os.unlink(psname) + def agenda_permissions(meeting, schedule, user): # do this in positive logic. cansee = False diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index bcecac490..8cdfea1e9 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -638,16 +638,6 @@ class Schedule(models.Model): self._cached_sessions_that_can_meet = self.meeting.sessions_that_can_meet.all() return self._cached_sessions_that_can_meet - def area_list(self): - return ( self.assignments.filter(session__group__type__slug__in=['wg', 'rg', 'ag', 'iab'], - session__group__parent__isnull=False) - .order_by('session__group__parent__acronym') - .values_list('session__group__parent__acronym', flat=True) - .distinct() ) - - def groups(self): - return Group.objects.filter(type__slug__in=['wg', 'rg', 'ag', 'iab'], parent__isnull=False, session__scheduledsession__schedule=self).exclude(session__scheduledsession__timeslot__type__in=['lead','offagenda']).distinct().order_by('parent__acronym', 'acronym') - # calculate badness of entire schedule def calc_badness(self): # now calculate badness @@ -768,6 +758,35 @@ class ScheduledSession(models.Model): ss["pinned"] = self.pinned return ss + def slug(self): + """Return sensible id string for session, e.g. suitable for use as HTML anchor.""" + components = [] + + if not self.timeslot: + components.append("unknown") + + if not self.session or not (getattr(self.session, "historic_group") or self.session.group): + components.append("unknown") + else: + components.append(self.timeslot.time.strftime("%a-%H%M")) + + g = getattr(self.session, "historic_group", None) or self.session.group + + if self.timeslot.type_id in ('break', 'reg', 'other'): + components.append(g.acronym) + + if self.timeslot.type_id in ('session', 'plenary'): + if self.timeslot.type_id == "plenary": + components.append("1plenary") + else: + p = getattr(g, "historic_parent", None) or g.parent + if p and p.type_id in ("area", "irtf"): + components.append(p.acronym) + + components.append(g.acronym) + + return u"-".join(components).lower() + class Constraint(models.Model): """ Specifies a constraint on the scheduling. @@ -886,14 +905,30 @@ class Session(models.Model): # Should work on how materials are captured so that deleted things are no longer associated with the session # (We can keep the information about something being added to and removed from a session in the document's history) + def get_material(self, material_type, only_one): + if hasattr(self, "prefetched_active_materials"): + l = [d for d in self.prefetched_active_materials if d.type_id == material_type] + for d in l: + d.meeting_related = lambda: True + else: + l = self.materials.filter(type=material_type).exclude(states__type=material_type, states__slug='deleted').order_by("order") + + if only_one: + if l: + return l[0] + else: + return None + else: + return l + def agenda(self): - return self.materials.filter(type='agenda').exclude(states__type='agenda',states__slug='deleted').first() + return self.get_material("agenda", only_one=True) def minutes(self): - return self.materials.filter(type='minutes').exclude(states__type='minutes',states__slug='deleted').first() + return self.get_material("minutes", only_one=True) def slides(self): - return list(self.materials.filter(type='slides').exclude(states__type='slides',states__slug='deleted').order_by('order')) + return list(self.get_material("slides", only_one=False)) def __unicode__(self): if self.meeting.type_id == "interim": @@ -908,9 +943,6 @@ class Session(models.Model): ss0name = ','.join([x.timeslot.time.strftime("%a-%H%M") for x in ss]) return u"%s: %s %s %s" % (self.meeting, self.group.acronym, self.name, ss0name) - def is_bof(self): - return self.group.is_bof(); - @property def short_name(self): if self.name: @@ -994,7 +1026,7 @@ class Session(models.Model): sess1['name'] = str(self.name) sess1['title'] = str(self.short_name) sess1['short_name'] = str(self.short_name) - sess1['bof'] = str(self.is_bof()) + sess1['bof'] = str(self.group.is_bof()) sess1['agenda_note'] = str(self.agenda_note) sess1['attendees'] = str(self.attendees) sess1['status'] = str(self.status) @@ -1024,18 +1056,6 @@ class Session(models.Model): else: return "The agenda has not been uploaded yet." - # FIXME - This used to be called 'type'. It is only used in agenda.csv and agenda.txt. - # It will return the _wrong thing_ if you look back at an agenda of an earlier meeting - # where group X was a BOF at the time, but is now a WG. - # It also doesn't return anything useful for RG, area sessions, or anything that's not group type 'wg'. - # A better thing to do is find a way to note when a meeting was a BoF meeting and use that, removing this - # function altogether. - def lame_description(self): - if self.group.type.slug in [ "wg" ]: - return "BOF" if self.group.state.slug in ["bof", "bof-conc"] else "WG" - else: - return "" - def ical_status(self): if self.status.slug == 'canceled': # sic return "CANCELLED" @@ -1050,13 +1070,13 @@ class Session(models.Model): if not hasattr(self, '_agenda_file'): self._agenda_file = "" - docs = self.materials.filter(type="agenda", states__type="agenda", states__slug="active") - if not docs: + agenda = self.agenda() + if not agenda: return "" # we use external_url at the moment, should probably regularize # the filenames to match the document name instead - filename = docs[0].external_url + filename = agenda.external_url self._agenda_file = "%s/agenda/%s" % (self.meeting.number, filename) return self._agenda_file diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 52c8d7562..2813e20aa 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -7,34 +7,36 @@ import tarfile import urllib from tempfile import mkstemp from collections import OrderedDict +import csv +import json import debug # pyflakes:ignore from django import forms -from django.shortcuts import render, render_to_response, redirect +from django.shortcuts import render, redirect from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404 from django.contrib import messages from django.core.urlresolvers import reverse -from django.db.models import Q -from django.template import RequestContext -from django.template.loader import render_to_string from django.conf import settings from django.db.models import Max from django.forms.models import modelform_factory -from django.views.decorators.csrf import ensure_csrf_cookie from django.forms import ModelForm +from django.views.decorators.csrf import ensure_csrf_cookie from ietf.doc.models import Document, State from ietf.group.models import Group from ietf.ietfauth.utils import role_required, has_role -from ietf.meeting.models import Meeting, TimeSlot, Session, Schedule, Room +from ietf.meeting.models import Meeting, Session, Schedule, Room from ietf.meeting.helpers import get_areas, get_person_by_email, get_schedule_by_name from ietf.meeting.helpers import build_all_agenda_slices, get_wg_name_list from ietf.meeting.helpers import get_all_scheduledsessions_from_schedule from ietf.meeting.helpers import get_modified_from_scheduledsessions from ietf.meeting.helpers import get_wg_list, find_ads_for_meeting from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions, meeting_updated +from ietf.meeting.helpers import preprocess_assignments_for_agenda, read_agenda_file +from ietf.meeting.helpers import convert_draft_to_pdf from ietf.utils.pipe import pipe +from ietf.utils.pdf import pdf_pages def materials(request, meeting_num=None): meeting = get_meeting(meeting_num) @@ -46,12 +48,12 @@ def materials(request, meeting_num=None): if settings.SERVER_MODE != 'production' and '_testoverride' in request.REQUEST: pass elif now > cor_cut_off_date: - return render_to_response("meeting/materials_upload_closed.html", { + return render(request, "meeting/materials_upload_closed.html", { 'meeting_num': meeting_num, 'begin_date': begin_date, 'cut_off_date': cut_off_date, 'cor_cut_off_date': cor_cut_off_date - }, context_instance=RequestContext(request)) + }) #sessions = Session.objects.filter(meeting__number=meeting_num, timeslot__isnull=False) schedule = get_schedule(meeting, None) @@ -63,14 +65,14 @@ def materials(request, meeting_num=None): iab = sessions.filter(group__parent__acronym = 'iab') cache_version = Document.objects.filter(session__meeting__number=meeting_num).aggregate(Max('time'))["time__max"] - return render_to_response("meeting/materials.html", { + return render(request, "meeting/materials.html", { 'meeting_num': meeting_num, 'plenaries': plenaries, 'ietf': ietf, 'training': training, 'irtf': irtf, 'iab': iab, 'cut_off_date': cut_off_date, 'cor_cut_off_date': cor_cut_off_date, 'submission_started': now > begin_date, 'cache_version': cache_version, - }, context_instance=RequestContext(request)) + }) def current_materials(request): meetings = Meeting.objects.exclude(number__startswith='interim-').order_by('-number') @@ -79,17 +81,6 @@ def current_materials(request): else: raise Http404 -def get_user_agent(request): - if settings.SERVER_MODE != 'production' and '_testiphone' in request.REQUEST: - user_agent = "iPhone" - elif 'user_agent' in request.REQUEST: - user_agent = request.REQUEST['user_agent'] - elif 'HTTP_USER_AGENT' in request.META: - user_agent = request.META["HTTP_USER_AGENT"] - else: - user_agent = "" - return user_agent - def ascii_alphanumeric(string): return re.match(r'^[a-zA-Z0-9]*$', string) @@ -267,12 +258,12 @@ def edit_agenda(request, num=None, owner=None, name=None): can_see, can_edit,secretariat = agenda_permissions(meeting, schedule, user) if not can_see: - return HttpResponse(render_to_string("meeting/private_agenda.html", + return render(request, "meeting/private_agenda.html", {"schedule":schedule, "meeting": meeting, "meeting_base_url":meeting_base_url, - "hide_menu": True}, - RequestContext(request)), status=403, content_type="text/html") + "hide_menu": True + }, status=403, content_type="text/html") scheduledsessions = get_all_scheduledsessions_from_schedule(schedule) @@ -367,12 +358,10 @@ def edit_agendas(request, num=None, order=None): def agenda(request, num=None, name=None, base=None, ext=None): base = base if base else 'agenda' ext = ext if ext else '.html' - # This is misleading - urls.py doesn't send ics through here anymore mimetype = { ".html":"text/html; charset=%s"%settings.DEFAULT_CHARSET, ".txt": "text/plain; charset=%s"%settings.DEFAULT_CHARSET, - ".ics":"text/calendar; charset=%s"%settings.DEFAULT_CHARSET, - ".csv":"text/csv; charset=%s"%settings.DEFAULT_CHARSET, + ".csv": "text/csv; charset=%s"%settings.DEFAULT_CHARSET, } meeting = get_meeting(num) schedule = get_schedule(meeting, name) @@ -382,7 +371,123 @@ def agenda(request, num=None, name=None, base=None, ext=None): updated = meeting_updated(meeting) filtered_assignments = schedule.assignments.exclude(timeslot__type__in=['lead','offagenda']) - return render(request, "meeting/"+base+ext, {"schedule":schedule, "filtered_assignments":filtered_assignments, "updated": updated}, content_type=mimetype[ext]) + filtered_assignments = preprocess_assignments_for_agenda(filtered_assignments, meeting) + + if ext == ".csv": + return agenda_csv(schedule, filtered_assignments) + + # extract groups hierarchy, it's a little bit complicated because + # we can be dealing with historic groups + seen = set() + groups = [a.session.historic_group for a in filtered_assignments + if a.session + and a.session.historic_group + and a.session.historic_group.type_id in ('wg', 'rg', 'ag', 'iab') + and a.session.historic_group.historic_parent] + group_parents = [] + for g in groups: + if g.historic_parent.acronym not in seen: + group_parents.append(g.historic_parent) + seen.add(g.historic_parent.acronym) + + seen = set() + for p in group_parents: + p.group_list = [] + for g in groups: + if g.acronym not in seen and g.historic_parent.acronym == p.acronym: + p.group_list.append(g) + seen.add(g.acronym) + + p.group_list.sort(key=lambda g: g.acronym) + + return render(request, "meeting/"+base+ext, { + "schedule": schedule, + "filtered_assignments": filtered_assignments, + "updated": updated, + "group_parents": group_parents, + }, content_type=mimetype[ext]) + +def agenda_csv(schedule, filtered_assignments): + response = HttpResponse(content_type="text/csv; charset=%s"%settings.DEFAULT_CHARSET) + writer = csv.writer(response, delimiter=',', quoting=csv.QUOTE_ALL) + + headings = ["Date", "Start", "End", "Session", "Room", "Area", "Acronym", "Type", "Description", "Session ID", "Agenda", "Slides"] + + def write_row(row): + encoded_row = [v.encode('utf-8') if isinstance(v, unicode) else v for v in row] + + while len(encoded_row) < len(headings): + encoded_row.append(None) # produce empty entries at the end as necessary + + writer.writerow(encoded_row) + + def agenda_field(item): + agenda_doc = item.session.agenda() + if agenda_doc: + return "http://www.ietf.org/proceedings/{schedule.meeting.number}/agenda/{agenda.external_url}".format(schedule=schedule, agenda=agenda_doc) + else: + return "" + + def slides_field(item): + return "|".join("http://www.ietf.org/proceedings/{schedule.meeting.number}/slides/{slide.external_url}".format(schedule=schedule, slide=slide) for slide in item.session.slides()) + + write_row(headings) + + for item in filtered_assignments: + row = [] + row.append(item.timeslot.time.strftime("%Y-%m-%d")) + row.append(item.timeslot.time.strftime("%H%M")) + row.append(item.timeslot.end_time().strftime("%H%M")) + + if item.timeslot.type_id == "break": + row.append(item.timeslot.type.name) + row.append(schedule.meeting.break_area) + row.append("") + row.append("") + row.append("") + row.append(item.timeslot.name) + row.append("b{}".format(item.timeslot.pk)) + elif item.timeslot.type_id == "reg": + row.append(item.timeslot.type.name) + row.append(schedule.meeting.reg_area) + row.append("") + row.append("") + row.append("") + row.append(item.timeslot.name) + row.append("r{}".format(item.timeslot.pk)) + elif item.timeslot.type_id == "other": + row.append("None") + row.append(item.timeslot.location.name) + row.append("") + row.append(item.session.historic_group.acronym) + row.append(item.session.historic_group.historic_parent.acronym.upper() if item.session.historic_group.historic_parent else "") + row.append(item.session.name) + row.append(item.session.pk) + elif item.timeslot.type_id == "plenary": + row.append(item.session.name) + row.append(item.timeslot.location.name) + row.append("") + row.append(item.session.historic_group.acronym if item.session.historic_group else "") + row.append("") + row.append(item.session.name) + row.append(item.session.pk) + row.append(agenda_field(item)) + row.append(slides_field(item)) + elif item.timeslot.type_id == "session": + row.append(item.timeslot.name) + row.append(item.timeslot.location.name) + row.append(item.session.historic_group.historic_parent.acronym.upper() if item.session.historic_group.historic_parent else "") + row.append(item.session.historic_group.acronym if item.session.historic_group else "") + row.append("BOF" if item.session.historic_group.state_id in ("bof", "bof-conc") else item.session.historic_group.type.name) + row.append(item.session.historic_group.name if item.session.historic_group else "") + row.append(item.session.pk) + row.append(agenda_field(item)) + row.append(slides_field(item)) + + if len(row) > 3: + write_row(row) + + return response @role_required('Area Director','Secretariat','IAB') def agenda_by_room(request,num=None): @@ -415,18 +520,6 @@ def agenda_by_type_ics(request,num=None,type=None): updated = meeting_updated(meeting) return render(request,"meeting/agenda.ics",{"schedule":schedule,"updated":updated,"assignments":scheduledsessions},content_type="text/calendar") -def read_agenda_file(num, doc): - # XXXX FIXME: the path fragment in the code below should be moved to - # settings.py. The *_PATH settings should be generalized to format() - # style python format, something like this: - # DOC_PATH_FORMAT = { "agenda": "/foo/bar/agenda-{meeting.number}/agenda-{meeting-number}-{doc.group}*", } - path = os.path.join(settings.AGENDA_PATH, "%s/agenda/%s" % (num, doc.external_url)) - if os.path.exists(path): - with open(path) as f: - return f.read() - else: - return None - def session_agenda(request, num, session): d = Document.objects.filter(type="agenda", session__meeting__number=num) if session == "plenaryt": @@ -451,53 +544,6 @@ def session_agenda(request, num, session): raise Http404("No agenda for the %s session of IETF %s is available" % (session, num)) -def convert_to_pdf(doc_name): - inpath = os.path.join(settings.IDSUBMIT_REPOSITORY_PATH, doc_name + ".txt") - outpath = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf") - - try: - infile = open(inpath, "r") - except IOError: - return - - t,tempname = mkstemp() - os.close(t) - tempfile = open(tempname, "w") - - pageend = 0; - newpage = 0; - formfeed = 0; - for line in infile: - line = re.sub("\r","",line) - line = re.sub("[ \t]+$","",line) - if re.search("\[?[Pp]age [0-9ivx]+\]?[ \t]*$",line): - pageend=1 - tempfile.write(line) - continue - if re.search("^[ \t]*\f",line): - formfeed=1 - tempfile.write(line) - continue - if re.search("^ *INTERNET.DRAFT.+[0-9]+ *$",line) or re.search("^ *Internet.Draft.+[0-9]+ *$",line) or re.search("^draft-[-a-z0-9_.]+.*[0-9][0-9][0-9][0-9]$",line) or re.search("^RFC.+[0-9]+$",line): - newpage=1 - if re.search("^[ \t]*$",line) and pageend and not newpage: - continue - if pageend and newpage and not formfeed: - tempfile.write("\f") - pageend=0 - formfeed=0 - newpage=0 - tempfile.write(line) - - infile.close() - tempfile.close() - t,psname = mkstemp() - os.close(t) - pipe("enscript --margins 76::76: -B -q -p "+psname + " " +tempname) - os.unlink(tempname) - pipe("ps2pdf "+psname+" "+outpath) - os.unlink(psname) - def session_draft_list(num, session): try: agendas = Document.objects.filter(type="agenda", @@ -542,8 +588,8 @@ def session_draft_tarfile(request, num, session): for doc_name in drafts: pdf_path = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf") - if (not os.path.exists(pdf_path)): - convert_to_pdf(doc_name) + if not os.path.exists(pdf_path): + convert_draft_to_pdf(doc_name) if os.path.exists(pdf_path): try: @@ -560,18 +606,6 @@ def session_draft_tarfile(request, num, session): os.unlink(mfn) return response -def pdf_pages(file): - try: - infile = open(file, "r") - except IOError: - return 0 - for line in infile: - m = re.match('\] /Count ([0-9]+)',line) - if m: - return int(m.group(1)) - return 0 - - def session_draft_pdf(request, num, session): drafts = session_draft_list(num, session); curr_page = 1 @@ -582,10 +616,10 @@ def session_draft_pdf(request, num, session): for draft in drafts: pdf_path = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, draft + ".pdf") - if (not os.path.exists(pdf_path)): - convert_to_pdf(draft) + if not os.path.exists(pdf_path): + convert_draft_to_pdf(draft) - if (os.path.exists(pdf_path)): + if os.path.exists(pdf_path): pages = pdf_pages(pdf_path) pdfmarks.write("[/Page "+str(curr_page)+" /View [/XYZ 0 792 1.0] /Title (" + draft + ") /OUT pdfmark\n") pdf_list = pdf_list + " " + pdf_path @@ -606,11 +640,62 @@ def session_draft_pdf(request, num, session): def week_view(request, num=None): meeting = get_meeting(num) - timeslots = TimeSlot.objects.filter(meeting=meeting) + schedule = get_schedule(meeting) - template = "meeting/week-view.html" - return render_to_response(template, - {"timeslots":timeslots,"render_types":["Session","Other","Break","Plenary"]}, context_instance=RequestContext(request)) + if not schedule: + raise Http404 + + filtered_assignments = schedule.assignments.exclude(timeslot__type__in=['lead','offagenda']) + filtered_assignments = preprocess_assignments_for_agenda(filtered_assignments, meeting) + + items = [] + for a in filtered_assignments: + # we don't HTML escape any of these as the week-view code is using createTextNode + item = { + "key": str(a.timeslot.pk), + "day": a.timeslot.time.strftime("%w"), + "time": a.timeslot.time.strftime("%H%M") + "-" + a.timeslot.end_time().strftime("%H%M"), + "duration": a.timeslot.duration.seconds, + "time_id": a.timeslot.time.strftime("%m%d%H%M"), + "dayname": "{weekday}, {month} {day_of_month}, {year}".format( + weekday=a.timeslot.time.strftime("%A").upper(), + month=a.timeslot.time.strftime("%B"), + day_of_month=a.timeslot.time.strftime("%d").lstrip("0"), + year=a.timeslot.time.strftime("%Y"), + ), + "type": a.timeslot.type.name + } + + if a.session: + if a.session.historic_group: + item["group"] = a.session.historic_group.acronym + + if a.session.name: + item["name"] = a.session.name + elif a.timeslot.type_id == "break": + item["name"] = a.timeslot.name + item["area"] = a.timeslot.type_id + item["group"] = a.timeslot.type_id + elif a.session.historic_group: + item["name"] = a.session.historic_group.name + if a.session.historic_group.state_id == "bof": + item["name"] += " BOF" + + item["state"] = a.session.historic_group.state.name + if a.session.historic_group.historic_parent: + item["area"] = a.session.historic_group.historic_parent.acronym + + if a.timeslot.show_location: + item["room"] = a.timeslot.get_location() + + if a.session and a.session.agenda(): + item["agenda"] = a.session.agenda().get_absolute_url() + + items.append(item) + + return render(request, "meeting/week-view.html", { + "items": json.dumps(items), + }) def ical_agenda(request, num=None, name=None, ext=None): meeting = get_meeting(num) @@ -636,39 +721,39 @@ def ical_agenda(request, num=None, name=None, ext=None): # edu, ietf, tools, iesg, iab for item in filter: - if item: - if item[0] == '-' and item[1] == '~': - include_types -= set([item[2:]]) - elif item[0] == '-': - exclude.append(item[1:]) - elif item[0] == '~': - include_types |= set([item[1:]]) + if len(item) > 2 and item[0] == '-' and item[1] == '~': + include_types -= set([item[2:]]) + elif len(item) > 1 and item[0] == '-': + exclude.append(item[1:]) + elif len(item) > 1 and item[0] == '~': + include_types |= set([item[1:]]) - assignments = schedule.assignments.exclude(timeslot__type__in=['lead','offagenda']).filter( - Q(timeslot__type__slug__in = include_types) | - Q(session__group__acronym__in = include) | - Q(session__group__parent__acronym__in = include) - ).exclude(session__group__acronym__in = exclude).distinct() - #.exclude(Q(session__group__isnull = False), - #Q(session__group__acronym__in = exclude) | - #Q(session__group__parent__acronym__in = exclude)) + assignments = schedule.assignments.exclude(timeslot__type__in=['lead','offagenda']) + assignments = preprocess_assignments_for_agenda(assignments, meeting) - return HttpResponse(render_to_string("meeting/agenda.ics", - {"schedule":schedule, "assignments":assignments, "updated":updated}, - RequestContext(request)), content_type="text/calendar") + assignments = [a for a in assignments if + (a.timeslot.type_id in include_types + or (a.session.historic_group and a.session.historic_group.acronym in include) + or (a.session.historic_group and a.session.historic_group.historic_parent and a.session.historic_group.historic_parent.acronym in include)) + and (not a.session.historic_group or a.session.historic_group.acronym not in exclude)] -def meeting_requests(request, num=None) : + return render(request, "meeting/agenda.ics", { + "schedule": schedule, + "assignments": assignments, + "updated": updated + }, content_type="text/calendar") + +def meeting_requests(request, num=None): meeting = get_meeting(num) sessions = Session.objects.filter(meeting__number=meeting.number, type__slug='session', group__parent__isnull = False).exclude(requested_by=0).order_by("group__parent__acronym","status__slug","group__acronym") groups_not_meeting = Group.objects.filter(state='Active',type__in=['WG','RG','BOF']).exclude(acronym__in = [session.group.acronym for session in sessions]).order_by("parent__acronym","acronym") - return render_to_response("meeting/requests.html", + return render(request, "meeting/requests.html", {"meeting": meeting, "sessions":sessions, - "groups_not_meeting": groups_not_meeting}, - context_instance=RequestContext(request)) + "groups_not_meeting": groups_not_meeting}) -def session_details(request, num, acronym, date=None, week_day=None, seq=None) : +def session_details(request, num, acronym, date=None, week_day=None, seq=None): meeting = get_meeting(num) sessions = Session.objects.filter(meeting=meeting,group__acronym=acronym,type__in=['session','plenary','other']) @@ -716,7 +801,7 @@ def session_details(request, num, acronym, date=None, week_day=None, seq=None) : scheduled_time = "Not yet scheduled" ss = session.scheduledsession_set.filter(schedule=meeting.agenda).order_by('timeslot__time') if ss: - scheduled_time = ','.join([x.timeslot.time.strftime("%A %b-%d %H%M") for x in ss]) + scheduled_time = ','.join(x.timeslot.time.strftime("%A %b-%d %H%M") for x in ss) # TODO FIXME Deleted materials shouldn't be in the sessionpresentation_set filtered_sessionpresentation_set = [p for p in session.sessionpresentation_set.all() if p.document.get_state_slug(p.document.type_id)!='deleted'] return render(request, "meeting/session_details.html", diff --git a/ietf/templates/meeting/agenda.csv b/ietf/templates/meeting/agenda.csv deleted file mode 100644 index 93f78720a..000000000 --- a/ietf/templates/meeting/agenda.csv +++ /dev/null @@ -1,7 +0,0 @@ -{% load humanize %}{% autoescape off %}{% load ietf_filters %}"Date","Start","End","Session","Room","Area","Acronym","Type","Description","Session ID","Agenda","Slides" -{% for item in filtered_assignments.all.distinct %}{% if item.timeslot.type.slug == "break" %}"{{ item.timeslot.time|date:"Y-m-d" }}","{{ item.timeslot.time_desc|slice:":4" }}","{{ item.timeslot.time_desc|slice:"5:9" }}","Break","{{ schedule.meeting.break_area}}","","","","{{ item.timeslot.name }}","b{{ item.timeslot.pk }}","","" -{% endif %}{% if item.timeslot.type.slug == "reg" %}"{{ item.timeslot.time|date:"Y-m-d" }}","{{ item.timeslot.time_desc|slice:":4" }}","{{ item.timeslot.time_desc|slice:"5:9" }}","{{ item.timeslot.type.name }}","{{ schedule.meeting.reg_area }}","","","","{{ item.timeslot.name }}","r{{item.timeslot.pk}}","","" -{% endif %}{% if item.timeslot.type.slug == "other" %}"{{ item.timeslot.time|date:"Y-m-d" }}","{{ item.timeslot.time_desc|slice:":4" }}","{{ item.timeslot.time_desc|slice:"5:9" }}","None","{{ item.timeslot.location.name }}","","{{ item.session.group.acronym }}","{% if item.session.group.parent %}{{item.session.group.parent.acronym|upper}}{% endif %}","{{ item.session.name }}","{{item.session.pk}}","","" -{% endif %}{% if item.timeslot.type.slug == "plenary" %}"{{ item.timeslot.time|date:"Y-m-d" }}","{{ item.timeslot.time_desc|slice:":4" }}","{{ item.timeslot.time_desc|slice:"5:9" }}","{{ item.session.name }}","{{ item.timeslot.location.name }}","","{{ item.session.group.acronym }}","","{{ item.session.name }}","{{item.session.pk}}","{% if item.session.agenda %}http://www.ietf.org/proceedings/{{ schedule.meeting.number }}/agenda/{{ item.session.agenda.external_url }}{% endif %}","{% if item.session.slides %}{% for slide in item.session.slides %}http://www.ietf.org/proceedings/{{ schedule.meeting.number }}/slides/{{ slide.external_url }}{% if not forloop.last %}|{% endif %}{% endfor %}{% endif %}" -{% endif %}{% if item.timeslot.type.slug == "session" and item.session.group %}"{{ item.timeslot.time|date:"Y-m-d" }}","{{ item.timeslot.time_desc|slice:":4" }}","{{ item.timeslot.time_desc|slice:"5:9" }}","{{ item.timeslot.name }}","{{ item.timeslot.location.name }}","{{ item.session.group.parent.acronym|upper }}","{{ item.session.group.acronym }}","{{ item.session.lame_description }}","{{ item.session.group.name }}","{{ item.session.pk}}","{% if item.session.agenda %}http://www.ietf.org/proceedings/{{ schedule.meeting.number }}/agenda/{{ item.session.agenda.external_url }}{% endif %}","{% if item.session.slides %}{% for slide in item.session.slides %}http://www.ietf.org/proceedings/{{ schedule.meeting.number }}/slides/{{ slide.external_url }}{% if not forloop.last %}|{% endif %}{% endfor %}{% endif %}" -{% endif %}{% endfor %}{% endautoescape %} diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html index 95bb014a4..b8643ed17 100644 --- a/ietf/templates/meeting/agenda.html +++ b/ietf/templates/meeting/agenda.html @@ -78,29 +78,28 @@

Groups displayed in italics are BOFs.

- {% regroup schedule.groups by parent.acronym as area_sessions %} - +
- {% for area in area_sessions %} - {% endfor %} - {% for area in area_sessions %} -
- + {% for p in group_parents %} + +
+ {% for p in group_parents %} +
- {% for wg in area.list %} + {% for group in p.group_list %}
-
@@ -128,8 +127,8 @@

Download as .ics

- {% for area in schedule.area_list %} - {{area|upper}} + {% for p in group_parents %} + {{p.acronym|upper}} {% endfor %} Non-area events @@ -146,7 +145,7 @@ - {% for item in filtered_assignments.all %} + {% for item in filtered_assignments %} {% ifchanged item.timeslot.time|date:"Y-m-d" %} @@ -184,149 +183,148 @@ {% endif %} {% if item.timeslot.type.slug == 'break' or item.timeslot.type.slug == 'reg' or item.timeslot.type.slug == 'other' %} - {% with session_id=item.timeslot.time|date:"D-Hi"|lower|add:"-"|add:item.session.group.acronym|lower %} - - - - - - - {% endwith %} + + + + + + {% endif %} {% if item.timeslot.type.slug = 'session' or item.timeslot.type.slug == 'plenary' %} - {% if item.session.group %} - {% with session_id=item.timeslot.time|date:"D-Hi"|lower|add:"-"|add:item.area|default:"unknown"|lower|add:"-"|add:item.session.group.acronym|lower %} - + {% if item.session.historic_group %} + - {% if item.timeslot.type.slug == 'plenary' %} - - - + {% if item.timeslot.type.slug == 'plenary' %} + + + - {% else %} - + {% else %} + - + - + - - {% endif %} + + {% endif %} - - - - {% endwith %} + {% if item.session.slides %} +

Slides

+ + {% endif %} + +
+ +
+ + + + + + + {% endif %} {% endif %} {% endfor %} @@ -335,7 +333,7 @@
    - {% for item in filtered_assignments.all %} + {% for item in filtered_assignments %} {% ifchanged item.timeslot.time|date:"Y-m-d" %}
  • {{ item.timeslot.time|date:"l, F j, Y" }}
    • {% endifchanged %} diff --git a/ietf/templates/meeting/agenda.ics b/ietf/templates/meeting/agenda.ics index 4e0c20e9e..55d8e33ef 100644 --- a/ietf/templates/meeting/agenda.ics +++ b/ietf/templates/meeting/agenda.ics @@ -2,9 +2,9 @@ VERSION:2.0 METHOD:PUBLISH PRODID:-//IETF//datatracker.ietf.org ical agenda//EN -{{schedule.meeting.vtimezone}}{% for item in assignments %}{% if item.session.group %}BEGIN:VEVENT +{{schedule.meeting.vtimezone}}{% for item in assignments %}{% if item.session.historic_group %}BEGIN:VEVENT UID:ietf-{{schedule.meeting.number}}-{{item.timeslot.pk}} -SUMMARY:{% if item.session.name %}{{item.session.name|ics_esc}}{% else %}{% if not item.session.group %}{{item.timeslot.name|ics_esc}}{% else %}{{item.session.group.acronym|lower}} - {{item.session.group.name}}{% endif%}{%endif%} +SUMMARY:{% if item.session.name %}{{item.session.name|ics_esc}}{% else %}{% if not item.session.historic_group %}{{item.timeslot.name|ics_esc}}{% else %}{{item.session.historic_group.acronym|lower}} - {{item.session.historic_group.name}}{% endif%}{%endif%} {% if item.timeslot.show_location %}LOCATION:{{item.timeslot.get_location}} {% endif %}STATUS:{{item.session.ical_status}} CLASS:PUBLIC diff --git a/ietf/templates/meeting/agenda.txt b/ietf/templates/meeting/agenda.txt index a7fd9119a..5a7ebeb2b 100644 --- a/ietf/templates/meeting/agenda.txt +++ b/ietf/templates/meeting/agenda.txt @@ -8,7 +8,7 @@ {% filter center:72 %}Updated {{ updated|date:"Y-m-d H:i:s T" }}{% endfilter %} {% filter center:72 %}IETF agendas are subject to change, up to and during the meeting.{% endfilter %} -{% for item in filtered_assignments.all.distinct %}{% ifchanged %} +{% for item in filtered_assignments %}{% ifchanged %} {{ item.timeslot.time|date:"l"|upper }}, {{ item.timeslot.time|date:"F j, Y" }} @@ -17,10 +17,10 @@ {{ item.timeslot.time_desc }} {{ item.session.name }} - {{ item.timeslot.location.name }} {{ item.session.agenda_text.strip|indent:"3" }} -{% endif %}{% if item.timeslot.type.slug == "session" %}{% if item.session.group %}{% ifchanged %} +{% endif %}{% if item.timeslot.type.slug == "session" %}{% if item.session.historic_group %}{% ifchanged %} {{ item.timeslot.time_desc }} {{ item.timeslot.name }} -{% endifchanged %}{{ item.timeslot.location.name|ljust:14 }} {{ item.session.group.parent.acronym|upper|ljust:4 }} {{ item.session.group.acronym|ljust:10 }} {{ item.session.group.name }} {{ item.session.lame_description }}{% if item.session.agenda_note %} - {{ item.session.agenda_note }}{% endif %} +{% endifchanged %}{{ item.timeslot.location.name|ljust:14 }} {{ item.session.historic_group.historic_parent.acronym|upper|ljust:4 }} {{ item.session.historic_group.acronym|ljust:10 }} {{ item.session.historic_group.name }} {% if item.session.historic_group.state_id == "bof" %}BOF{% elif item.session.historic_group.type_id == "wg" %}WG{% endif %}{% if item.session.agenda_note %} - {{ item.session.agenda_note }}{% endif %} {% endif %}{% endif %}{% if item.timeslot.type.slug == "break" %} {{ item.timeslot.time_desc }} {{ item.timeslot.name }}{% if schedule.meeting.break_area and item.timeslot.show_location %} - {{ schedule.meeting.break_area }}{% endif %}{% endif %}{% if item.timeslot.type.slug == "other" %} {{ item.timeslot.time_desc }} {{ item.timeslot.name }} - {{ item.timeslot.location.name }}{% endif %}{% endfor %} diff --git a/ietf/templates/meeting/week-view.html b/ietf/templates/meeting/week-view.html index 746ebd952..dc54c03a8 100644 --- a/ietf/templates/meeting/week-view.html +++ b/ietf/templates/meeting/week-view.html @@ -81,12 +81,7 @@ } // then actual script - var items = new Array(); - {% autoescape off %} - - {% for slot in timeslots %} {% if slot.type.name in render_types %} - items.push({key:"{{slot.pk}}",day:{{slot.time|date:"w"}}, time:"{{slot.time|date:"Hi"}}-{{slot.end_time|date:"Hi"}}", duration:{{slot.duration.seconds}}, time_id:"{{slot.time|date:"mdHi"}}", type:"{{slot.type}}", {% if slot.session.name %}name:"{{slot.session.name|escapejs}}",{% if slot.session.group.acronym %} wg:"{{slot.session.group.acronym}}",{%endif%}{% else %}{% if slot.type.name == "Break" %}name:"{{slot.name|escapejs}}", area:"break", wg:"break",{% else %}name:"{{slot.session.group.name|escapejs}}{%if slot.session.group.state.name = "BOF"%} BOF{%endif%}",wg:"{{slot.session.group.acronym}}",state:"{{slot.session.group.state}}",area:"{{slot.session.group.parent.acronym}}",{% endif %}{% endif %} {% if slot.show_location %}room:"{{slot.get_location}}",{% endif %} dayname:"{{ slot.time|date:"l"|upper }}, {{ slot.time|date:"F j, Y" }}"{% if slot.session.agenda %}, agenda:"{{slot.session.agenda.get_absolute_url}}"{% endif %} });{% endif %}{% endfor %} - {% endautoescape %} + var items = {{ items|safe }}; /* Saturday events need to be moved to the day -1 */ for (var i = 0; i < items.length; i++) @@ -152,10 +147,10 @@ // Current types are: // Session, Other, Break, Plenary - if ("wg" in item) + if ("group" in item) { - if (include[(item.wg).toLowerCase()]) { return true; } - if (include["-"+(item.wg).toLowerCase()]) { return false; } + if (include[(item.group).toLowerCase()]) { return true; } + if (include["-"+(item.group).toLowerCase()]) { return false; } } if ("state" in item) { @@ -209,7 +204,7 @@ { if (is_visible(items[i])) /* - if (!("wg" in items[i]) || (include[(items[i].wg).toLowerCase()] + if (!("group" in items[i]) || (include[(items[i].group).toLowerCase()] || include[(items[i].area).toLowerCase()])) */ { @@ -320,7 +315,7 @@ { if (is_visible(items[i])) /* - if (!("wg" in items[i]) || (include[(items[i].wg).toLowerCase()] + if (!("group" in items[i]) || (include[(items[i].group).toLowerCase()] || include[(items[i].area).toLowerCase()])) */ { @@ -387,9 +382,9 @@ var label = items[i].name; if (label.length === 0) { label = "Free Slot"; } - if (items[i].wg && fg[items[i].area]) + if (items[i].group && fg[items[i].area]) { - label = label + " (" + items[i].wg + ")"; + label = label + " (" + items[i].group + ")"; } var bold = document.createElement("span"); bold.appendChild(document.createTextNode(label)); diff --git a/ietf/utils/history.py b/ietf/utils/history.py index 24f72e55a..fe376cbed 100644 --- a/ietf/utils/history.py +++ b/ietf/utils/history.py @@ -22,6 +22,41 @@ def find_history_active_at(obj, time): return None +def find_history_replacements_active_at(objects, time): + """Return dictionary mapping object pk to object or its history + object at the time, if any. + + Same caveats as for find_history_active_at applies.""" + + if not objects: + return {} + + # automatically figure out how to query history model + history_model = objects[0].history_set.model + # core_filters contains something like "group__exact": obj + relation_name = objects[0].history_set.core_filters.keys()[0].replace("__exact", "") + + # now the querying is a bit tricky - we are only interested in the + # history version just before time, or if we can't get that, the + # one just after, but lacking a good way of expressing that + # through SQL we just grab all of them and sort it out ourselves + changed_objects = [o for o in objects if o.time > time] + + histories = history_model.objects.filter(**{ relation_name + "__in": changed_objects }).order_by(relation_name, "-time") + + history_for_obj = { o.pk: o for o in objects } + skip = None + for h in histories: + obj_id = getattr(h, relation_name + "_id") + if obj_id == skip: + continue + + history_for_obj[obj_id] = h + if h.time <= time: + skip = obj_id # we're far enough, go to next obj + + return history_for_obj + def get_history_object_for(obj): """Construct history object for obj, i.e. instantiate history object, copy relevant attributes and set a link to obj, but don't diff --git a/ietf/utils/pdf.py b/ietf/utils/pdf.py new file mode 100644 index 000000000..c863d4db1 --- /dev/null +++ b/ietf/utils/pdf.py @@ -0,0 +1,14 @@ +import re + +def pdf_pages(filename): + """Return number of pages in PDF.""" + try: + infile = open(filename, "r") + except IOError: + return 0 + for line in infile: + m = re.match('\] /Count ([0-9]+)',line) + if m: + return int(m.group(1)) + return 0 +
- {% if "-utc" in request.path %} - {{item.timeslot.utc_start_time|date:"G:i"}}-{{item.timeslot.utc_end_time|date:"G:i"}} - {% else %} - {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} - {% endif %} - - {% if item.timeslot.show_location and item.timeslot.get_location %} - {{item.timeslot.get_location|split:"/"|join:"/"}} - {% endif %} - - {{item.timeslot.name}} -
+ {% if "-utc" in request.path %} + {{item.timeslot.utc_start_time|date:"G:i"}}-{{item.timeslot.utc_end_time|date:"G:i"}} + {% else %} + {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} + {% endif %} + + {% if item.timeslot.show_location and item.timeslot.get_location %} + {{item.timeslot.get_location|split:"/"|join:"/"}} + {% endif %} + + {{item.timeslot.name}} +
- {% if "-utc" in request.path %} - {{item.timeslot.utc_start_time|date:"G:i"}}-{{item.timeslot.utc_end_time|date:"G:i"}} - {% else %} - {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} - {% endif %} - - {% if item.timeslot.show_location and item.timeslot.get_location %} - {{item.timeslot.get_location|split:"/"|join:"/"}} - {% endif %} - + {% if "-utc" in request.path %} + {{item.timeslot.utc_start_time|date:"G:i"}}-{{item.timeslot.utc_end_time|date:"G:i"}} + {% else %} + {{item.timeslot.time|date:"G:i"}}-{{item.timeslot.end_time|date:"G:i"}} + {% endif %} + + {% if item.timeslot.show_location and item.timeslot.get_location %} + {{item.timeslot.get_location|split:"/"|join:"/"}} + {% endif %} + - {% if item.timeslot.show_location and item.timeslot.get_location %} - {{item.timeslot.get_location|split:"/"|join:"/"}} - {% endif %} - + {% if item.timeslot.show_location and item.timeslot.get_location %} + {{item.timeslot.get_location|split:"/"|join:"/"}} + {% endif %} + - {% if item.session.group.charter %} - {{item.session.group.acronym}} - {% else %} - {{item.session.group.acronym}} - {% endif %} - + {% if item.session.historic_group.charter %} + {{item.session.historic_group.acronym}} + {% else %} + {{item.session.historic_group.acronym}} + {% endif %} + - {% if item.session.agenda %} - - {% endif %} - {% if item.timeslot.type.slug == 'plenary' %} - {{item.timeslot.name}} - {% else %} - {{item.session.group.name}} - {% endif %} - {% if item.session.agenda %} - - {% endif %} + + {% if item.session.agenda %} + + {% endif %} + {% if item.timeslot.type.slug == 'plenary' %} + {{item.timeslot.name}} + {% else %} + {{item.session.historic_group.name}} + {% endif %} + {% if item.session.agenda %} + + {% endif %} - {% if item.session.group.state.name = "BOF" %} - BOF - {% endif %} + {% if item.session.historic_group.state_id = "bof" %} + BOF + {% endif %} - {% if item.session.agenda_note %} -
{{item.session.agenda_note}} - {% endif %} + {% if item.session.agenda_note %} +
{{item.session.agenda_note}} + {% endif %} - -