From cfc72340f8535fda549e67b986dfaa6de65a3ac4 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 28 Oct 2015 14:29:44 +0100 Subject: [PATCH] Fixing closed points calculation --- taiga/projects/services/stats.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/taiga/projects/services/stats.py b/taiga/projects/services/stats.py index 70d4cc3f..2b4ec4a1 100644 --- a/taiga/projects/services/stats.py +++ b/taiga/projects/services/stats.py @@ -21,6 +21,7 @@ import datetime import copy from taiga.projects.history.models import HistoryEntry +from taiga.projects.userstories.models import RolePoints def _get_total_story_points(project): @@ -225,10 +226,11 @@ def get_stats_for_project(project): points = project.calculated_points - closed_milestone_query = Q(role_points__user_story__milestone__closed=True) - null_milestone_query = Q(role_points__user_story__milestone__isnull=True) - closed_points = sum(project.points.filter(closed_milestone_query|null_milestone_query)\ - .exclude(value__isnull=True).values_list("value", flat=True)) + closed_points = sum(RolePoints.objects.filter(user_story__project=project).filter( + Q(user_story__milestone__closed=True) | + Q(user_story__milestone__isnull=True) + ).exclude(points__value__isnull=True).values_list("points__value", flat=True)) + closed_milestones = project.milestones.filter(closed=True).count() speed = 0 if closed_milestones != 0: