Merged in ^/branch/iola/meeting-improvement-r17214@17617, which provides a new meeting schedule editor.

 - Legacy-Id: 17701

Author: levkowetz

docker/Dockerfile

@@ -139,15 +139,6 @@ RUN wget -q https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm get-
 RUN pip install certifi
 RUN pip install virtualenv
 
-# Phantomjs
-WORKDIR /usr/local
-
-RUN wget -qN https://tools.ietf.org/tar/phantomjs-1.9.8-linux-x86_64.tar.bz2
-RUN tar xjf phantomjs-1.9.8-linux-x86_64.tar.bz2
-
-WORKDIR /usr/local/bin
-RUN ln -s /usr/local/phantomjs-1.9.8-linux-x86_64/bin/phantomjs .
-
 # idnits and dependencies
 ADD https://tools.ietf.org/tools/idnits/idnits /usr/local/bin/
 RUN chmod +rx /usr/local/bin/idnits

docker/install-extras

@@ -1,8 +1,7 @@
 #!/bin/bash
 
 export DEBIAN_FRONTEND=noninteractive
-su - -c "apt-get update \
-	&& apt-get install -qy graphviz ghostscript apache2-utils \
+sudo su - -c "apt-get update \
+	&& apt-get install -qy graphviz ghostscript apache2-utils chromium-driver \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*"
-      

ietf/meeting/models.py

@@ -15,7 +15,7 @@
 
 import debug                            # pyflakes:ignore
 
-from django.core.validators import MinValueValidator
+from django.core.validators import MinValueValidator, RegexValidator
 from django.db import models
 from django.db.models import Max
 from django.conf import settings
@@ -620,7 +620,7 @@ class Schedule(models.Model):
     schedule, others may copy it
     """
     meeting  = ForeignKey(Meeting, null=True, related_name='schedule_set')
-    name     = models.CharField(max_length=16, blank=False)
+    name     = models.CharField(max_length=16, blank=False, help_text="Letters, numbers and -:_ allowed.", validators=[RegexValidator(r'^[A-Za-z0-9-:_]*$')])
     owner    = ForeignKey(Person)
     visible  = models.BooleanField(default=True, help_text="Make this agenda available to those who know about it.")
     public   = models.BooleanField(default=True, help_text="Make this agenda publically available.")

ietf/meeting/test_data.py

@@ -99,11 +99,11 @@ def make_meeting_test_data(meeting=None):
     # slots
     session_date = meeting.date + datetime.timedelta(days=1)
     slot1 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
-                                    duration=datetime.timedelta(minutes=30),
+                                    duration=datetime.timedelta(minutes=60),
                                     time=datetime.datetime.combine(session_date, datetime.time(9, 30)))
     slot2 = TimeSlot.objects.create(meeting=meeting, type_id='regular', location=room,
-                                    duration=datetime.timedelta(minutes=30),
-                                    time=datetime.datetime.combine(session_date, datetime.time(10, 30)))
+                                    duration=datetime.timedelta(minutes=60),
+                                    time=datetime.datetime.combine(session_date, datetime.time(10, 50)))
     breakfast_slot = TimeSlot.objects.create(meeting=meeting, type_id="lead", location=breakfast_room,
                                     duration=datetime.timedelta(minutes=90),
                                     time=datetime.datetime.combine(session_date, datetime.time(7,0)))
@@ -116,7 +116,7 @@ def make_meeting_test_data(meeting=None):
     # mars WG
     mars = Group.objects.get(acronym='mars')
     mars_session = Session.objects.create(meeting=meeting, group=mars,
-                                          attendees=10, requested_duration=datetime.timedelta(minutes=20),
+                                          attendees=10, requested_duration=datetime.timedelta(minutes=50),
                                           type_id='regular')
     SchedulingEvent.objects.create(session=mars_session, status_id='schedw', by=system_person)
     SchedTimeSessAssignment.objects.create(timeslot=slot1, session=mars_session, schedule=schedule)
@@ -125,7 +125,7 @@ def make_meeting_test_data(meeting=None):
     # ames WG
     ames_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="ames"),
                                           attendees=10,
-                                          requested_duration=datetime.timedelta(minutes=20),
+                                          requested_duration=datetime.timedelta(minutes=60),
                                           type_id='regular')
     SchedulingEvent.objects.create(session=ames_session, status_id='schedw', by=system_person)
     SchedTimeSessAssignment.objects.create(timeslot=slot2, session=ames_session, schedule=schedule)
@@ -134,7 +134,7 @@ def make_meeting_test_data(meeting=None):
     # IESG breakfast
     iesg_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="iesg"),
                                           name="IESG Breakfast", attendees=25,
-                                          requested_duration=datetime.timedelta(minutes=20),
+                                          requested_duration=datetime.timedelta(minutes=60),
                                           type_id="lead")
     SchedulingEvent.objects.create(session=iesg_session, status_id='schedw', by=system_person)
     SchedTimeSessAssignment.objects.create(timeslot=breakfast_slot, session=iesg_session, schedule=schedule)