Turn sessions into regular sessions and non-sessions into misc.

sessions in the UI and code to avoid ambiguity.

This doesn't change the data in the DB except for uses of
TimeSlotTypeName where 'session' is now 'regular'.
 - Legacy-Id: 17128

Author: OleLaursen

ietf/doc/tests.py

@@ -713,7 +713,7 @@ def test_document_material(self):
             meeting = Meeting.objects.get(number='72'),
             group = Group.objects.get(acronym='mars'),
             modified = datetime.datetime.now(),
-            type_id = "session",
+            type_id = 'regular',
         )
         SchedulingEvent.objects.create(
             session=session,

ietf/doc/tests_material.py

@@ -159,7 +159,7 @@ def test_revise(self):
             meeting = Meeting.objects.get(number='42'),
             group = Group.objects.get(acronym='mars'),
             modified = datetime.datetime.now(),
-            type_id="session",
+            type_id='regular',
         )
         SchedulingEvent.objects.create(
             session=session,

ietf/doc/views_doc.py

@@ -1346,7 +1346,7 @@ def all_presentations(request, name):
     doc = get_object_or_404(Document, name=name)
 
     sessions = add_event_info_to_session_qs(
-        doc.session_set.filter(type__in=['session','plenary','other'])
+        doc.session_set.filter(type__in=['regular','plenary','other'])
     ).filter(current_status__in=['sched','schedw','appr','canceled'])
 
     status_names = {n.slug: n.name for n in SessionStatusName.objects.all()}

ietf/group/views.py

@@ -753,7 +753,7 @@ def meetings(request, acronym=None, group_type=None):
     sessions = add_event_info_to_session_qs(
         group.session_set.filter(
             meeting__date__gt=four_years_ago,
-            type__in=['session','plenary','other']
+            type__in=['regular','plenary','other']
         )
     ).filter(
         current_status__in=['sched','schedw','appr','canceled'],

ietf/meeting/ajax.py

@@ -161,8 +161,8 @@ def timeslot_roomurl(request, num=None, roomid=None):
 # no authorization required to list.
 def timeslot_slotlist(request, mtg):
     slots = mtg.timeslot_set.all()
-    # Restrict graphical editing to slots of type 'session' for now
-    slots = slots.filter(type__slug='session')
+    # Restrict graphical editing to slots of type 'regular' for now
+    slots = slots.filter(type__slug='regular')
     json_array=[]
     for slot in slots:
         json_array.append(slot.json_dict(request.build_absolute_uri('/')))
@@ -209,14 +209,14 @@ def timeslot_updslot(request, meeting, slotid):
     slot.save()
 
     # WORKAROUND: Right now, if there are sessions scheduled in this timeslot
-    # when it is marked unavailable (or any other value besides "session") they
+    # when it is marked unavailable (or any other value besides 'regular') they
     # become unreachable from the editing screen. The session is listed in the
     # "unscheduled" block incorrectly, and drag-dropping it onto the a new
     # timeslot produces erroneous results. To avoid this, we will silently
     # unschedule any sessions in the timeslot that has just been made
     # unavailable.
 
-    if slot.type_id != 'session':
+    if slot.type_id != 'regular':
         slot.sessionassignments.all().delete()
 
     # ENDWORKAROUND

ietf/meeting/factories.py

@@ -82,7 +82,7 @@ class Meta:
         model = Session
 
     meeting = factory.SubFactory(MeetingFactory)
-    type_id='session'
+    type_id='regular'
     group = factory.SubFactory(GroupFactory)
 
     @factory.post_generation
@@ -139,7 +139,7 @@ class Meta:
         model = TimeSlot
 
     meeting = factory.SubFactory(MeetingFactory)
-    type_id = 'session'
+    type_id = 'regular'
 
     @factory.post_generation
     def location(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument

ietf/meeting/forms.py

@@ -245,7 +245,7 @@ def save(self, *args, **kwargs):
         never gets called"""
         session = super(InterimSessionModelForm, self).save(commit=kwargs.get('commit', True))
         session.group = self.group
-        session.type_id = 'session'
+        session.type_id = 'regular'
         return session
 
     def save_agenda(self):

ietf/meeting/helpers.py

@@ -73,7 +73,7 @@ def get_areas():
 
 # get list of areas that are referenced.
 def get_area_list_from_sessions(assignments, num):
-    return assignments.filter(timeslot__type = 'Session',
+    return assignments.filter(timeslot__type = 'regular',
                                     session__group__parent__isnull = False).order_by(
         'session__group__parent__acronym').distinct().values_list(
         'session__group__parent__acronym',flat=True)
@@ -82,7 +82,7 @@ def build_all_agenda_slices(meeting):
     time_slices = []
     date_slices = {}
 
-    for ts in meeting.timeslot_set.filter(type__in=['session',]).order_by('time','name'):
+    for ts in meeting.timeslot_set.filter(type__in=['regular',]).order_by('time','name'):
             ymd = ts.time.date()
 
             if ymd not in date_slices and ts.location != None:
@@ -98,7 +98,7 @@ def build_all_agenda_slices(meeting):
 
 def get_all_assignments_from_schedule(schedule):
    ss = schedule.assignments.filter(timeslot__location__isnull = False)
-   ss = ss.filter(session__type__slug='session')
+   ss = ss.filter(session__type__slug='regular')
    ss = ss.order_by('timeslot__time','timeslot__name')
 
    return ss
@@ -107,7 +107,7 @@ def get_modified_from_assignments(assignments):
     return assignments.aggregate(Max('timeslot__modified'))['timeslot__modified__max']
 
 def get_wg_name_list(assignments):
-    return assignments.filter(timeslot__type = 'Session',
+    return assignments.filter(timeslot__type = 'regular',
                                     session__group__isnull = False,
                                     session__group__parent__isnull = False).order_by(
         'session__group__acronym').distinct().values_list(
@@ -631,7 +631,7 @@ def update_interim_session_assignment(form):
     else:
         slot = TimeSlot.objects.create(
             meeting=session.meeting,
-            type_id="session",
+            type_id='regular',
             duration=session.requested_duration,
             time=time)
         SchedTimeSessAssignment.objects.create(

ietf/meeting/migrations/0025_rename_type_session_to_regular.py

@@ -0,0 +1,38 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2019-12-06 11:13
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def rename_session_to_request(apps, schema_editor):
+    Session = apps.get_model('meeting', 'Session')
+    TimeSlot = apps.get_model('meeting', 'TimeSlot')
+    Room = apps.get_model('meeting', 'Room')
+    TimeSlotTypeName = apps.get_model('name', 'TimeSlotTypeName')
+
+    TimeSlotTypeName.objects.create(
+        slug='regular',
+        name='Regular',
+        used=True,
+        order=0,
+    )
+
+    Session.objects.filter(type='session').update(type='regular')
+    TimeSlot.objects.filter(type='session').update(type='regular')
+    Room.session_types.through.objects.filter(timeslottypename='session').update(timeslottypename='regular')
+
+    TimeSlotTypeName.objects.filter(slug='session').delete()
+
+def noop(apps, schema_editor):
+    pass
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('meeting', '0024_auto_20191204_1731'),
+    ]
+
+    operations = [
+        migrations.RunPython(rename_session_to_request, noop),
+    ]

ietf/meeting/models.py

@@ -794,7 +794,7 @@ def slug(self):
                 components.append(g.acronym)
                 components.append(slugify(self.session.name))
 
-            if self.timeslot.type_id in ('session', 'plenary'):
+            if self.timeslot.type_id in ('regular', 'plenary'):
                 if self.timeslot.type_id == "plenary":
                     components.append("1plenary")
                 else: