From d3c3d453f9a2b5dba2c5e97adcc0f256e947bbd4 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 28 Sep 2023 10:27:46 +0800
Subject: [PATCH] * Adjust usage report.

---
 module/screen/model.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/module/screen/model.php b/module/screen/model.php
index 966492c662..42b005bcdd 100644
--- a/module/screen/model.php
+++ b/module/screen/model.php
@@ -1753,6 +1753,7 @@ class screenModel extends model
             $row->month         = $month;
             $row->totalAccount  = count($teamMemberList);
             $row->activeAccount = count($activeUser);
+            $row->ratio         = number_format(($row->activeAccount/$row->totalAccount) * 100, 2) . '%';
 
             $dataset[] = $row;
         }
@@ -1817,21 +1818,21 @@ class screenModel extends model
      */
     public function getProjectTaskTable($year, $month, $projectList)
     {
-        $contributeTaskActions = $this->dao->select('distinct project, actor')->from(TABLE_ACTION)
+        $createdTaskActions = $this->dao->select('distinct project, actor')->from(TABLE_ACTION)
             ->where('objectType')->eq('task')
-            ->andWhere('action')->in('opened,closed,finished,canceled,assigned')
+            ->andWhere('action')->eq('opened')
             ->andWhere('year(date)')->eq($year)
             ->andWhere('month(date)')->eq($month)
             ->fetchAll();
 
-        $actionGroups = array();
-        foreach($contributeTaskActions as $projectAccount)
+        $createdTaskActors = array();
+        foreach($createdTaskActions as $projectAccount)
         {
             $projectID = $projectAccount->project;
             $account   = $projectAccount->actor;
 
-            if(!isset($actionGroups[$projectID])) $actionGroups[$projectID] = array();
-            $actionGroups[$projectID][] = $account;
+            if(!isset($createdTaskActors[$projectID])) $createdTaskActors[$projectID] = array();
+            $createdTaskActors[$projectID][] = $account;
         }
 
         $dataset = array();
@@ -1855,7 +1856,7 @@ class screenModel extends model
             $row->month         = $month;
             $row->createdTasks  = count(array_unique($createdTaskList));
             $row->finishedTasks = count(array_unique($finishedTaskList));
-            $row->contributors  = count($actionGroups[$projectID]);
+            $row->contributors  = count($createdTaskActors[$projectID]);
 
             $dataset[] = $row;
         }