Commit some files missing from the ChangeStateGroupEvent update

 - Legacy-Id: 3810

Author: OleLaursen

ietf/announcements/views.py

@@ -35,7 +35,7 @@ def nomcom(request):
                                 'regimes' : regimes })
 
 def nomcomREDESIGN(request):
-    from group.models import Group, ChangeStateGroupEvent
+    from group.models import Group, GroupEvent
     from ietf.announcements.models import Message
 
     address_re = re.compile("<.*>")
@@ -45,12 +45,12 @@ def nomcomREDESIGN(request):
     regimes = []
 
     for n in nomcoms:
-        e = n.latest_event(ChangeStateGroupEvent, type="changed_state", state="active")
-        n.start_year = e.time.year if e else 0
+        e = GroupEvent.objects.filter(group=n, type="changed_state", changestategroupevent__state="active").order_by('time')[:1]
+        n.start_year = e[0].time.year if e else 0
         if n.start_year <= 2003:
             continue
-        e = n.latest_event(ChangeStateGroupEvent, type="changed_state", state="conclude")
-        n.end_year = e.time.year if e else ""
+        e = GroupEvent.objects.filter(group=n, type="changed_state", changestategroupevent__state="conclude").order_by('time')[:1]
+        n.end_year = e[0].time.year if e else ""
 
         chair = n.role_set.select_related().get(name="chair")
         announcements = Message.objects.filter(related_groups=n).order_by('-time')

redesign/group/proxy.py

@@ -105,7 +105,7 @@ class IETFWG(Group):
                                       group_type=lambda v: ("type", { 1: "wg" }[int(v)]),
                                       status=lambda v: ("state", { 1: "active" }[int(v)]),
                                       areagroup__area__status=lambda v: ("parent__state", { 1: "active" }[v]),
-                                      start_date__isnull=lambda v: None if v else ("groupevent__changestategroupevent__state__slug__in", ("proposed", "active"))
+                                      start_date__isnull=lambda v: None if v else ("groupevent__changestategroupevent__state__slug", "active"),
                                       ),
                                  always_filter=dict(type__in=("wg", "individ")))
 
@@ -125,8 +125,8 @@ def group_acronym(self):
     #start_date = models.DateField(null=True, blank=True)
     @property
     def start_date(self):
-        e = self.latest_event(ChangeStateGroupEvent, type="changed_state", state="active")
-        return e.time.date() if e else None
+        e = GroupEvent.objects.filter(group=self, type="changed_state", changestategroupevent__state="active").order_by('time')[:1]
+        return e[0].time.date() if e else None
 
     #dormant_date = models.DateField(null=True, blank=True)
     #concluded_date = models.DateField(null=True, blank=True)