* Format output of some metrics.

module/metric/calc/global/scale/count_of_closed_project.php

@@ -37,6 +37,7 @@ class count_of_closed_project extends baseCalc
 
     public function getResult($options = array())
     {
-        return $this->filterByOptions($this->result, $options);
+        $records = array(array('value' => $this->result));
+        return $this->filterByOptions($records, $options);
     }
 }

module/metric/calc/global/scale/count_of_doing_project.php

@@ -37,6 +37,7 @@ class count_of_doing_project extends baseCalc
 
     public function getResult($options = array())
     {
-        return $this->filterByOptions($this->result, $options);
+        $records = array(array('value' => $this->result));
+        return $this->filterByOptions($records, $options);
     }
 }

module/metric/calc/global/scale/count_of_project.php

@@ -36,6 +36,7 @@ class count_of_project extends baseCalc
 
     public function getResult($options = array())
     {
-        return $this->filterByOptions($this->result, $options);
+        $records = array(array('value' => $this->result));
+        return $this->filterByOptions($records, $options);
     }
 }

module/metric/calc/global/scale/count_of_suspended_project.php

@@ -37,6 +37,7 @@ class count_of_suspended_project extends baseCalc
 
     public function getResult($options = array())
     {
-        return $this->filterByOptions($this->result, $options);
+        $records = array(array('value' => $this->result));
+        return $this->filterByOptions($records, $options);
     }
 }

module/metric/calc/global/scale/count_of_wait_project.php

@@ -37,6 +37,7 @@ class count_of_wait_project extends baseCalc
 
     public function getResult($options = array())
     {
-        return $this->filterByOptions($this->result, $options);
+        $records = array(array('value' => $this->result));
+        return $this->filterByOptions($records, $options);
     }
 }

module/metric/test/calc/global/scale/count_of_closed_project.php

@@ -16,4 +16,4 @@ cid=1
 
 */
 
-r($calc->getResult()) && p('') && e('25'); // 测试全局范围内关闭的项目数
+r($calc->getResult()) && p('0:value') && e('25'); // 测试全局范围内关闭的项目数

module/metric/test/calc/global/scale/count_of_doing_project.php

@@ -16,4 +16,4 @@ cid=1
 
 */
 
-r($calc->getResult()) && p('') && e('25'); // 测试全局范围内进行中项目总数
+r($calc->getResult()) && p('0:value') && e('25'); // 测试全局范围内进行中项目总数

module/metric/test/calc/global/scale/count_of_project.php

@@ -16,4 +16,4 @@ cid=1
 
 */
 
-r($calc->getResult()) && p('') && e('100'); // 测试项目全局范围内项目总数
+r($calc->getResult()) && p('0:value') && e('100'); // 测试项目全局范围内项目总数

module/metric/test/calc/global/scale/count_of_suspended_project.php

@@ -16,4 +16,4 @@ cid=1
 
 */
 
-r($calc->getResult()) && p('') && e('25'); // 测试全局范围内挂起的项目数
+r($calc->getResult()) && p('0:value') && e('25'); // 测试全局范围内挂起的项目数

module/metric/test/calc/global/scale/count_of_unclosed_project.php

@@ -16,4 +16,4 @@ cid=1
 
 */
 
-r($calc->getResult()) && p('') && e('75'); //测试全局范围内未关闭的项目数
+r($calc->getResult()) && p('0:value') && e('75'); //测试全局范围内未关闭的项目数

module/metric/test/calc/global/scale/count_of_wait_project.php

@@ -18,4 +18,4 @@ cid=1
 
 */
 
-r($calc->getResult()) && p('') && e('25'); // 测试全局范围内未开始项目数
+r($calc->getResult()) && p('0:value') && e('25'); // 测试全局范围内未开始项目数