From 1a0b9c90a9577462c3565b6f10fff411c2bb2453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 8 May 2013 11:20:50 +0200 Subject: [PATCH] Fixed calculation of client an team increments --- greenmine/scrum/models.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/greenmine/scrum/models.py b/greenmine/scrum/models.py index 03d81d9c..77c8eec2 100644 --- a/greenmine/scrum/models.py +++ b/greenmine/scrum/models.py @@ -313,8 +313,9 @@ class Milestone(models.Model): @property def client_increment_points(self): user_stories = UserStory.objects.filter( - created_date__gt=self.estimated_start, + created_date__gte=self.estimated_start, created_date__lt=self.estimated_finish, + project_id = self.project_id, client_requirement=True, team_requirement=False ) @@ -324,8 +325,9 @@ class Milestone(models.Model): @property def team_increment_points(self): user_stories = UserStory.objects.filter( - created_date__gt=self.estimated_start, + created_date__gte=self.estimated_start, created_date__lt=self.estimated_finish, + project_id = self.project_id, client_requirement=False, team_requirement=True ) @@ -335,8 +337,9 @@ class Milestone(models.Model): @property def shared_increment_points(self): user_stories = UserStory.objects.filter( - created_date__gt=self.estimated_start, + created_date__gte=self.estimated_start, created_date__lt=self.estimated_finish, + project_id = self.project_id, client_requirement=True, team_requirement=True )