diff --git a/module/metric/calc/execution/rate/rate_of_developed_story_in_execution.php b/module/metric/calc/execution/rate/rate_of_developed_story_in_execution.php index 6a6049770c..4fecb85102 100755 --- a/module/metric/calc/execution/rate/rate_of_developed_story_in_execution.php +++ b/module/metric/calc/execution/rate/rate_of_developed_story_in_execution.php @@ -39,7 +39,7 @@ class rate_of_developed_story_in_execution extends baseCalc $this->result[$execution]['all'] = 0; } - if(!in_array($stage, array('developed', 'testing', 'tested', 'verified', 'released')) && $closedReason == 'done') $this->result[$execution]['developed'] += 1; + if(!in_array($stage, array('developed', 'testing', 'tested', 'verified', 'delivering', 'delivered', 'released')) && $closedReason == 'done') $this->result[$execution]['developed'] += 1; $this->result[$execution]['all'] += 1; } diff --git a/module/metric/calc/execution/scale/count_of_developed_story_in_execution.php b/module/metric/calc/execution/scale/count_of_developed_story_in_execution.php index 3735a1a2ec..6111665d32 100755 --- a/module/metric/calc/execution/scale/count_of_developed_story_in_execution.php +++ b/module/metric/calc/execution/scale/count_of_developed_story_in_execution.php @@ -34,7 +34,7 @@ class count_of_developed_story_in_execution extends baseCalc if(!isset($this->result[$execution])) $this->result[$execution] = 0; - if(in_array($stage, array('developed', 'testing', 'tested', 'verified', 'delivering', 'delivered', 'released'))) $this->result[$execution] += 1; + if(in_array($stage, array('developed', 'testing', 'tested', 'verified', 'rejected', 'delivering', 'delivered', 'released'))) $this->result[$execution] += 1; if($closedReason == 'done') $this->result[$execution] += 1; } diff --git a/module/metric/calc/execution/scale/count_of_verified_story_in_execution.php b/module/metric/calc/execution/scale/count_of_verified_story_in_execution.php index 8e371914df..cf285dfb9c 100755 --- a/module/metric/calc/execution/scale/count_of_verified_story_in_execution.php +++ b/module/metric/calc/execution/scale/count_of_verified_story_in_execution.php @@ -34,7 +34,7 @@ class count_of_verified_story_in_execution extends baseCalc if(!isset($this->result[$execution])) $this->result[$execution] = 0; - if(in_array($stage, array('verified', 'delivering', 'delivered', 'released'))) $this->result[$execution] += 1; + if(in_array($stage, array('verified', 'rejected', 'delivering', 'delivered', 'released'))) $this->result[$execution] += 1; if($closedReason == 'done') $this->result[$execution] += 1; } diff --git a/module/metric/calc/execution/scale/scale_of_verified_story_in_execution.php b/module/metric/calc/execution/scale/scale_of_verified_story_in_execution.php index cc7cf45db2..8000afbd8d 100755 --- a/module/metric/calc/execution/scale/scale_of_verified_story_in_execution.php +++ b/module/metric/calc/execution/scale/scale_of_verified_story_in_execution.php @@ -31,7 +31,7 @@ class scale_of_verified_story_in_execution extends baseCalc if($row->isParent == '1') return false; if(empty($row->estimate)) return null; - if(in_array($row->stage, array('verified', 'delivering', 'delivered', 'released'))) $this->result += $row->estimate; + if(in_array($row->stage, array('verified', 'rejected', 'delivering', 'delivered', 'released'))) $this->result += $row->estimate; if($row->closedReason == 'done') $this->result += $row->estimate; } diff --git a/module/metric/calc/product/scale/count_of_developed_story_in_product.php b/module/metric/calc/product/scale/count_of_developed_story_in_product.php index 529ec837cd..bd37408345 100755 --- a/module/metric/calc/product/scale/count_of_developed_story_in_product.php +++ b/module/metric/calc/product/scale/count_of_developed_story_in_product.php @@ -32,7 +32,7 @@ class count_of_developed_story_in_product extends baseCalc $product = $row->product; $closedReason = $row->closedReason; - if(!in_array($stage, array('developed', 'testing', 'tested', 'verified', 'delivering', 'delivered', 'released')) && $closedReason != 'done') return false; + if(!in_array($stage, array('developed', 'testing', 'tested', 'verified', 'rejected', 'delivering', 'delivered', 'released')) && $closedReason != 'done') return false; if(!isset($this->result[$row->product])) $this->result[$row->product] = 0; $this->result[$row->product] += 1;