Merged in ^/personal/henrik/6.25.2-floorplans@11546, which provides basic meeting venue floorplan and room location support, including JSON API access to floorplan images and room location. Floorplan data for IETF 96 in Berlin is also provided in a data migration. Not part of this release, but planned for a later release, is support for arrows pointing out rooms, and secretariat support for room location input.

 - Legacy-Id: 11547

Author: levkowetz

ietf/doc/models.py

@@ -575,7 +575,7 @@ class Meta:
 def save_document_in_history(doc):
     """This should be called before saving changes to a Document instance,
     so that the DocHistory entries contain all previous states, while
-    the Group entry contain the current state.  XXX TODO: Call this
+    the Document entry contain the current state.  XXX TODO: Call this
     directly from Document.save(), and add event listeners for save()
     on related objects so we can save as needed when they change, too.
     """

ietf/doc/resources.py

@@ -1,7 +1,7 @@
 # Autogenerated by the makeresources management command 2015-10-19 12:29 PDT
 from tastypie.resources import ModelResource
 from ietf.api import ToOneField
-from tastypie.fields import ToManyField, CharField # pyflakes:ignore
+from tastypie.fields import ToManyField, CharField
 from tastypie.constants import ALL, ALL_WITH_RELATIONS # pyflakes:ignore
 from tastypie.cache import SimpleCache
 

ietf/doc/templatetags/ietf_filters.py

@@ -616,3 +616,7 @@ def format_timedelta(timedelta):
     hours, remainder = divmod(s, 3600)
     minutes, seconds = divmod(remainder, 60)
     return '{hours:02d}:{minutes:02d}'.format(hours=hours,minutes=minutes)
+
+@register.filter()
+def nbsp(value):
+    return mark_safe(" ".join(value.split(' ')))

ietf/meeting/admin.py

@@ -1,9 +1,10 @@
 from django.contrib import admin
 
-from ietf.meeting.models import Meeting, Room, Session, TimeSlot, Constraint, Schedule, SchedTimeSessAssignment, ResourceAssociation
+from ietf.meeting.models import (Meeting, Room, Session, TimeSlot, Constraint, Schedule,
+    SchedTimeSessAssignment, ResourceAssociation, FloorPlan)
 
 class RoomAdmin(admin.ModelAdmin):
-    list_display = ["id", "meeting", "name", "capacity", ]
+    list_display = ["id", "meeting", "name", "capacity", "x1", "y1", "x2", "y2", ]
     list_filter = ["meeting"]
     ordering = ["-meeting"]
 
@@ -98,3 +99,8 @@ class SchedTimeSessAssignmentAdmin(admin.ModelAdmin):
 class ResourceAssociationAdmin(admin.ModelAdmin):
     list_display = ["desc", "icon", "desc", ]
 admin.site.register(ResourceAssociation, ResourceAssociationAdmin)
+
+class FloorPlanAdmin(admin.ModelAdmin):
+    list_display = ['id', 'meeting', 'name', 'order', 'image', ]
+    raw_id_fields = ['meeting', ]
+admin.site.register(FloorPlan, FloorPlanAdmin)

ietf/meeting/factories.py

@@ -3,8 +3,9 @@
 import datetime
 
 from django.db.models import Max
+from django.core.files.base import ContentFile
 
-from ietf.meeting.models import Meeting, Session, Schedule, TimeSlot, SessionPresentation
+from ietf.meeting.models import Meeting, Session, Schedule, TimeSlot, SessionPresentation, FloorPlan
 from ietf.group.factories import GroupFactory
 from ietf.person.factories import PersonFactory
 
@@ -106,3 +107,18 @@ class Meta:
     def rev(self):
         return self.document.rev
 
+class FloorPlanFactory(factory.DjangoModelFactory):
+    class Meta:
+        model = FloorPlan
+
+    name = factory.Sequence(lambda n: u'Venue Floor %d' % n)
+    meeting = factory.SubFactory(MeetingFactory)
+    order = factory.Sequence(lambda n: n)
+    image = factory.LazyAttribute(
+            lambda _: ContentFile(
+                factory.django.ImageField()._make_data(
+                    {'width': 1024, 'height': 768}
+                ), 'floorplan.jpg'
+            )
+        )
+        

ietf/meeting/migrations/0025_add_floorplan_and_room_coordinates.py

@@ -0,0 +1,59 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import ietf.utils.storage
+import ietf.meeting.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0024_migrate_interim_meetings'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='FloorPlan',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=255)),
+                ('order', models.SmallIntegerField()),
+                ('image', models.ImageField(default=None, storage=ietf.utils.storage.NoLocationMigrationFileSystemStorage(location=None), upload_to=ietf.meeting.models.floorplan_path, blank=True)),
+                ('meeting', models.ForeignKey(to='meeting.Meeting')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='floorplan',
+            field=models.ForeignKey(default=None, blank=True, to='meeting.FloorPlan', null=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='x1',
+            field=models.SmallIntegerField(default=None, null=True, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='x2',
+            field=models.SmallIntegerField(default=None, null=True, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='y1',
+            field=models.SmallIntegerField(default=None, null=True, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='y2',
+            field=models.SmallIntegerField(default=None, null=True, blank=True),
+            preserve_default=True,
+        ),
+    ]

ietf/meeting/migrations/0026_add_floorplan_data.py

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+floors = [
+    (1, "Berlin Intercontinental Floor 1",  1, 'floor/floorplan-96-berlin-intercontinental-floor-1.jpg'),
+    (2, "Berlin Intercontinental Floor 1",  2, 'floor/floorplan-96-berlin-intercontinental-floor-2.jpg'),
+    (3, "Berlin Intercontinental Floor 1",  14, 'floor/floorplan-96-berlin-intercontinental-floor-14.jpg'),
+]
+
+rooms = [
+    ("Bellevue",                 1,	176,	1348,	324,	1526),
+    ("Kaminzimmer",              1,	696,	820,	812,	1038),
+    ("Charlottenburg I",         1,	374,	320,	528,	400),
+    ("Charlottenburg II/III",	1,	374,	172,	528,	316),
+    ("Chess",                    2,	238,	614,	336,	782),
+    ("Glienicke",                1,	228,	1251,	324,	1310),
+    ("Hugos 360",                3,	801,	1346,	976,	1509),
+    ("King",                     2,	802,	1389,	890,	1508),
+    ("Koepenick I/II",           1,	370,	453,	458,	602),
+    ("Lincke",                   2,	40,	99,	532,	166),
+    ("Potsdam I",                1,	1228,	790,	1550,	994),
+    ("Potsdam I/III",            1,	1017,	792,	1550,	994),
+    ("Potsdam II",               1,	1311,	1036,	1536,	1142),
+    ("Potsdam III",              1,	1017,	792,	1228,	987),
+    ("Rook",                     2,	915,	1150,	1004,	1269),
+    ("Schoeneberg",              1,	369,	42,	534,	126),
+    ("Tegel",                    1,	201,	1088,	326,	1184),
+    ("Tiergarten",               1,	240,	612,	334,	780),
+    ("Wintergarten/Pavillion",	1,	466,	1038,	711,	1504),
+]
+
+def forward(apps, schema_editor):
+    FloorPlan = apps.get_model('meeting','FloorPlan')
+    Room = apps.get_model('meeting','Room')
+    Meeting = apps.get_model('meeting','Meeting')
+    meeting = Meeting.objects.get(number='96')
+    for item in floors:
+        id, name, order, image = item
+        f = FloorPlan(id=id, name=name, meeting=meeting, order=order, image=image)
+        f.save()
+
+    for item in rooms:
+        name, floor_id, x1, y1, x2, y2 = item
+        room = Room.objects.get(name=name, meeting=meeting)
+        room.floorplan_id = floor_id
+        room.x1 = x1
+        room.y1 = y1
+        room.x2 = x2
+        room.y2 = y2
+        room.save()
+
+def backward(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0025_add_floorplan_and_room_coordinates'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,backward)
+    ]

ietf/meeting/models.py

@@ -25,6 +25,7 @@
 from ietf.group.utils import can_manage_materials
 from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName
 from ietf.person.models import Person
+from ietf.utils.storage import NoLocationMigrationFileSystemStorage
 
 countries = pytz.country_names.items()
 countries.sort(lambda x,y: cmp(x[1], y[1]))
@@ -274,6 +275,8 @@ def updated(self):
     class Meta:
         ordering = ["-date", "id"]
 
+# === Rooms, Resources, Floorplans =============================================
+
 class ResourceAssociation(models.Model):
     name = models.ForeignKey(RoomResourceName)
     #url  = models.UrlField()       # not sure what this was for.
@@ -298,6 +301,15 @@ class Room(models.Model):
     capacity = models.IntegerField(null=True, blank=True)
     resources = models.ManyToManyField(ResourceAssociation, blank = True)
     session_types = models.ManyToManyField(TimeSlotTypeName, blank = True)
+    # floorplan-related properties
+    floorplan = models.ForeignKey('FloorPlan', null=True, blank=True, default=None)
+    # floorplan: room pixel position : (0,0) is top left of image, (xd, yd)
+    # is room width, height.
+    x1 = models.SmallIntegerField(null=True, blank=True, default=None)
+    y1 = models.SmallIntegerField(null=True, blank=True, default=None)
+    x2 = models.SmallIntegerField(null=True, blank=True, default=None)
+    y2 = models.SmallIntegerField(null=True, blank=True, default=None)
+    # end floorplan-related stuff
 
     def __unicode__(self):
         return "%s size: %s" % (self.name, self.capacity)
@@ -332,6 +344,36 @@ def json_dict(self, host_scheme):
             'capacity':             self.capacity,
             }
 
+    def left(self):
+        return min(self.x1, self.x2) if (self.x1 and self.x2) else 0
+    def top(self):
+        return min(self.y1, self.y2) if (self.y1 and self.y2) else 0
+    def right(self):
+        return max(self.x1, self.x2) if (self.x1 and self.x2) else 0
+    def bottom(self):
+        return max(self.y1, self.y2) if (self.y1 and self.y2) else 0
+    def functional_display_name(self):
+        if not self.functional_name:
+            return ""
+        if self.functional_name.lower().startswith('breakout'):
+            return ""
+        if self.functional_name[0].isdigit():
+            return ""
+        return self.functional_name
+    class Meta:
+        ordering = ["-meeting", "name"]
+
+def floorplan_path(instance, filename):
+    root, ext = os.path.splitext(filename)
+    return u"%s/floorplan-%s-%s%s" % (settings.FLOORPLAN_MEDIA_DIR, instance.meeting.number, slugify(instance.name), ext)
+
+class FloorPlan(models.Model):
+    name    = models.CharField(max_length=255)
+    meeting = models.ForeignKey(Meeting)
+    order   = models.SmallIntegerField()
+    image   = models.ImageField(storage=NoLocationMigrationFileSystemStorage(), upload_to=floorplan_path, blank=True, default=None)
+
+# === Schedules, Sessions, Timeslots and Assignments ===========================
 
 class TimeSlot(models.Model):
     """
@@ -1307,3 +1349,4 @@ def badness_fast(self, timeslot, scheduleslot, session_pk_list):
         if self.badness_test(1):
             self.badness_log(1, "badgroup: %s badness = %u\n" % (self.group.acronym, badness))
         return badness
+

ietf/meeting/resources.py

@@ -8,7 +8,7 @@
 from ietf import api
 
 from ietf.meeting.models import ( Meeting, ResourceAssociation, Constraint, Room, Schedule, Session,
-                                TimeSlot, SchedTimeSessAssignment, SessionPresentation )
+                                TimeSlot, SchedTimeSessAssignment, SessionPresentation, FloorPlan )
 
 from ietf.name.resources import MeetingTypeNameResource
 class MeetingResource(ModelResource):
@@ -83,11 +83,28 @@ class Meta:
         }
 api.meeting.register(ConstraintResource())
 
+class FloorPlanResource(ModelResource):
+    meeting          = ToOneField(MeetingResource, 'meeting')
+    class Meta:
+        queryset = FloorPlan.objects.all()
+        serializer = api.Serializer()
+        cache = SimpleCache()
+        #resource_name = 'floorplan'
+        filtering = { 
+            "id": ALL,
+            "name": ALL,
+            "order": ALL,
+            "image": ALL,
+            "meeting": ALL_WITH_RELATIONS,
+        }
+api.meeting.register(FloorPlanResource())
+
 from ietf.name.resources import TimeSlotTypeNameResource
 class RoomResource(ModelResource):
     meeting          = ToOneField(MeetingResource, 'meeting')
     resources        = ToManyField(ResourceAssociationResource, 'resources', null=True)
     session_types    = ToManyField(TimeSlotTypeNameResource, 'session_types', null=True)
+    floorplan        = ToOneField(FloorPlanResource, 'floorplan', null=True)
     class Meta:
         cache = SimpleCache()
         queryset = Room.objects.all()
@@ -101,6 +118,7 @@ class Meta:
             "meeting": ALL_WITH_RELATIONS,
             "resources": ALL_WITH_RELATIONS,
             "session_types": ALL_WITH_RELATIONS,
+            "floorplan": ALL_WITH_RELATIONS,
         }
 api.meeting.register(RoomResource())
 

ietf/meeting/test_data.py

@@ -40,7 +40,7 @@ def make_meeting_test_data():
     unofficial_schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-unofficial-agenda", visible=True, public=True)
     pname = RoomResourceName.objects.create(name='projector',slug='proj')
     projector = ResourceAssociation.objects.create(name=pname,icon="notfound.png",desc="Basic projector")
-    room = Room.objects.create(meeting=meeting, name="Test Room", capacity=123)
+    room = Room.objects.create(meeting=meeting, name="Test Room", capacity=123, functional_name="Testing Ground")
     breakfast_room = Room.objects.create(meeting=meeting, name="Breakfast Room", capacity=40)
     room.session_types.add("session")
     breakfast_room.session_types.add("lead")