Merged in ^/branch/dash/automatic-scheduler@17395, which adds groundwor for

upcoming automatic scheduling assistance:

 . Added a management command to create a dummy IETF 999 meeting.

 . Added display of new constraints and joint sessions to agenda builder
   interface.

 . The new timerange, time_relation and wg_adjacent constraints, along with
   the joint_with_groups option, are now reflected in the special requests
   field.  This allows them to be taken into account while scheduling
   sessions.

 . Clarified the wording in the session request form regarding conflicts with
   BOFs.

 . Added support for structured entry and storage of joint sessions in
   meetings:

   - Also adds additional tests for the SessionForm
   - Fixes a javascript error in session requests for non-WG groups,
     that could cause incorrect form behaviour.
   - Expands the tests added in [17289] a bit.

 . Added support for the timerange, wg_adjacent and time_relation constraints.
   This adds three new constraints to the database and relevant UIs:

   - timerange: "This WG can't meet during these timeframes"
   - wg_adjacent: "Schedule adjacent to another WG (directly following,
     no breaks, same room)"
   - time_relation: schedule the two sessions of one WG on subsequent
     days or with at least one day seperation
 - Legacy-Id: 17605
Note: SVN reference [17289] has been migrated to Git commit a227813

Author: levkowetz

ietf/meeting/management/commands/create_dummy_meeting.py

@@ -0,0 +1,52 @@
+# Copyright The IETF Trust 2020, All Rights Reserved
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-02-11 04:47
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def forward(apps, schema_editor):
+    ConstraintName = apps.get_model("name", "ConstraintName")
+    ConstraintName.objects.create(slug="timerange", desc="", penalty=100000,
+                                  name="Can't meet within timerange")
+    ConstraintName.objects.create(slug="time_relation", desc="", penalty=1000,
+                                  name="Preference for time between sessions")
+    ConstraintName.objects.create(slug="wg_adjacent", desc="", penalty=10000,
+                                  name="Request for adjacent scheduling with another WG")
+
+
+def reverse(apps, schema_editor):
+    ConstraintName = apps.get_model("name", "ConstraintName")
+    ConstraintName.objects.filter(slug__in=["timerange", "time_relation", "wg_adjacent"]).delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('name', '0010_timerangename'),
+        ('meeting', '0026_cancel_107_sessions'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='constraint',
+            name='day',
+        ),
+        migrations.AddField(
+            model_name='constraint',
+            name='time_relation',
+            field=models.CharField(blank=True, choices=[('subsequent-days', 'Schedule the sessions on subsequent days'), ('one-day-seperation', 'Leave at least one free day in between the two sessions')], max_length=200),
+        ),
+        migrations.AddField(
+            model_name='constraint',
+            name='timeranges',
+            field=models.ManyToManyField(to='name.TimerangeName'),
+        ),
+        migrations.AddField(
+            model_name='session',
+            name='joint_with_groups',
+            field=models.ManyToManyField(related_name='sessions_joint_in', to='group.Group'),
+        ),
+        migrations.RunPython(forward, reverse),
+    ]

ietf/meeting/migrations/0027_add_constraint_options_and_joint_groups.py

@@ -28,7 +28,7 @@
 from ietf.doc.models import Document
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_materials
-from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName, ImportantDateName
+from ietf.name.models import MeetingTypeName, TimeSlotTypeName, SessionStatusName, ConstraintName, RoomResourceName, ImportantDateName, TimerangeName
 from ietf.person.models import Person
 from ietf.utils.decorators import memoize
 from ietf.utils.storage import NoLocationMigrationFileSystemStorage
@@ -815,27 +815,42 @@ def slug(self):
 class Constraint(models.Model):
     """
     Specifies a constraint on the scheduling.
-    One type (name=conflic?) of constraint is between source WG and target WG,
-           e.g. some kind of conflict.
-    Another type (name=bethere) of constraint is between source WG and
-           availability of a particular Person, usually an AD.
-    A third type (name=avoidday) of constraint is between source WG and
-           a particular day of the week, specified in day.
+    Available types are:
+    - conflict/conflic2/conflic3: a conflict between source and target WG/session,
+      with varying priority. The first is used for a chair conflict, the second for
+      technology overlap, third for key person conflict
+    - bethere: a constraint between source WG and a particular person
+    - timerange: can not meet during these times
+    - time_relation: preference for a time difference between sessions
+    - wg_adjacent: request for source WG to be adjacent (directly before or after,
+      no breaks, same room) the target WG
     """
+    TIME_RELATION_CHOICES = (
+        ('subsequent-days', 'Schedule the sessions on subsequent days'),
+        ('one-day-seperation', 'Leave at least one free day in between the two sessions'),
+    )
     meeting = ForeignKey(Meeting)
     source = ForeignKey(Group, related_name="constraint_source_set")
     target = ForeignKey(Group, related_name="constraint_target_set", null=True)
     person = ForeignKey(Person, null=True, blank=True)
-    day    = models.DateTimeField(null=True, blank=True)
     name   = ForeignKey(ConstraintName)
+    time_relation = models.CharField(max_length=200, choices=TIME_RELATION_CHOICES, blank=True)
+    timeranges = models.ManyToManyField(TimerangeName)
 
     active_status = None
 
     def __str__(self):
         return u"%s %s target=%s person=%s" % (self.source, self.name.name.lower(), self.target, self.person)
 
     def brief_display(self):
-        if self.target and self.person:
+        if self.name.slug == "wg_adjacent":
+            return "Adjacent with %s" % self.target.acronym
+        elif self.name.slug == "time_relation":
+            return self.get_time_relation_display()
+        elif self.name.slug == "timerange":
+            timeranges_str = ", ".join([t.desc for t in self.timeranges.all()])
+            return "Can't meet %s" % timeranges_str
+        elif self.target and self.person:
             return "%s ; %s" % (self.target.acronym, self.person)
         elif self.target and not self.person:
             return "%s " % (self.target.acronym)
@@ -857,6 +872,13 @@ def json_dict(self, host_scheme):
         if self.target is not None:
             ct1['target_href'] = urljoin(host_scheme, self.target.json_url())
         ct1['meeting_href'] = urljoin(host_scheme, self.meeting.json_url())
+        if self.time_relation:
+            ct1['time_relation'] = self.time_relation
+            ct1['time_relation_display'] = self.get_time_relation_display()
+        if self.timeranges.count():
+            ct1['timeranges_cant_meet'] = [t.slug for t in self.timeranges.all()]
+            timeranges_str = ", ".join([t.desc for t in self.timeranges.all()])
+            ct1['timeranges_display'] = "Can't meet %s" % timeranges_str
         return ct1
 
 
@@ -890,6 +912,7 @@ class Session(models.Model):
     short = models.CharField(blank=True, max_length=32, help_text="Short version of 'name' above, for use in filenames.")
     type = ForeignKey(TimeSlotTypeName)
     group = ForeignKey(Group)    # The group type historically determined the session type.  BOFs also need to be added as a group. Note that not all meeting requests have a natural group to associate with.
+    joint_with_groups = models.ManyToManyField(Group, related_name='sessions_joint_in')
     attendees = models.IntegerField(null=True, blank=True)
     agenda_note = models.CharField(blank=True, max_length=255)
     requested_duration = models.DurationField(default=datetime.timedelta(0))
@@ -1013,6 +1036,9 @@ def can_manage_materials(self, user):
 
     def is_material_submission_cutoff(self):
         return datetime.date.today() > self.meeting.get_submission_correction_date()
+    
+    def joint_with_groups_acronyms(self):
+        return [group.acronym for group in self.joint_with_groups.all()]
 
     def __str__(self):
         if self.meeting.type_id == "interim":
@@ -1108,6 +1134,7 @@ def json_dict(self, host_scheme):
         sess1['bof']            = str(self.group.is_bof())
         sess1['agenda_note']    = self.agenda_note
         sess1['attendees']      = str(self.attendees)
+        sess1['joint_with_groups'] = self.joint_with_groups_acronyms()
 
         # fish out scheduling information - eventually, we should pick
         # this out in the caller instead

ietf/meeting/models.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -12,6 +12,7 @@
 
 import debug                            # pyflakes:ignore
 
+from ietf.name.models import TimerangeName
 from ietf.group.models import Group
 from ietf.meeting.models import Schedule, TimeSlot, Session, SchedTimeSessAssignment, Meeting, Constraint
 from ietf.meeting.test_data import make_meeting_test_data
@@ -119,10 +120,23 @@ def test_constraints_json(self):
                                              person=Person.objects.get(user__username="ad"),
                                              name_id="bethere")
 
+        c_adjacent = Constraint.objects.create(meeting=meeting, source=session.group,
+                                              target=Group.objects.get(acronym="irg"),
+                                              name_id="wg_adjacent")
+
+        c_time_relation = Constraint.objects.create(meeting=meeting, source=session.group,
+                                                    time_relation='subsequent-days',
+                                                    name_id="time_relation")
+
+        c_timerange = Constraint.objects.create(meeting=meeting, source=session.group,
+                                                name_id="timerange")
+        c_timerange.timeranges.set(TimerangeName.objects.filter(slug__startswith='monday'))
+
         r = self.client.get(urlreverse("ietf.meeting.ajax.session_constraints", kwargs=dict(num=meeting.number, sessionid=session.pk)))
         self.assertEqual(r.status_code, 200)
         constraints = r.json()
-        self.assertEqual(set([c_ames.pk, c_person.pk]), set(c["constraint_id"] for c in constraints))
+        expected_keys = set([c_ames.pk, c_person.pk, c_adjacent.pk, c_time_relation.pk, c_timerange.pk])
+        self.assertEqual(expected_keys, set(c["constraint_id"] for c in constraints))
 
     def test_meeting_json(self):
         meeting = make_meeting_test_data()

ietf/meeting/tests_api.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright The IETF Trust 2010-2020, All Rights Reserved
 from django.contrib import admin
 
 from ietf.name.models import (
@@ -10,7 +10,7 @@
     LiaisonStatementState, LiaisonStatementTagName, MeetingTypeName, NomineePositionStateName,
     ReviewRequestStateName, ReviewResultName, ReviewTypeName, RoleName, RoomResourceName,
     SessionStatusName, StdLevelName, StreamName, TimeSlotTypeName, TopicAudienceName,
-    DocUrlTagName, ReviewAssignmentStateName, ReviewerQueuePolicyName)
+    DocUrlTagName, ReviewAssignmentStateName, ReviewerQueuePolicyName, TimerangeName)
 
 from ietf.stats.models import CountryAlias
 
@@ -79,5 +79,6 @@ class ImportantDateNameAdmin(NameAdmin):
 admin.site.register(StdLevelName, NameAdmin)
 admin.site.register(StreamName, NameAdmin)
 admin.site.register(TimeSlotTypeName, NameAdmin)
+admin.site.register(TimerangeName, NameAdmin)
 admin.site.register(TopicAudienceName, NameAdmin)
 admin.site.register(DocUrlTagName, NameAdmin)