Merged /branch/iola/meeting-improvement-r16992@17152 from olau@iola.dk:

* Renamed Meeting.agenda to Meeting.schedule together with a bunch of related
   internal things

* Moved Session.status, .requested, and .requested_by to a new SchedulingEvent.

* Turned 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: 17153

Author: levkowetz

ietf/api/views.py

@@ -69,7 +69,7 @@ def get(self, request):
         person = get_object_or_404(self.model, user=request.user)
         expand = ['searchrule', 'documentauthor', 'ad_document_set', 'ad_dochistory_set', 'docevent',
             'ballotpositiondocevent', 'deletedevent', 'email_set', 'groupevent', 'role', 'rolehistory', 'iprdisclosurebase',
-            'iprevent', 'liaisonstatementevent', 'whitelisted', 'schedule', 'constraint', 'session', 'message',
+            'iprevent', 'liaisonstatementevent', 'whitelisted', 'schedule', 'constraint', 'schedulingevent', 'message',
             'sendqueue', 'nominee', 'topicfeedbacklastseen', 'alias', 'email', 'apikeys', 'personevent',
             'reviewersettings', 'reviewsecretarysettings', 'unavailableperiod', 'reviewwish',
             'nextreviewerinteam', 'reviewrequest', 'meetingregistration', 'submissionevent', 'preapproval',

ietf/doc/tests.py

@@ -39,7 +39,7 @@
 from ietf.group.models import Group
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.ipr.factories import HolderIprDisclosureFactory
-from ietf.meeting.models import Meeting, Session, SessionPresentation
+from ietf.meeting.models import Meeting, Session, SessionPresentation, SchedulingEvent
 from ietf.meeting.factories import MeetingFactory, SessionFactory
 from ietf.name.models import SessionStatusName, BallotPositionName
 from ietf.person.models import Person
@@ -712,11 +712,14 @@ def test_document_material(self):
             name = "session-72-mars-1",
             meeting = Meeting.objects.get(number='72'),
             group = Group.objects.get(acronym='mars'),
-            status = SessionStatusName.objects.create(slug='scheduled', name='Scheduled'),
             modified = datetime.datetime.now(),
-            requested_by = Person.objects.get(user__username="marschairman"),
-            type_id = "session",
-            )
+            type_id = 'regular',
+        )
+        SchedulingEvent.objects.create(
+            session=session,
+            status=SessionStatusName.objects.create(slug='scheduled'),
+            by = Person.objects.get(user__username="marschairman"),
+        )
         SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))

ietf/doc/tests_material.py

@@ -20,7 +20,7 @@
 from ietf.group.factories import RoleFactory
 from ietf.group.models import Group
 from ietf.meeting.factories import MeetingFactory
-from ietf.meeting.models import Meeting, Session, SessionPresentation
+from ietf.meeting.models import Meeting, Session, SessionPresentation, SchedulingEvent
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
@@ -158,11 +158,14 @@ def test_revise(self):
             name = "session-42-mars-1",
             meeting = Meeting.objects.get(number='42'),
             group = Group.objects.get(acronym='mars'),
-            status = SessionStatusName.objects.create(slug='scheduled', name='Scheduled'),
             modified = datetime.datetime.now(),
-            requested_by = Person.objects.get(user__username="marschairman"),
-            type_id="session",
-            )
+            type_id='regular',
+        )
+        SchedulingEvent.objects.create(
+            session=session,
+            status=SessionStatusName.objects.create(slug='scheduled'),
+            by = Person.objects.get(user__username="marschairman"),
+        )
         SessionPresentation.objects.create(session=session, document=doc, rev=doc.rev)
 
         url = urlreverse('ietf.doc.views_material.edit_material', kwargs=dict(name=doc.name, action="revise"))

ietf/doc/views_doc.py

@@ -74,7 +74,7 @@
 from ietf.doc.mails import email_comment
 from ietf.mailtrigger.utils import gather_relevant_expansions
 from ietf.meeting.models import Session
-from ietf.meeting.utils import group_sessions, get_upcoming_manageable_sessions, sort_sessions
+from ietf.meeting.utils import group_sessions, get_upcoming_manageable_sessions, sort_sessions, add_event_info_to_session_qs
 from ietf.review.models import ReviewAssignment
 from ietf.review.utils import can_request_review_of_doc, review_assignments_to_list_for_docs
 from ietf.review.utils import no_review_from_teams_on_doc
@@ -1353,9 +1353,9 @@ def add_sessionpresentation(request,name):
 def all_presentations(request, name):
     doc = get_object_or_404(Document, name=name)
 
-
-    sessions = doc.session_set.filter(status__in=['sched','schedw','appr','canceled'],
-                                      type__in=['session','plenary','other'])
+    sessions = add_event_info_to_session_qs(
+        doc.session_set.filter(type__in=['regular','plenary','other'])
+    ).filter(current_status__in=['sched','schedw','appr','canceled'])
 
     future, in_progress, recent, past = group_sessions(sessions)
 

ietf/group/models.py

@@ -70,7 +70,7 @@ def interim_approval_roles(self):
         return list(set([ role for role in self.parent.role_set.filter(name__in=['ad', 'chair']) ]))
 
     def is_bof(self):
-        return (self.state.slug in ["bof", "bof-conc"])
+        return self.state_id in ["bof", "bof-conc"]
 
     class Meta:
         abstract = True

ietf/group/views.py

@@ -88,7 +88,7 @@
 from ietf.ietfauth.utils import has_role, is_authorized_in_group
 from ietf.mailtrigger.utils import gather_relevant_expansions
 from ietf.meeting.helpers import get_meeting
-from ietf.meeting.utils import group_sessions
+from ietf.meeting.utils import group_sessions, add_event_info_to_session_qs
 from ietf.name.models import GroupTypeName, StreamName
 from ietf.person.models import Email
 from ietf.review.models import (ReviewRequest, ReviewAssignment, ReviewerSettings, 
@@ -750,9 +750,14 @@ def meetings(request, acronym=None, group_type=None):
 
     four_years_ago = datetime.datetime.now()-datetime.timedelta(days=4*365)
 
-    sessions = group.session_set.filter(status__in=['sched','schedw','appr','canceled'],
-                                        meeting__date__gt=four_years_ago,
-                                        type__in=['session','plenary','other'])
+    sessions = add_event_info_to_session_qs(
+        group.session_set.filter(
+            meeting__date__gt=four_years_ago,
+            type__in=['regular','plenary','other']
+        )
+    ).filter(
+        current_status__in=['sched','schedw','appr','canceled'],
+    )
 
     future, in_progress, recent, past = group_sessions(sessions)
 

ietf/mailtrigger/models.py

@@ -356,7 +356,10 @@ def gather_session_requester(self, **kwargs):
         addrs=[]
         if 'session' in kwargs:
             session = kwargs['session']
-            addrs.append(session.requested_by.role_email('chair').address)
+            from ietf.meeting.models import SchedulingEvent
+            first_event = SchedulingEvent.objects.filter(session=session).select_related('by').order_by('time', 'id').first()
+            if first_event and first_event.status_id in ['appw', 'schedw']:
+                addrs.append(first_event.by.role_email('chair').address)
         return addrs
 
     def gather_review_team_ads(self, **kwargs):

ietf/meeting/admin.py

@@ -8,7 +8,7 @@
 
 from ietf.meeting.models import (Meeting, Room, Session, TimeSlot, Constraint, Schedule,
     SchedTimeSessAssignment, ResourceAssociation, FloorPlan, UrlResource,
-    SessionPresentation, ImportantDate, SlideSubmission, )
+    SessionPresentation, ImportantDate, SlideSubmission, SchedulingEvent)
 
 
 class UrlResourceAdmin(admin.ModelAdmin):
@@ -80,20 +80,51 @@ def name_lower(self, instance):
 
 admin.site.register(Constraint, ConstraintAdmin)
 
+class SchedulingEventInline(admin.TabularInline):
+    model = SchedulingEvent
+    raw_id_fields = ["by"]
+
 class SessionAdmin(admin.ModelAdmin):
-    list_display = ["meeting", "name", "group", "attendees", "requested", "status"]
+    list_display = ["meeting", "name", "group", "attendees", "requested", "current_status"]
     list_filter = ["meeting", ]
-    raw_id_fields = ["meeting", "group", "requested_by", "materials"]
+    raw_id_fields = ["meeting", "group", "materials"]
     search_fields = ["meeting__number", "name", "group__name", "group__acronym", ]
-    ordering = ["-requested"]
-
+    ordering = ["-id"]
+    inlines = [SchedulingEventInline]
+
+
+    def get_queryset(self, request):
+        qs = super(SessionAdmin, self).get_queryset(request)
+        return qs.prefetch_related('schedulingevent_set')
+
+    def current_status(self, instance):
+        events = sorted(instance.schedulingevent_set.all(), key=lambda e: (e.time, e.id))
+        if events:
+            return events[-1].time
+        else:
+            return None
+
+    def requested(self, instance):
+        events = sorted(instance.schedulingevent_set.all(), key=lambda e: (e.time, e.id))
+        if events:
+            return events[0].time
+        else:
+            return None
+        
     def name_lower(self, instance):
         return instance.name.name.lower()
 
     name_lower.short_description = "constraint name" # type: ignore # https://github.com/python/mypy/issues/2087
 
 admin.site.register(Session, SessionAdmin)
 
+class SchedulingEventAdmin(admin.ModelAdmin):
+    list_display = ["session", "status", "time", "by"]
+    raw_id_fields = ["session", "by"]
+    ordering = ["-id"]
+
+admin.site.register(SchedulingEvent, SchedulingEventAdmin)
+
 class ScheduleAdmin(admin.ModelAdmin):
     list_display = ["name", "meeting", "owner", "visible", "public", "badness"]
     list_filter = ["meeting", ]