Merge branch '278-commissielid-sinds-negeert-voorgaande-lidmaatschappen' into 'master'

Display correct initial join date for consecutive committee memberships

Closes #278

See merge request !313

website/activemembers/models.py

@@ -177,6 +177,17 @@ class CommitteeMembership(models.Model, metaclass=ModelTranslateMeta):
         null=True,
     )
 
+    @property
+    def initial_connected_membership(self):
+        """ Find the oldest membership directly connected to the current one"""
+        qs = CommitteeMembership.objects.filter(committee=self.committee,
+                                                member=self.member,
+                                                until=self.since)
+        if qs.count() >= 1:  # should actually only be one; should be unique
+            return qs.first().initial_connected_membership
+        else:
+            return self
+
     @property
     def is_active(self):
         """Is this membership currently active"""

website/activemembers/views.py

@@ -22,13 +22,15 @@ def committee_detail(request, id):
     memberships = (CommitteeMembership
                    .active_memberships
                    .filter(committee=committee)
-                   .prefetch_related('member'))
+                   .prefetch_related('member__committeemembership_set'))
     for membership in memberships:
         member = membership.member
         member.chair = membership.chair
-        member.committee_since = membership.since
+        member.committee_since = membership.initial_connected_membership.since
         members.append(member)  # list comprehension would be more pythonic?
 
+    members.sort(key=lambda x: x.committee_since)
+
     return render(request, 'activemembers/committee_detail.html',
                   {'committee': committee,
                    'members': members})