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

* Adjust count of release.

Browse Source
This commit is contained in:
daitingting
2018-04-23 14:40:03 +08:00
parent d8f448e1bf
commit 4777caa4aa
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+6 -1
View File
@@ -608,7 +608,12 @@ class productModel extends model
/* Get last 5 roadmap. */
$lastKeys = array_slice(array_keys($roadmap), -5);
$lastRoadmap = array();
foreach($lastKeys as $key) $lastRoadmap[$key] = $roadmap[$key];
$lastRoadmap['total'] = 0;
foreach($lastKeys as $key)
{
$lastRoadmap[$key] = $roadmap[$key];
$lastRoadmap['total'] += (count($roadmap[$key], 1) - count($roadmap[$key]));
}
return $lastRoadmap;
}
module/product/view/roadmap.html.php
+3 -3
View File
@@ -12,7 +12,7 @@
?>
<?php include '../../common/view/header.html.php';?>
<div class='main-content' id='mainContent'>
<h2><?php echo $lang->product->iteration;?> <span class="label label-badge label-light"><?php echo sprintf($lang->product->iterationInfo, count($roadmaps, 1) - count($roadmaps));?></span></h2>
<h2><?php echo $lang->product->iteration;?> <span class="label label-badge label-light"><?php echo sprintf($lang->product->iterationInfo, $roadmaps['total']);?></span></h2>
<?php if($product->type != 'normal'):?>
<div class="text-center branch-nav">
<ul class="nav nav-secondary inline-block">
@@ -28,12 +28,12 @@
<div class="tab-pane fade release-paths <?php if($branchKey == 0) echo 'active in';?>" id="tabContent<?php echo $branchKey;?>">
<?php foreach($roadmaps as $year => $yearRoadmaps):?>
<?php if(!isset($yearRoadmaps[$branchKey])) continue;?>
<?php $roadmapData = zget($yearRoadmaps, $branchKey, array());?>
<div class="release-path">
<div class="release-head">
<div class="title text-primary"><?php echo $year . (is_numeric($year) ? $lang->year : '');?></div>
<div class="subtitle"><?php echo sprintf($lang->product->iterationInfo, count($yearRoadmaps, 1) - count($yearRoadmaps));?></div>
<div class="subtitle"><?php echo sprintf($lang->product->iterationInfo, count($roadmapData));?></div>
</div>
<?php $roadmapData = zget($yearRoadmaps, $branchKey, array());?>
<?php $i = 0;?>
<?php foreach($roadmapData as $roadmap):?>
<?php $totalData = count($roadmapData);?>