Rebase automatic-scheduler-2 onto 7.3.2.dev0

 - Legacy-Id: 17990

Author: Sasha Romijn

ietf/group/migrations/0024_add_meeting_seen_as_area.py

@@ -0,0 +1,37 @@
+# Copyright The IETF Trust 2020', 'All Rights Reserved
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.27 on 2020-02-12 07:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+def forward(apps, schema_editor):
+    Group = apps.get_model('group', 'Group')
+    initial_area_groups = ['dispatch', 'gendispatch', 'intarea', 'opsarea', 'opsawg', 'rtgarea', 'rtgwg', 'saag', 'secdispatch', 'tsvarea', 'irtfopen']
+    Group.objects.filter(acronym__in=initial_area_groups).update(meeting_seen_as_area=True)
+    
+
+def reverse(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('group', '0023_use_milestone_dates_default_to_true'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='group',
+            name='meeting_seen_as_area',
+            field=models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG'),
+        ),
+        migrations.AddField(
+            model_name='grouphistory',
+            name='meeting_seen_as_area',
+            field=models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG'),
+        ),
+        migrations.RunPython(forward, reverse),
+    ]

ietf/group/models.py

@@ -39,7 +39,8 @@ class GroupInfo(models.Model):
     list_subscribe = models.CharField(max_length=255, blank=True)
     list_archive = models.CharField(max_length=255, blank=True)
     comments = models.TextField(blank=True)
-
+    meeting_seen_as_area = models.BooleanField(default=False, help_text='For meeting scheduling, should be considered an area meeting, even if the type is WG')
+    
     unused_states = models.ManyToManyField('doc.State', help_text="Document states that have been disabled for the group.", blank=True)
     unused_tags = models.ManyToManyField(DocTagName, help_text="Document tags that have been disabled for the group.", blank=True)
 

ietf/meeting/admin.py

@@ -6,7 +6,7 @@
 
 from ietf.meeting.models import (Meeting, Room, Session, TimeSlot, Constraint, Schedule,
     SchedTimeSessAssignment, ResourceAssociation, FloorPlan, UrlResource,
-    SessionPresentation, ImportantDate, SlideSubmission, SchedulingEvent)
+    SessionPresentation, ImportantDate, SlideSubmission, SchedulingEvent, BusinessConstraint)
 
 
 class UrlResourceAdmin(admin.ModelAdmin):
@@ -65,6 +65,18 @@ def session_desc(self, instance):
 admin.site.register(TimeSlot, TimeSlotAdmin)
 
 
+class BusinessConstraintAdmin(admin.ModelAdmin):
+    list_display = ["slug", "name", "penalty"]
+    search_fields = ["slug", "name"]
+
+    def name_lower(self, instance):
+        return instance.name.name.lower()
+
+    name_lower.short_description = "businessconstraint" # type: ignore # https://github.com/python/mypy/issues/2087
+
+admin.site.register(BusinessConstraint, BusinessConstraintAdmin)
+
+
 class ConstraintAdmin(admin.ModelAdmin):
     list_display = ["meeting", "source", "name_lower", "target"]
     raw_id_fields = ["meeting", "source", "target"]

ietf/meeting/management/commands/create_dummy_meeting.py

@@ -1565,7 +1565,7 @@ def handle(self, *args, **options):
                 c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=115214, )  # Benjamin Kaduk
                 c = Constraint.objects.create(meeting=m, source=s.group, name_id='bethere', person_id=105815, )  # Roman Danyliw
                 c = Constraint.objects.create(meeting=m, source=s.group, name_id='timerange')
-                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='thursday-early-afternoon'))
+                c.timeranges.set(TimerangeName.objects.exclude(slug__startswith='thursday-afternoon-early'))
 
                 ## session for mpls ##
                 s = Session.objects.create(