Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust usage report.

Browse Source
This commit is contained in:
zhouxin
2023-09-28 10:28:14 +08:00
parent 4f019ad178
commit d3c3d453f9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/screen/model.php
+8 -7
View File
@@ -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;
}