Merge branch ztflow-wangzemei-dev/bug-64264#wangzemei of zentao/zentaopms (#10533)
This commit is contained in:
@@ -28,7 +28,7 @@ class count_of_tested_story extends baseCalc
|
||||
|
||||
public function calculate($row)
|
||||
{
|
||||
if(strpos(',tested,verified,rejected,delivering,delivered,released,closed', ",$row->stage,") !== false || $row->closedReason == 'done') $this->result ++;
|
||||
if(strpos(',tested,verified,delivering,delivered,released,', ",$row->stage,") !== false || $row->closedReason == 'done') $this->result ++;
|
||||
}
|
||||
|
||||
public function getResult($options = array())
|
||||
|
||||
@@ -31,7 +31,7 @@ class scale_of_tested_story extends baseCalc
|
||||
if($row->isParent == '1') return false;
|
||||
if(empty($row->estimate)) return null;
|
||||
|
||||
if(strpos(',tested,verified,rejected,delivering,delivered,released,closed', ",$row->stage,") !== false || $row->closedReason == 'done') $this->result += $row->estimate;
|
||||
if(strpos(',tested,verified,delivering,delivered,released', ",$row->stage,") !== false || $row->closedReason == 'done') $this->result += $row->estimate;
|
||||
}
|
||||
|
||||
public function getResult($options = array())
|
||||
|
||||
Reference in New Issue
Block a user