Fixed a simple error on open status filtering
parent
2accc37ce8
commit
eee8b80f9e
|
@ -1,6 +1,7 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
from django.db.models import Q, Count
|
from django.db.models import Q, Count
|
||||||
|
from greenmine.projects.models import IssueStatus
|
||||||
import datetime
|
import datetime
|
||||||
import copy
|
import copy
|
||||||
|
|
||||||
|
@ -142,9 +143,10 @@ def get_stats_for_project_issues(project):
|
||||||
project_issues_stats['last_four_weeks_days']['by_open_closed']['closed'].append(
|
project_issues_stats['last_four_weeks_days']['by_open_closed']['closed'].append(
|
||||||
project.issues.filter(finished_date__gte=day, finished_date__lt=next_day).count()
|
project.issues.filter(finished_date__gte=day, finished_date__lt=next_day).count()
|
||||||
)
|
)
|
||||||
open_this_day = project.issues.filter(created_date__lt=next_day)
|
list_of_closed_status_ids = IssueStatus.objects.filter(is_closed=True).values('id')
|
||||||
|
open_this_day = project.issues.filter(status_id__in=list_of_closed_status_ids)
|
||||||
|
open_this_day = open_this_day.filter(created_date__lt=next_day)
|
||||||
open_this_day = open_this_day.filter(Q(finished_date__gt=day) | Q(finished_date__isnull=True))
|
open_this_day = open_this_day.filter(Q(finished_date__gt=day) | Q(finished_date__isnull=True))
|
||||||
open_this_day = open_this_day.filter(status__is_closed=False)
|
|
||||||
for severity in project_issues_stats['last_four_weeks_days']['by_severity']:
|
for severity in project_issues_stats['last_four_weeks_days']['by_severity']:
|
||||||
project_issues_stats['last_four_weeks_days']['by_severity'][severity]['data'].append(
|
project_issues_stats['last_four_weeks_days']['by_severity'][severity]['data'].append(
|
||||||
open_this_day.filter(severity_id=severity).count()
|
open_this_day.filter(severity_id=severity).count()
|
||||||
|
|
Loading…
Reference in New Issue