Skip to content

Commit 8fee031

Browse files
committed
Added a floorplan view function, and urls to go with it.
- Legacy-Id: 11543
1 parent 1d5e0ec commit 8fee031

2 files changed

Lines changed: 17 additions & 3 deletions

File tree

ietf/meeting/urls.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
]
5353

5454
type_ietf_only_patterns_id_optional = [
55-
url(r'^agenda(-utc)?(?P<ext>.html)?/?$', views.agenda),
55+
url(r'^agenda(?P<utc>-utc)?(?P<ext>.html)?/?$', views.agenda),
5656
url(r'^agenda(?P<ext>.txt)$', views.agenda),
5757
url(r'^agenda(?P<ext>.csv)$', views.agenda),
5858
url(r'^agenda/edit$', views.edit_agenda),
@@ -61,6 +61,8 @@
6161
url(r'^agenda.ics$', views.ical_agenda),
6262
url(r'^agenda/week-view(?:.html)?/?$', views.week_view),
6363
url(r'^agenda/room-view(?:.html)?/?$', views.room_view),
64+
url(r'^agenda/floor-plan/?$', views.floor_plan),
65+
url(r'^agenda/floor-plan/(?P<floor>[-a-z0-9_]+)/?$', views.floor_plan),
6466
url(r'^week-view(?:.html)?/?$', views.week_view),
6567
url(r'^room-view(?:.html)?/$', views.room_view),
6668
url(r'^materials(?:.html)?/$', views.materials),

ietf/meeting/views.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from ietf.group.models import Group
3333
from ietf.group.utils import can_manage_materials
3434
from ietf.ietfauth.utils import role_required, has_role
35-
from ietf.meeting.models import Meeting, Session, Schedule, Room
35+
from ietf.meeting.models import Meeting, Session, Schedule, Room, FloorPlan
3636
from ietf.meeting.helpers import get_areas, get_person_by_email, get_schedule_by_name
3737
from ietf.meeting.helpers import build_all_agenda_slices, get_wg_name_list
3838
from ietf.meeting.helpers import get_all_assignments_from_schedule
@@ -393,7 +393,7 @@ def list_agendas(request, num=None ):
393393
})
394394

395395
@ensure_csrf_cookie
396-
def agenda(request, num=None, name=None, base=None, ext=None, owner=None):
396+
def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""):
397397
base = base if base else 'agenda'
398398
ext = ext if ext else '.html'
399399
mimetype = {
@@ -1424,3 +1424,15 @@ def upcoming_ical(request):
14241424
response['Content-Disposition'] = 'attachment; filename="upcoming.ics"'
14251425
return response
14261426

1427+
1428+
def floor_plan(request, num=None, floor=None, ):
1429+
meeting = get_meetings(num).first()
1430+
schedule = meeting.agenda
1431+
floors = FloorPlan.objects.filter(meeting=meeting).order_by('order')
1432+
if floor:
1433+
floors = floors.filter(name=floor)
1434+
return render(request, 'meeting/floor-plan.html', {
1435+
"schedule": schedule,
1436+
"number": num,
1437+
"floors": floors,
1438+
})

0 commit comments

Comments
 (0)