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

* Group roadmap.

Browse Source
This commit is contained in:
daitingting
2018-04-23 17:30:50 +08:00
parent 6731bbe3f0
commit fa6c4fdfb6
2 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/model.php
+36 -8
View File
@@ -590,29 +590,57 @@ class productModel extends model
$plans = $this->loadModel('productplan')->getList($productID, $branch);
$releases = $this->loadModel('release')->getList($productID, $branch);
$roadmap = array();
foreach($plans as $plan)
{
if($plan->end != '0000-00-00' and strtotime($plan->end) - time() <= 0) continue;
$year = substr($plan->end, 0, 4);
$roadmap[$year][$plan->branch][] = $plan;
}
foreach($releases as $release)
{
$year = substr($release->date, 0, 4);
$roadmap[$year][$release->branch][] = $release;
}
foreach($plans as $plan)
krsort($roadmap);
$groupRoadmap = array();
foreach($roadmap as $year => $branchRoadmaps)
{
if($plan->end != '0000-00-00' and strtotime($plan->end) - time() <= 0) continue;
$year = $plan->end == '2030-01-01' ? $this->lang->productplan->future : substr($plan->end, 0, 4);
$roadmap[$year][$plan->branch][] = $plan;
foreach($branchRoadmaps as $branch => $roadmaps)
{
$totalData = count($roadmaps);
$rows = ceil($totalData / 8);
$maxPerRow = ceil($totalData / $rows);
$j = 1;
for($i = 0; $i < $totalData; $i += $maxPerRow)
{
$groupRoadmap[$year][$branch][$j] = array_slice($roadmaps, $i, $maxPerRow);
krsort($groupRoadmap[$year][$branch][$j]);
$j++;
}
}
}
ksort($roadmap);
/* Get last 5 roadmap. */
$lastKeys = array_slice(array_keys($roadmap), -5);
$lastKeys = array_slice(array_keys($groupRoadmap), -5);
$lastRoadmap = array();
$lastRoadmap['total'] = 0;
foreach($lastKeys as $key)
{
$lastRoadmap[$key] = $roadmap[$key];
$lastRoadmap['total'] += (count($roadmap[$key], 1) - count($roadmap[$key]));
if($key == '2030')
{
$lastRoadmap[$this->lang->productplan->future] = $groupRoadmap[$key];
}
else
{
$lastRoadmap[$key] = $groupRoadmap[$key];
}
foreach($groupRoadmap[$key] as $branchRoadmaps) $lastRoadmap['total'] += (count($branchRoadmaps, 1) - count($branchRoadmaps));
}
return $lastRoadmap;
module/product/view/roadmap.html.php
+5 -11
View File
@@ -28,21 +28,16 @@
<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());?>
<?php $groupRoadmaps = 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($roadmapData));?></div>
<div class="subtitle"><?php echo sprintf($lang->product->iterationInfo, count($groupRoadmaps, 1) - count($groupRoadmaps));?></div>
</div>
<?php $i = 0;?>
<?php foreach($roadmapData as $roadmap):?>
<?php $totalData = count($roadmapData);?>
<?php $rows = ceil($totalData / 8);?>
<?php $maxPerRow = ceil($totalData / $rows);?>
<?php if($i == 0 || $i % $maxPerRow == 0):?>
<?php foreach($groupRoadmaps as $row => $roadmapData):?>
<ul class="release-line">
<?php endif;?>
<?php $i++;?>
<?php foreach($roadmapData as $roadmap):?>
<li <?php if(isset($roadmap->build) && date('Y-m-d') < $roadmap->date) echo "class='active'";?>>
<?php $viewLink = isset($roadmap->build) ? $this->createLink('release', 'view', "releaseID=$roadmap->id") : $this->createLink('productplan', 'view', "planID=$roadmap->id");?>
<a href="<?php echo $viewLink;?>">
@@ -56,9 +51,8 @@
</div>
</a>
</li>
<?php if($i % $maxPerRow == 0):?>
<?php endforeach;?>
</ul>
<?php endif;?>
<?php endforeach;?>
</div>
<?php endforeach;?>