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

Merge branch 'sgm_kanban' into 'kanban'

Browse Source 
* Process kanban execution.

See merge request easycorp/zentaopms!1408
This commit is contained in:
王怡栋
2022-01-14 05:38:14 +00:00
parent 5ecba2a5da 13e653f600
commit b7b03e641f
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+3 -1
View File
@@ -125,7 +125,9 @@ class execution extends control
$browseType = strtolower($status);
/* Get products by execution. */
$execution = $this->commonAction($executionID, $status);
$execution = $this->commonAction($executionID, $status);
if($execution->type == 'kanban') $this->locate($this->createLink('execution', 'kanban', "executionID=$executionID"));
$executionID = $execution->id;
$products = $this->product->getProductPairsByProject($executionID);
setcookie('preExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
module/execution/model.php
+1
View File
@@ -72,6 +72,7 @@ class executionModel extends model
/* Unset story, bug, build and testtask if type is ops. */
$execution = $this->getByID($executionID);
if($execution and $execution->type == 'kanban') $this->lang->execution->menu = new stdclass();
if($execution and $execution->type == 'stage' and $this->config->systemMode == 'new')
{
module/project/css/index.css
+2
View File
@@ -26,3 +26,5 @@
.kanbans .kanban-actions {float: right; visibility: hidden;}
.kanbans .kanban-actions .dropdown-menu.pull-right {top:31px; right: -84px; left: auto;}
.kanbans .kanban-actions .dropdown-menu.pull-left {top:31px; right:-1px; left: auto;}
.label-doing {background: #ff5d5d}
module/project/js/index.js
+1 -2
View File
@@ -1,6 +1,5 @@
/* Make cards clickable. */
var $kanbans = $('.kanbans');
$kanbans.on('click', '.panel', function(e)
$('#cards').on('click', '.panel', function(e)
{
if(!$(e.target).closest('.kanban-actions').length)
{
module/project/view/index.html.php
+3 -3
View File
@@ -19,7 +19,7 @@
foreach($lang->project->featureBar as $label => $labelName)
{
$active = $browseType == $label ? 'btn-active-text' : '';
echo html::a($this->createLink('project', 'index', "projectID=$project->id&browseType=" . $label), '<span class="text">' . $labelName . '</span> ' . ($browseType == $label ? "<span class='label label-light label-badge'>0</span>" : ''), '', "class='btn btn-link $active'");
echo html::a($this->createLink('project', 'index', "projectID=$project->id&browseType=" . $label), '<span class="text">' . $labelName . '</span> ' . ($browseType == $label ? "<span class='label label-light label-badge'>" . (int)count($kanbanList) . '</span>' : ''), '', "class='btn btn-link $active'");
}
?>
</div>
@@ -40,10 +40,10 @@
<?php $kanbanCount = 0;?>
<?php foreach ($kanbanList as $kanbanID => $kanban):?>
<div class='col' data-id='<?php echo $kanbanID?>'>
<div class='panel'>
<div class='panel' data-url='<?php echo $this->createLink('execution', 'kanban', "kanbanID=$kanbanID");?>'>
<div class='panel-heading'>
<div class='kanban-name'>
<span class="label label-closed"><?php echo zget($lang->execution->statusList, $kanban->status);?></span>
<span class="label label-<?php echo $kanban->status;?>"><?php echo zget($lang->execution->statusList, $kanban->status);?></span>
<strong title='<?php echo $kanban->name;?>'><?php echo $kanban->name;?></strong>
</div>
<?php