diff --git a/module/product/control.php b/module/product/control.php index 2d3a6291a9..f7bca1b1fc 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -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; diff --git a/module/product/css/all.css b/module/product/css/all.css index 81340e23ba..347cb22388 100644 --- a/module/product/css/all.css +++ b/module/product/css/all.css @@ -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;} diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php index 3abb912eed..c92278be3e 100644 --- a/module/product/view/all.html.php +++ b/module/product/view/all.html.php @@ -86,6 +86,35 @@ $trClass = 'is-top-level table-nest-child text-center'; $trAttrs .= " class='$trClass'"; ?> + $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; + } + } + } + ;?> systemMode == 'new'):?> > @@ -115,7 +144,6 @@ - $line):?>