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

* Fix program kanban style.

Browse Source
This commit is contained in:
孙广明
2021-09-01 13:33:24 +08:00
parent 29c4191416
commit 11794815ce
2 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/program/model.php
-6
View File
@@ -258,8 +258,6 @@ class programModel extends model
$project->hours = zget($hours, $project->id, array());
$product->projects[$status][] = $project;
}
$product->rowspan = isset($product->projects['doing']) ? count($product->projects['doing']) > 0 ? count($product->projects['doing']) : 1 : 1;
}
}
@@ -268,10 +266,6 @@ class programModel extends model
{
$program->products = zget($productGroup, $programID, array());
$program->rowspan = count($program->products) > 0 ? count($program->products) : 1;
foreach($program->products as $product)
{
if(isset($product->projects['doing']) and count($product->projects['doing']) > 0) $program->rowspan += count($product->projects['doing']) - 1;
}
if(in_array($programID, $involvedPrograms))
{
module/program/view/kanban.html.php
+16 -20
View File
@@ -41,8 +41,8 @@
<?php if(!empty($program->products)):?>
<?php foreach($program->products as $productID => $product):?>
<?php if($i != 0) echo '<tr>';?>
<td title=<?php echo $product->name;?> rowspan='<?php echo $product->rowspan;?>'><?php echo $product->name;?></td>
<td class='normal-plan' rowspan='<?php echo $product->rowspan;?>'>
<td title=<?php echo $product->name;?>><?php echo $product->name;?></td>
<td class='normal-plan'>
<?php foreach($product->plans as $planID => $plan):?>
<div class='board-item'>
<div class='table-row'>
@@ -53,7 +53,7 @@
</div>
<?php endforeach;?>
</td>
<td class='wait-project' rowspan='<?php echo $product->rowspan?>'>
<td class='wait-project'>
<?php if(isset($product->projects['wait'])):?>
<?php foreach($product->projects['wait'] as $projectID => $project):?>
<div class='board-item' style='border-left: 3px solid #ccc'>
@@ -66,11 +66,9 @@
<?php endforeach;?>
<?php endif;?>
</td>
<?php if(isset($product->projects['doing'])):?>
<?php $index = 0;?>
<?php foreach($product->projects['doing'] as $projectID => $project):?>
<?php if($index != 0) echo "<tr>";?>
<td class='doing-td'>
<td class='doing-td project'>
<?php if(isset($product->projects['doing'])):?>
<?php foreach($product->projects['doing'] as $project):?>
<div class='board'>
<div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($project->delay) ? 'red' : "#0BD986") . "'";?>>
<div class='table-row'>
@@ -88,8 +86,12 @@
</div>
</div>
</div>
<?php endforeach;?>
<?php endif;?>
</td>
<td class='doing-td'>
<td class='doing-td execution'>
<?php if(isset($product->projects['doing'])):?>
<?php foreach($product->projects['doing'] as $project):?>
<?php if(!empty($project->execution)):?>
<div class='board'>
<div class='board-item' <?php echo "style='border-left: 3px solid " . (isset($project->execution->delay) ? 'red' : "#0BD986") . "'";?>>
@@ -108,10 +110,13 @@
</div>
</div>
</div>
<?php else:?>
<div class='board'></div>
<?php endif;?>
<?php endforeach;?>
<?php endif;?>
</td>
<?php if($index == 0):?>
<td class='normal-release' rowspan=<?php echo $product->rowspan;?>>
<td class='normal-release'>
<?php foreach($product->releases as $releaseID => $release):?>
<div class='board-item'>
<div class='table-row'>
@@ -123,15 +128,6 @@
</div>
<?php endforeach;?>
</td>
<?php endif;?>
<?php if($index != 0) echo "</tr>";?>
<?php $index ++;?>
<?php endforeach;?>
<?php else:?>
<td></td>
<td></td>
<td></td>
<?php endif;?>
<?php if($i != 0) echo '</tr>';?>
<?php $i ++;?>
<?php endforeach;?>