Add tests of meeting forms for the new session purpose work and a few other untested parts. Fix a few bugs uncovered. Commit ready for merge.

 - Legacy-Id: 19672

Author: jennifer-richards

ietf/meeting/forms.py

@@ -58,21 +58,18 @@ def duration_string(duration):
     '''Custom duration_string to return HH:MM (no seconds)'''
     days = duration.days
     seconds = duration.seconds
-    microseconds = duration.microseconds
 
     minutes = seconds // 60
-    seconds = seconds % 60
-
     hours = minutes // 60
     minutes = minutes % 60
 
     string = '{:02d}:{:02d}'.format(hours, minutes)
     if days:
         string = '{} '.format(days) + string
-    if microseconds:
-        string += '.{:06d}'.format(microseconds)
 
     return string
+
+
 # -------------------------------------------------
 # Forms
 # -------------------------------------------------
@@ -547,7 +544,11 @@ def prepare_value(self, value):
         return ''
 
     def to_python(self, value):
-        return datetime.timedelta(seconds=round(float(value))) if value not in self.empty_values else None
+        if value in self.empty_values or (isinstance(value, str) and not value.isnumeric()):
+            return None  # treat non-numeric values as empty
+        else:
+            # noinspection PyTypeChecker
+            return datetime.timedelta(seconds=round(float(value)))
 
     def valid_value(self, value):
         return super().valid_value(self.prepare_value(value))
@@ -609,11 +610,15 @@ class Meta:
 
     def clean(self):
         super().clean()
+        # Fill in on_agenda. If this is a new instance or we have changed its purpose, then use
+        # the on_agenda value for the purpose. Otherwise, keep the value of an existing instance (if any)
+        # or leave it blank.
         if 'purpose' in self.cleaned_data and (
-        'purpose' in self.changed_data or self.instance.pk is None
+                self.instance.pk is None or (self.instance.purpose != self.cleaned_data['purpose'])
         ):
             self.cleaned_data['on_agenda'] = self.cleaned_data['purpose'].on_agenda
-
+        elif self.instance.pk is not None:
+            self.cleaned_data['on_agenda'] = self.instance.on_agenda
         return self.cleaned_data
 
     class Media:
@@ -629,10 +634,9 @@ def __init__(self, instance, *args, **kwargs):
         super().__init__(instance=instance, group=instance.group, *args, **kwargs)
 
 
-class SessionDetailsInlineFormset(forms.BaseInlineFormSet):
+class SessionDetailsInlineFormSet(forms.BaseInlineFormSet):
     def __init__(self, group, meeting, queryset=None, *args, **kwargs):
         self._meeting = meeting
-        self.created_instances = []
 
         # Restrict sessions to the meeting and group. The instance
         # property handles one of these for free.
@@ -654,12 +658,6 @@ def save_new(self, form, commit=True):
         form.instance.meeting = self._meeting
         return super().save_new(form, commit)
 
-    def save(self, commit=True):
-        existing_instances = set(form.instance for form in self.forms if form.instance.pk)
-        saved = super().save(commit)
-        self.created_instances = [inst for inst in saved if inst not in existing_instances]
-        return saved
-
     @property
     def forms_to_keep(self):
         """Get the not-deleted forms"""
@@ -669,7 +667,7 @@ def sessiondetailsformset_factory(min_num=1, max_num=3):
     return forms.inlineformset_factory(
         Group,
         Session,
-        formset=SessionDetailsInlineFormset,
+        formset=SessionDetailsInlineFormSet,
         form=SessionDetailsForm,
         can_delete=True,
         can_order=False,

ietf/meeting/templatetags/agenda_custom_tags.py

@@ -72,7 +72,7 @@ def webcal_url(context, viewname, *args, **kwargs):
 @register.simple_tag
 def assignment_display_name(assignment):
     """Get name for an assignment"""
-    if assignment.session.type.slug == 'regular' and assignment.session.historic_group:
+    if assignment.session.type.slug == 'regular' and getattr(assignment.session, 'historic_group', None):
         return assignment.session.historic_group.name
     return assignment.session.name or assignment.timeslot.name