Introduce support for setting a base schedule on a schedule. All

assignments on the base schedule are shown in the pages for the
schedule, read-only.

This allows managing things like breaks and misc sessions separately
from the regular WG sessions.

Base schedules are not allowed to be the base of other base schedules
(the hierarchy can only be one level deep) to simplify the mental
model and the code.

Add link for creating new schedules instead of relying on copying
Empty-Schedule and change the meeting creation code to no longer
create the special Empty-Schedule. Instead a "base" schedule is
created and a first schedule with the name and permissions of the user
creating the meeting, using "base" as base.

Speed up a couple of the Secretariat/AD agenda views by adding
prefetches.
 - Legacy-Id: 18355

Author: OleLaursen

ietf/bin/create-break-sessions

@@ -33,11 +33,11 @@ for meeting in Meeting.objects.filter(type="ietf").order_by("date"):
     for schedule in meeting.schedule_set.all():
         print "  Checking for missing Break and Reg sessions in %s" % schedule
         for timeslot in meeting.timeslot_set.all():
-            if timeslot.type_id == 'break':
-                assignment, created = ScheduleTimeslotSSessionAssignment.objects.get_or_create(timeslot=timeslot, session=brk, schedule=schedule)
+            if timeslot.type_id == 'break' and not (schedule.base and SchedTimeSessAssignment.objects.filter(timeslot=timeslot, session=brk, schedule=schedule.base).exists()):
+                assignment, created = SchedTimeSessAssignment.objects.get_or_create(timeslot=timeslot, session=brk, schedule=schedule)
                 if created:
                     print "    Added %s break assignment" % timeslot
-            if timeslot.type_id == 'reg':
-                assignment, created = ScheduleTimeslotSSessionAssignment.objects.get_or_create(timeslot=timeslot, session=reg, schedule=schedule)
+            if timeslot.type_id == 'reg' and not (schedule.base and SchedTimeSessAssignment.objects.filter(timeslot=timeslot, session=reg, schedule=schedule.base).exists()):
+                assignment, created = SchedTimeSessAssignment.objects.get_or_create(timeslot=timeslot, session=reg, schedule=schedule)
                 if created:
                     print "    Added %s registration assignment" % timeslot

ietf/meeting/admin.py

@@ -126,8 +126,8 @@ class SchedulingEventAdmin(admin.ModelAdmin):
 
 class ScheduleAdmin(admin.ModelAdmin):
     list_display = ["name", "meeting", "owner", "visible", "public", "badness"]
-    list_filter = ["meeting", ]
-    raw_id_fields = ["meeting", "owner", ]
+    list_filter = ["meeting"]
+    raw_id_fields = ["meeting", "owner", "origin", "base"]
     search_fields = ["meeting__number", "name", "owner__name"]
     ordering = ["-meeting", "name"]
 

ietf/meeting/helpers.py

@@ -143,13 +143,6 @@ def get_schedule(meeting, name=None):
         schedule = get_object_or_404(meeting.schedule_set, name=name)
     return schedule
 
-def get_schedule_by_id(meeting, schedid):
-    if schedid is None:
-        schedule = meeting.schedule
-    else:
-        schedule = get_object_or_404(meeting.schedule_set, id=int(schedid))
-    return schedule
-
 # seems this belongs in ietf/person/utils.py?
 def get_person_by_email(email):
     # email == None may actually match people who haven't set an email!
@@ -428,6 +421,11 @@ def get_announcement_initial(meeting, is_change=False):
     type = group.type.slug.upper()
     if group.type.slug == 'wg' and group.state.slug == 'bof':
         type = 'BOF'
+
+    assignments = SchedTimeSessAssignment.objects.filter(
+        schedule__in=[meeting.schedule, meeting.schedule.base if meeting.schedule else None]
+    ).order_by('timeslot__time')
+
     initial['subject'] = '{name} ({acronym}) {type} {desc} Meeting: {date}{change}'.format(
         name=group.name, 
         acronym=group.acronym,

ietf/meeting/management/commands/create_dummy_meeting.py

@@ -85,8 +85,11 @@ def handle(self, *args, **options):
                     date=datetime.date(2019, 11, 16),
                     days=7,
                 )
-                schedule = Schedule.objects.create(meeting=m, name='Empty-Schedule', owner_id=1, 
-                                                   visible=True, public=True)
+                base_schedule = Schedule.objects.create(meeting=m, name='base', owner_id=1,
+                                                        visible=True, public=True)
+
+                schedule = Schedule.objects.create(meeting=m, name='first1', owner_id=1,
+                                                   visible=True, public=True, base=base_schedule)
                 m.schedule = schedule
                 m.save()
 

ietf/meeting/migrations/0032_add_schedule_base.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.0.13 on 2020-08-07 09:30
+
+from django.db import migrations
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0031_add_session_origin'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='schedule',
+            name='base',
+            field=ietf.utils.models.ForeignKey(blank=True, help_text='Sessions scheduled in the base show up in this schedule.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='derivedschedule_set', to='meeting.Schedule'),
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='origin',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='meeting.Schedule'),
+        ),
+    ]

ietf/meeting/models.py

@@ -291,7 +291,9 @@ def updated(self):
         min_time = datetime.datetime(1970, 1, 1, 0, 0, 0) # should be Meeting.modified, but we don't have that
         timeslots_updated = self.timeslot_set.aggregate(Max('modified'))["modified__max"] or min_time
         sessions_updated = self.session_set.aggregate(Max('modified'))["modified__max"] or min_time
-        assignments_updated = (self.schedule.assignments.aggregate(Max('modified'))["modified__max"] or min_time) if self.schedule else min_time
+        assignments_updated = min_time
+        if self.schedule:
+            assignments_updated = SchedTimeSessAssignment.objects.filter(schedule__in=[self.schedule, self.schedule.base if self.schedule else None]).aggregate(Max('modified'))["modified__max"] or min_time
         ts = max(timeslots_updated, sessions_updated, assignments_updated)
         tz = pytz.timezone(settings.PRODUCTION_TIMEZONE)
         ts = tz.localize(ts)
@@ -450,7 +452,7 @@ class TimeSlot(models.Model):
     @property
     def session(self):
         if not hasattr(self, "_session_cache"):
-            self._session_cache = self.sessions.filter(timeslotassignments__schedule=self.meeting.schedule).first()
+            self._session_cache = self.sessions.filter(timeslotassignments__schedule__in=[self.meeting.schedule, self.meeting.schedule.base if self.meeting else None]).first()
         return self._session_cache
 
     @property
@@ -626,7 +628,10 @@ class Schedule(models.Model):
     public   = models.BooleanField(default=True, help_text="Allow others to see this agenda.")
     badness  = models.IntegerField(null=True, blank=True)
     notes    = models.TextField(blank=True)
-    origin   = ForeignKey('Schedule', blank=True, null=True, on_delete=models.SET_NULL)
+    origin   = ForeignKey('Schedule', blank=True, null=True, on_delete=models.SET_NULL, related_name="+")
+    base     = ForeignKey('Schedule', blank=True, null=True, on_delete=models.SET_NULL,
+                          help_text="Sessions scheduled in the base schedule show up in this schedule too.", related_name="derivedschedule_set",
+                          limit_choices_to={'base': None}) # prevent the inheritance from being more than one layer deep (no recursion)
 
     def __str__(self):
         return u"%s:%s(%s)" % (self.meeting, self.name, self.owner)
@@ -1047,7 +1052,7 @@ def __str__(self):
             ss0name = "(%s)" % SessionStatusName.objects.get(slug=status_id).name
         else:
             ss0name = "(unscheduled)"
-            ss = self.timeslotassignments.filter(schedule=self.meeting.schedule).order_by('timeslot__time')
+            ss = self.timeslotassignments.filter(schedule__in=[self.meeting.schedule, self.meeting.schedule.base if self.meeting.schedule else None]).order_by('timeslot__time')
             if ss:
                 ss0name = ','.join(x.timeslot.time.strftime("%a-%H%M") for x in ss)
         return "%s: %s %s %s" % (self.meeting, self.group.acronym, self.name, ss0name)
@@ -1080,11 +1085,8 @@ def constraints(self):
     def reverse_constraints(self):
         return Constraint.objects.filter(target=self.group, meeting=self.meeting).order_by('name__name')
 
-    def timeslotassignment_for_schedule(self, schedule):
-        return self.timeslotassignments.filter(schedule=schedule).first()
-
     def official_timeslotassignment(self):
-        return self.timeslotassignment_for_schedule(self.meeting.schedule)
+        return self.timeslotassignments.filter(schedule__in=[self.meeting.schedule, self.meeting.schedule.base if self.meeting.schedule else None]).first()
 
     def constraints_dict(self, host_scheme):
         constraint_list = []

ietf/meeting/test_data.py

@@ -76,8 +76,9 @@ def make_meeting_test_data(meeting=None):
 
     if not meeting:
         meeting = Meeting.objects.get(number="72", type="ietf")
-    schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-schedule", visible=True, public=True)
-    unofficial_schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-unofficial-schedule", visible=True, public=True)
+    base_schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="base", visible=True, public=True)
+    schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-schedule", visible=True, public=True, base=base_schedule)
+    unofficial_schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-unofficial-schedule", visible=True, public=True, base=base_schedule)
 
     # test room
     pname = RoomResourceName.objects.create(name='projector',slug='proj')
@@ -146,15 +147,15 @@ def make_meeting_test_data(meeting=None):
                                          requested_duration=datetime.timedelta(minutes=480),
                                          type_id="reg")
     SchedulingEvent.objects.create(session=reg_session, status_id='schedw', by=system_person)
-    SchedTimeSessAssignment.objects.create(timeslot=reg_slot, session=reg_session, schedule=schedule)
+    SchedTimeSessAssignment.objects.create(timeslot=reg_slot, session=reg_session, schedule=base_schedule)
 
     # Break
     break_session = Session.objects.create(meeting=meeting, group=Group.objects.get(acronym="secretariat"),
                                            name="Morning Break", attendees=250,
                                            requested_duration=datetime.timedelta(minutes=30),
                                            type_id="break")
     SchedulingEvent.objects.create(session=break_session, status_id='schedw', by=system_person)
-    SchedTimeSessAssignment.objects.create(timeslot=break_slot, session=break_session, schedule=schedule)
+    SchedTimeSessAssignment.objects.create(timeslot=break_slot, session=break_session, schedule=base_schedule)
 
     meeting.schedule = schedule
     meeting.save()

ietf/meeting/tests_js.py

@@ -133,6 +133,8 @@ def test_edit_meeting_schedule(self):
         url = self.absreverse('ietf.meeting.views.edit_meeting_schedule', kwargs=dict(num=meeting.number, name=schedule.name, owner=schedule.owner_email()))
         self.driver.get(url)
 
+        WebDriverWait(self.driver, 2).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, '.edit-meeting-schedule')))
+
         self.assertEqual(len(self.driver.find_elements_by_css_selector('.session')), 3)
 
         # select - show session info