Regroup persons by parent status

diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py
index bbf6718ba7fccf1e92f549b16fb8d29b5c2b470b..01fefc1552ea79694ff4c2212160bc6e504f8882 100644 (file)
--- a/app/organization/core/templatetags/organization_tags.py
+++ b/app/organization/core/templatetags/organization_tags.py
@@ -133,14 +133,19 @@ def app_label_short(obj):
 
 @register.as_tag
 def activity_statuses(*args):
-    return ActivityStatus.objects.filter(display=True)
+    return ActivityStatus.objects.filter(display=True).exclude(parent__isnull=False)
 
 @register.filter
 def get_team_persons(team, status):
     persons = []
-    for activity in status.activities.filter(teams__in=[team], date_to__gte=datetime.date.today()):
-        if not activity.person in persons:
-            persons.append(activity.person)
+    statuses = status.children.all()
+    if not statuses:
+        statuses = [status,]
+    for status in statuses:
+        activities = status.activities.filter(teams__in=[team], date_to__gte=datetime.date.today())
+        for activity in activities:
+            if not activity.person in persons:
+                persons.append(activity.person)
     return persons
 
 @register.filter