Merged in ^/branch/iola/meeting-improvement-r18382@18466. This provides a beta-level snapshot of the new schedule editor work. All known issues should be fixed, but there might be adjustments needed after experience with using the new edit view.

 - Legacy-Id: 18467

Author: levkowetz

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

@@ -138,8 +138,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

@@ -151,13 +151,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!
@@ -229,10 +222,15 @@ def preprocess_assignments_for_agenda(assignments_queryset, meeting, extra_prefe
     parents = Group.objects.filter(pk__in=parent_id_set)
     parent_replacements = find_history_replacements_active_at(parents, meeting_time)
 
+    timeslot_by_session_pk = {a.session_id: a.timeslot for a in assignments}
+
     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)
 
+        if a.session.current_status == 'resched':
+            a.session.rescheduled_to = timeslot_by_session_pk.get(a.session.tombstone_for_id)
+
         for d in a.session.prefetched_active_materials:
             # make sure these are precomputed with the meeting instead
             # of having to look it up
@@ -440,6 +438,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/0033_session_tombstone_for.py

@@ -0,0 +1,19 @@
+# Copyright The IETF Trust 2020, All Rights Reserved
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0032_auto_20200824_1642'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='session',
+            name='tombstone_for',
+            field=models.ForeignKey(blank=True, help_text='This session is the tombstone for a session that was rescheduled', null=True, on_delete=django.db.models.deletion.CASCADE, to='meeting.Session'),
+        ),
+    ]

ietf/meeting/migrations/0034_schedule_notes.py

@@ -0,0 +1,28 @@
+# Generated by Django 2.0.13 on 2020-07-01 02:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0033_session_tombstone_for'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='schedule',
+            name='notes',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='public',
+            field=models.BooleanField(default=True, help_text='Allow others to see this agenda.'),
+        ),
+        migrations.AlterField(
+            model_name='schedule',
+            name='visible',
+            field=models.BooleanField(default=True, help_text='Show in the list of possible agendas for the meeting.', verbose_name='Show in agenda list'),
+        ),
+    ]

ietf/meeting/migrations/0035_add_session_origin.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.0.13 on 2020-08-04 06:22
+
+from django.db import migrations
+import django.db.models.deletion
+import ietf.utils.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0034_schedule_notes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='schedule',
+            name='origin',
+            field=ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='meeting.Schedule'),
+        ),
+    ]

ietf/meeting/migrations/0036_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', '0035_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

@@ -298,7 +298,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)
@@ -457,7 +459,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
@@ -637,10 +639,14 @@ class Schedule(models.Model):
     meeting  = ForeignKey(Meeting, null=True, related_name='schedule_set')
     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.")
+    visible  = models.BooleanField("Show in agenda list", default=True, help_text="Show in the list of possible agendas for the meeting.")
+    public   = models.BooleanField(default=True, help_text="Allow others to see this agenda.")
     badness  = models.IntegerField(null=True, blank=True)
-    # considering copiedFrom = ForeignKey('Schedule', blank=True, null=True)
+    notes    = models.TextField(blank=True)
+    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)
@@ -667,20 +673,6 @@ def owner_email(self):
         else:
             return "noemail"
 
-    @property
-    def visible_token(self):
-        if self.visible:
-            return "visible"
-        else:
-            return "hidden"
-
-    @property
-    def public_token(self):
-        if self.public:
-            return "public"
-        else:
-            return "private"
-
     @property
     def is_official(self):
         return (self.meeting.schedule == self)
@@ -952,6 +944,8 @@ class Session(models.Model):
     modified = models.DateTimeField(auto_now=True)
     remote_instructions = models.CharField(blank=True,max_length=1024)
 
+    tombstone_for = models.ForeignKey('Session', blank=True, null=True, help_text="This session is the tombstone for a session that was rescheduled", on_delete=models.CASCADE)
+
     materials = models.ManyToManyField(Document, through=SessionPresentation, blank=True)
     resources = models.ManyToManyField(ResourceAssociation, blank=True)
 
@@ -1093,7 +1087,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)
@@ -1126,11 +1120,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

@@ -78,8 +78,9 @@ def make_meeting_test_data(meeting=None, create_interims=False):
 
     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')
@@ -148,15 +149,15 @@ def make_meeting_test_data(meeting=None, create_interims=False):
                                          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()