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

sprint_204_57091

Browse Source
This commit is contained in:
sunjun
2022-06-15 08:09:52 +00:00
parent 32aaa90fd0
commit 43e78a280e
3 changed files with 43 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+11
View File
@@ -1221,6 +1221,15 @@ class product extends control
/* Process product structure. */
$productStats = $this->product->getStats($orderBy, $pager, $browseType, '', 'story', '', $queryID);
$productStructure = $this->product->statisticProgram($productStats);
$productLines = $this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq(0)->orderBy('`order`')->fetchAll();
krsort($productLines);
$programLines = array();
foreach($productLines as $index => $productLine)
{
if(!isset($programLines[$productLine->root])) $programLines[$productLine->root] = array();
$programLines[$productLine->root][$productLine->id] = $productLine->name;
}
$actionURL = $this->createLink('product', 'all', "browseType=bySearch&orderBy=order_asc&queryID=myQueryID");
$this->product->buildProductSearchForm($param, $actionURL);
@@ -1231,6 +1240,8 @@ class product extends control
$this->view->recTotal = count($productStats);
$this->view->productStats = $productStats;
$this->view->productStructure = $productStructure;
$this->view->productLines = $productLines;
$this->view->programLines = $programLines;
$this->view->orderBy = $orderBy;
$this->view->browseType = $browseType;
$this->view->pager = $pager;
module/product/css/all.css
+3
View File
@@ -85,3 +85,6 @@ th.c-actions {width: 60px;}
[lang^='zh-'] th.c-requirement {width: 220px;}
[lang^='zh-'] th.c-story {width: 220px;}
}
#productTableList > tr.row-line.is-nest-child > td.text-left.table-nest-title > span.table-nest-icon.icon:before{content: '\e6f2'; background-color: white; display: inline;}
#productTableList > tr.row-line.no-nest > td.text-left.table-nest-title > span.table-nest-icon.icon:before{content: '\e6f2'; background-color: white; display: inline;}
module/product/view/all.html.php
+29 -1
View File
@@ -86,6 +86,35 @@
$trClass = 'is-top-level table-nest-child text-center';
$trAttrs .= " class='$trClass'";
?>
<?php
if(isset($programLines[$programID]))
{
foreach($programLines[$programID] as $lineID => $lineName)
{
if(!isset($program[$lineID]))
{
$program[$lineID] = array();
$program[$lineID]['product'] = '';
$program[$lineID]['lineName'] = $lineName;
$program[$lineID]['totalRequirements'] = 0;
$program[$lineID]['draftRequirements'] = 0;
$program[$lineID]['activeRequirements'] = 0;
$program[$lineID]['changedRequirements'] = 0;
$program[$lineID]['closedRequirements'] = 0;
$program[$lineID]['totalStories'] = 0;
$program[$lineID]['draftStories'] = 0;
$program[$lineID]['activeStories'] = 0;
$program[$lineID]['changedStories'] = 0;
$program[$lineID]['closedStories'] = 0;
$program[$lineID]['unResolvedBugs'] = 0;
$program[$lineID]['closedBugs'] = 0;
$program[$lineID]['fixedBugs'] = 0;
$program[$lineID]['plans'] = 0;
$program[$lineID]['releases'] = 0;
}
}
}
;?>
<?php if(isset($program['programName']) and $config->systemMode == 'new'):?>
<tr class="row-program" <?php echo $trAttrs;?>>
<?php if($canBatchEdit):?>
@@ -115,7 +144,6 @@
</tr>
<?php unset($program['programName']);?>
<?php endif;?>
<?php foreach($program as $lineID => $line):?>
<?php if(isset($line['lineName'])):?>
<?php $lineNames[] = $line['lineName'];?>