Hide timeslots type is disabled plus other schedule editor debugging/improvements. Fixes ietf-tools#3510. Fixes ietf-tools#3430. Commit ready for merge.

 - Legacy-Id: 19878

Author: jennifer-richards

ietf/meeting/forms.py

@@ -662,11 +662,15 @@ class SessionDetailsForm(forms.ModelForm):
 
     def __init__(self, group, *args, **kwargs):
         session_purposes = group.features.session_purposes
-        kwargs.setdefault('initial', {})
-        kwargs['initial'].setdefault(
-            'purpose',
-            session_purposes[0] if len(session_purposes) > 0 else None,
-        )
+        # Default to the first allowed session_purposes. Do not do this if we have an instance,
+        # though, because ModelForm will override instance data with initial data if it gets both.
+        # When we have an instance we want to keep its value.
+        if 'instance' not in kwargs:
+            kwargs.setdefault('initial', {})
+            kwargs['initial'].setdefault(
+                'purpose',
+                session_purposes[0] if len(session_purposes) > 0 else None,
+            )
         super().__init__(*args, **kwargs)
 
         self.fields['type'].widget.attrs.update({
@@ -678,11 +682,11 @@ def __init__(self, group, *args, **kwargs):
         self.fields['purpose'].queryset = SessionPurposeName.objects.filter(pk__in=session_purposes)
         if not group.features.acts_like_wg:
             self.fields['requested_duration'].durations = [datetime.timedelta(minutes=m) for m in range(30, 241, 30)]
-
+        
     class Meta:
         model = Session
         fields = (
-            'name', 'short', 'purpose', 'type', 'requested_duration',
+            'purpose', 'name', 'short', 'type', 'requested_duration',
             'on_agenda', 'remote_instructions', 'attendees', 'comments',
         )
         labels = {'requested_duration': 'Length'}

ietf/meeting/tests_js.py

@@ -541,21 +541,21 @@ def test_past_swap_timeslot_col_buttons(self):
 
         past_swap_ts_buttons = self.driver.find_elements(By.CSS_SELECTOR,
             ','.join(
-                '.swap-timeslot-col[data-start="{}"]'.format(ts.utc_start_time().isoformat()) for ts in past_timeslots
+                '*[data-start="{}"] .swap-timeslot-col'.format(ts.utc_start_time().isoformat()) for ts in past_timeslots
             )
         )
         self.assertEqual(len(past_swap_ts_buttons), len(past_timeslots), 'Missing past swap timeslot col buttons')
 
         future_swap_ts_buttons = self.driver.find_elements(By.CSS_SELECTOR,
             ','.join(
-                '.swap-timeslot-col[data-start="{}"]'.format(ts.utc_start_time().isoformat()) for ts in future_timeslots
+                '*[data-start="{}"] .swap-timeslot-col'.format(ts.utc_start_time().isoformat()) for ts in future_timeslots
             )
         )
         self.assertEqual(len(future_swap_ts_buttons), len(future_timeslots), 'Missing future swap timeslot col buttons')
 
         now_swap_ts_buttons = self.driver.find_elements(By.CSS_SELECTOR,
             ','.join(
-                '.swap-timeslot-col[data-start="{}"]'.format(ts.utc_start_time().isoformat()) for ts in now_timeslots
+                '[data-start="{}"] .swap-timeslot-col'.format(ts.utc_start_time().isoformat()) for ts in now_timeslots
             )
         )
         self.assertEqual(len(now_swap_ts_buttons), len(now_timeslots), 'Missing "now" swap timeslot col buttons')

ietf/meeting/views.py

@@ -536,15 +536,17 @@ def prepare_sessions_for_display(sessions):
         for s in sessions:
             s.requested_by_person = requested_by_lookup.get(s.requested_by)
 
-            s.scheduling_label = "???"
             s.purpose_label = None
-            if (s.purpose.slug in ('none', 'regular')) and s.group:
-                s.scheduling_label = s.group.acronym
-                s.purpose_label = 'BoF' if s.group.is_bof() else s.group.type.name
+            if s.group:
+                if (s.purpose.slug in ('none', 'regular')):
+                    s.scheduling_label = s.group.acronym
+                    s.purpose_label = 'BoF' if s.group.is_bof() else s.group.type.name
+                else:
+                    s.scheduling_label = s.name if s.name else f'??? [{s.group.acronym}]'
+                    s.purpose_label = s.purpose.name
             else:
-                s.purpose_label = s.purpose.name
-                if s.name:
-                    s.scheduling_label = s.name
+                s.scheduling_label = s.name if s.name else '???'
+                s.purpose_label = s.purpose.name    
 
             s.requested_duration_in_hours = round(s.requested_duration.seconds / 60.0 / 60.0, 1)
 

ietf/secr/meetings/forms.py

@@ -190,7 +190,7 @@ class MiscSessionForm(TimeSlotForm):
                      Plenary = IETF''',
         required=False)
     location = forms.ModelChoiceField(queryset=Room.objects, required=False)
-    remote_instructions = forms.CharField(max_length=255)
+    remote_instructions = forms.CharField(max_length=255, required=False)
     show_location = forms.BooleanField(required=False)
 
     def __init__(self,*args,**kwargs):