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

Merge branch 'feedback_1576' into 'master'

Browse Source 
* Resolve feedback#1576

See merge request easycorp/zentaopms!6530
This commit is contained in:
王怡栋
2022-12-15 06:53:08 +00:00
parent 1fe2f7694c d926fe817d
commit 6fe7f03e7e
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/model.php
+13 -9
View File
@@ -753,11 +753,14 @@ class projectModel extends model
public function getStatData($projectID)
{
$executions = $this->loadModel('execution')->getPairs($projectID);
$storyCount = $this->dao->select('count(t2.story) as storyCount')->from(TABLE_STORY)->alias('t1')
$storyTypeCount = $this->dao->select('count(t2.story) as storyCount,t1.type')->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_PROJECTSTORY)->alias('t2')->on('t1.id = t2.story')
->where('t2.project')->eq($projectID)
->andWhere('t1.deleted')->eq(0)
->fetch('storyCount');
->groupBy('t1.type')
->fetchPairs('type', 'storyCount');
$storyCount = isset($storyTypeCount['story']) ? $storyTypeCount['story'] : 0;
$requirementCount = isset($storyTypeCount['requirement']) ? $storyTypeCount['requirement'] : 0;
$taskCount = $this->dao->select('count(id) as taskCount')->from(TABLE_TASK)->where('execution')->in(array_keys($executions))->andWhere('deleted')->eq(0)->fetch('taskCount');
$bugCount = $this->dao->select('count(id) as bugCount')->from(TABLE_BUG)->where('project')->in($projectID)->andWhere('deleted')->eq(0)->fetch('bugCount');
@@ -773,13 +776,14 @@ class projectModel extends model
->fetch('count');
$statData = new stdclass();
$statData->storyCount = $storyCount;
$statData->taskCount = $taskCount;
$statData->bugCount = $bugCount;
$statData->waitCount = zget($statusPairs, 'wait', 0);
$statData->doingCount = zget($statusPairs, 'doing', 0);
$statData->finishedCount = $finishedCount;
$statData->delayedCount = $delayedCount;
$statData->storyCount = $storyCount;
$statData->requirementCount = $requirementCount;
$statData->taskCount = $taskCount;
$statData->bugCount = $bugCount;
$statData->waitCount = zget($statusPairs, 'wait', 0);
$statData->doingCount = zget($statusPairs, 'doing', 0);
$statData->finishedCount = $finishedCount;
$statData->delayedCount = $delayedCount;
return $statData;
}
module/project/view/view.html.php
+19
View File
@@ -242,6 +242,24 @@
<div class="detail-content">
<table class="table table-data data-basic">
<tbody>
<?php if(empty($project->hasProduct) and !empty($config->URAndSR) and $project->model !== 'kanban' and isset($lang->project->menu->storyGroup)):?>
<tr>
<th><?php echo $lang->story->common;?></th>
<td title="<?php echo $statData->storyCount;?>"><?php echo $statData->storyCount;?></td>
<th><?php echo $lang->requirement->common;?></th>
<td title="<?php echo $statData->requirementCount;?>"><?php echo $statData->requirementCount;?></td>
</tr>
<tr>
<th><?php echo $lang->task->common;?></th>
<td title="<?php echo $statData->taskCount;?>"><?php echo $statData->taskCount;?></td>
<th><?php echo $lang->bug->common;?></th>
<td title="<?php echo $statData->bugCount;?>"><?php echo $statData->bugCount;?></td>
</tr>
<tr>
<th><?php echo $lang->project->budget;?></th>
<td title="<?php echo $project->budget;?>"><?php echo $project->budget;?></td>
</tr>
<?php else:?>
<tr>
<th><?php echo $lang->story->common;?></th>
<td title="<?php echo $statData->storyCount;?>"><?php echo $statData->storyCount;?></td>
@@ -254,6 +272,7 @@
<th><?php echo $lang->project->budget;?></th>
<td title="<?php echo $project->budget;?>"><?php echo $project->budget;?></td>
</tr>
<?php endif;?>
</tbody>
</table>
</div>