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

* code for task #43781.

Browse Source
This commit is contained in:
王怡栋
2021-11-03 13:07:04 +08:00
parent 9fba68e367
commit 420c0ab6d4
2 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/v1/entries/reports.php
+26
View File
@@ -62,6 +62,32 @@ class reportsEntry extends entry
$report['projectOverview'] = $projectOverview;
}
elseif($field == 'radar')
{
$allAccounts = $this->loadModel('user')->getPairs('noletter|noclosed');
$radarData = array('product' => 0, 'execution' => 0, 'devel' => 0, 'qa' => 0, 'other' => 0);
$contributions = $this->report->getUserYearContributions(empty($accounts) ? array_keys($allAccounts) : $accounts, $year);
$annualDataConfig = $this->config->report->annualData;
foreach($contributions as $objectType => $objectContributions)
{
foreach($objectContributions as $actionName => $count)
{
$radarTypes = isset($annualDataConfig['radar'][$objectType][$actionName]) ? $annualDataConfig['radar'][$objectType][$actionName] : array('other');
foreach($radarTypes as $radarType) $radarData[$radarType] += $count;
}
}
$radar = array();
foreach($radarData as $radarType => $total)
{
$radar[$radarType]['code'] = $radarType;
$radar[$radarType]['name'] = $this->lang->report->annualData->radarItems[$radarType];
$radar[$radarType]['total'] = $total;
}
$report['radar'] = array_values($radar);
}
}
return $this->send(200, $report);
module/report/model.php
+36 -16
View File
@@ -567,18 +567,40 @@ class reportModel extends model
*/
public function getUserYearContributions($accounts, $year)
{
$actionGroups = array();
foreach($this->config->report->annualData['contributions'] as $objectType => $actions)
$stmt = $this->dao->select('*')->from(TABLE_ACTION)
->where('LEFT(date, 4)')->eq($year)
->andWhere('objectType')->in(array_keys($this->config->report->annualData['contributions']))
->beginIF($accounts)->andWhere('actor')->in($accounts)->fi()
->orderBy('objectType,objectID,id')
->query();
$filterActions = array();
$deletedObject = array();
while($action = $stmt->fetch())
{
$table = $this->config->objectTables[$objectType];
$actionGroups[$objectType] = $this->dao->select('t1.*')->from(TABLE_ACTION)->alias('t1')
->leftJoin($table)->alias('t2')->on("t1.objectType='$objectType' && t1.objectID=t2.id")
->where('LEFT(t1.date, 4)')->eq($year)
->andWhere('t1.objectType')->eq($objectType)
->andWhere('t1.action')->in(array_keys($actions))
->andWhere('t2.deleted')->eq(0)
->beginIF($accounts)->andWhere('t1.actor')->in($accounts)->fi()
->fetchAll('id');
$objectType = $action->objectType;
$objectID = $action->objectID;
$lowerAction = strtolower($action->action);
if(!isset($this->config->report->annualData['contributions'][$objectType][$lowerAction])) continue;
if($action->action == 'deleted') $deletedObject[$objectType][$objectID] = $objectID;
if($action->action == 'undeleted') unset($deletedObject[$objectType][$objectID]);
$filterActions[$objectType][$objectID][$action->id] = $action;
}
foreach($deletedObject as $objectType => $idList)
{
foreach($idList as $id) unset($filterActions[$objectType][$id]);
}
$actionGroups = array();
foreach($filterActions as $objectType => $objectActions)
{
foreach($objectActions as $objectID => $actions)
{
foreach($actions as $action) $actionGroups[$objectType][$action->id] = $action;
}
}
$contributions = array();
@@ -587,9 +609,7 @@ class reportModel extends model
foreach($actions as $action)
{
$lowerAction = strtolower($action->action);
if(!isset($this->config->report->annualData['contributions'][$objectType][$lowerAction])) continue;
$actionName = $this->config->report->annualData['contributions'][$objectType][$lowerAction];
$actionName = $this->config->report->annualData['contributions'][$objectType][$lowerAction];
$type = ($actionName == 'svnCommit' or $actionName == 'gitCommit') ? 'repo' : $objectType;
if(!isset($contributions[$type][$actionName])) $contributions[$type][$actionName] = 0;
@@ -1030,8 +1050,8 @@ class reportModel extends model
{
$projectStatus = $this->dao->select('t1.id,t1.status')->from(TABLE_PROJECT)->alias('t1')
->leftJoin(TABLE_TEAM)->alias('t2')->on("t1.id=t2.root && t2.type='project'")
->where('t1.type')->eq('project')
->beginIF(!empty($accounts))->where('t2.account')->in($accounts)->fi()
->where('t1.type')->in($this->config->systemMode == 'classic' ? 'sprint,stage' : 'project')
->beginIF(!empty($accounts))->andWhere('t2.account')->in($accounts)->fi()
->fetchPairs('id', 'status');
$statusOverview = array();