From 6229ca27d5d5e0b7102cc3fe672212ad86b9122f Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 14 Nov 2016 15:35:53 +0100 Subject: [PATCH] Regroup persons by parent status --- .../core/templatetags/organization_tags.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/organization/core/templatetags/organization_tags.py b/app/organization/core/templatetags/organization_tags.py index bbf6718b..01fefc15 100644 --- 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 -- 2.39.5