Fixing closed points calculation
parent
563088d2bd
commit
cfc72340f8
|
@ -21,6 +21,7 @@ import datetime
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
from taiga.projects.history.models import HistoryEntry
|
from taiga.projects.history.models import HistoryEntry
|
||||||
|
from taiga.projects.userstories.models import RolePoints
|
||||||
|
|
||||||
|
|
||||||
def _get_total_story_points(project):
|
def _get_total_story_points(project):
|
||||||
|
@ -225,10 +226,11 @@ def get_stats_for_project(project):
|
||||||
|
|
||||||
points = project.calculated_points
|
points = project.calculated_points
|
||||||
|
|
||||||
closed_milestone_query = Q(role_points__user_story__milestone__closed=True)
|
closed_points = sum(RolePoints.objects.filter(user_story__project=project).filter(
|
||||||
null_milestone_query = Q(role_points__user_story__milestone__isnull=True)
|
Q(user_story__milestone__closed=True) |
|
||||||
closed_points = sum(project.points.filter(closed_milestone_query|null_milestone_query)\
|
Q(user_story__milestone__isnull=True)
|
||||||
.exclude(value__isnull=True).values_list("value", flat=True))
|
).exclude(points__value__isnull=True).values_list("points__value", flat=True))
|
||||||
|
|
||||||
closed_milestones = project.milestones.filter(closed=True).count()
|
closed_milestones = project.milestones.filter(closed=True).count()
|
||||||
speed = 0
|
speed = 0
|
||||||
if closed_milestones != 0:
|
if closed_milestones != 0:
|
||||||
|
|
Loading…
Reference in New Issue