From 0d9b8d569b6c575202e6b78c2c02e2a5a1d8a61d Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 20 Jul 2023 13:32:50 +0800
Subject: [PATCH] * Format output of some metrics.

---
 module/metric/calc/global/scale/count_of_closed_project.php    | 3 ++-
 module/metric/calc/global/scale/count_of_doing_project.php     | 3 ++-
 module/metric/calc/global/scale/count_of_project.php           | 3 ++-
 module/metric/calc/global/scale/count_of_suspended_project.php | 3 ++-
 module/metric/calc/global/scale/count_of_wait_project.php      | 3 ++-
 .../metric/test/calc/global/scale/count_of_closed_project.php  | 2 +-
 .../metric/test/calc/global/scale/count_of_doing_project.php   | 2 +-
 module/metric/test/calc/global/scale/count_of_project.php      | 2 +-
 .../test/calc/global/scale/count_of_suspended_project.php      | 2 +-
 .../test/calc/global/scale/count_of_unclosed_project.php       | 2 +-
 module/metric/test/calc/global/scale/count_of_wait_project.php | 2 +-
 11 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/module/metric/calc/global/scale/count_of_closed_project.php b/module/metric/calc/global/scale/count_of_closed_project.php
index c267213eaf..b1d0f780e0 100644
--- a/module/metric/calc/global/scale/count_of_closed_project.php
+++ b/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);
     }
 }
diff --git a/module/metric/calc/global/scale/count_of_doing_project.php b/module/metric/calc/global/scale/count_of_doing_project.php
index abde921e39..3fc2153f6b 100644
--- a/module/metric/calc/global/scale/count_of_doing_project.php
+++ b/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);
     }
 }
diff --git a/module/metric/calc/global/scale/count_of_project.php b/module/metric/calc/global/scale/count_of_project.php
index db7ed555e3..3f3cee0fc7 100644
--- a/module/metric/calc/global/scale/count_of_project.php
+++ b/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);
     }
 }
diff --git a/module/metric/calc/global/scale/count_of_suspended_project.php b/module/metric/calc/global/scale/count_of_suspended_project.php
index 99cb84f03d..2532787292 100644
--- a/module/metric/calc/global/scale/count_of_suspended_project.php
+++ b/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);
     }
 }
diff --git a/module/metric/calc/global/scale/count_of_wait_project.php b/module/metric/calc/global/scale/count_of_wait_project.php
index a646db2872..33bd89ddb7 100644
--- a/module/metric/calc/global/scale/count_of_wait_project.php
+++ b/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);
     }
 }
diff --git a/module/metric/test/calc/global/scale/count_of_closed_project.php b/module/metric/test/calc/global/scale/count_of_closed_project.php
index 0cbba9bddd..d9f6c2211d 100755
--- a/module/metric/test/calc/global/scale/count_of_closed_project.php
+++ b/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'); // 测试全局范围内关闭的项目数
diff --git a/module/metric/test/calc/global/scale/count_of_doing_project.php b/module/metric/test/calc/global/scale/count_of_doing_project.php
index ea496e1071..08145cd615 100755
--- a/module/metric/test/calc/global/scale/count_of_doing_project.php
+++ b/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'); // 测试全局范围内进行中项目总数
diff --git a/module/metric/test/calc/global/scale/count_of_project.php b/module/metric/test/calc/global/scale/count_of_project.php
index 5bde5f7ac1..c5d140e329 100755
--- a/module/metric/test/calc/global/scale/count_of_project.php
+++ b/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'); // 测试项目全局范围内项目总数
diff --git a/module/metric/test/calc/global/scale/count_of_suspended_project.php b/module/metric/test/calc/global/scale/count_of_suspended_project.php
index 0f66ce594d..b5be501468 100755
--- a/module/metric/test/calc/global/scale/count_of_suspended_project.php
+++ b/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'); // 测试全局范围内挂起的项目数
diff --git a/module/metric/test/calc/global/scale/count_of_unclosed_project.php b/module/metric/test/calc/global/scale/count_of_unclosed_project.php
index 69514a999c..e4c32c0966 100755
--- a/module/metric/test/calc/global/scale/count_of_unclosed_project.php
+++ b/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'); //测试全局范围内未关闭的项目数
diff --git a/module/metric/test/calc/global/scale/count_of_wait_project.php b/module/metric/test/calc/global/scale/count_of_wait_project.php
index 0c8f117c21..db8df62ced 100755
--- a/module/metric/test/calc/global/scale/count_of_wait_project.php
+++ b/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'); // 测试全局范围内未开始项目数