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

* Modify query Kanban logic.

Browse Source
This commit is contained in:
tianshujie
2021-10-27 15:34:59 +08:00
parent f2cf07b71d
commit 6f72de9b65
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/execution/control.php
View File

@@ -1846,7 +1846,6 @@ class execution extends control
$this->kanban->createLanes($executionID);
$kanbanGroup = $this->kanban->getExecutionKanban($executionID);
}
a($kanbanGroup);die;
$this->execution->setMenu($executionID);
$execution = $this->loadModel('execution')->getById($executionID);

17
module/kanban/model.php
View File

@@ -50,7 +50,7 @@ class kanbanModel extends model
$laneData['id'] = $lane->type;
$laneData['name'] = $lane->name;
$laneData['color'] = $lane->color;
$laneData['defaultItemType'] = $lane->type;
$laneData['defaultCardType'] = $lane->type;
$laneData['order'] = $lane->order;
foreach($columns[$laneID] as $colID => $col)
@@ -69,12 +69,12 @@ class kanbanModel extends model
foreach($columns[$laneID] as $colID => $col)
{
$columnData[$col->parent]['subs']['id'] = $lane->type . '-' . $col->type;
$columnData[$col->parent]['subs']['type'] = $col->type;
$columnData[$col->parent]['subs']['name'] = $col->name;
$columnData[$col->parent]['subs']['color'] = $col->color;
$columnData[$col->parent]['subs']['limit'] = $col->limit;
$columnData[$col->parent]['subs']['parentType'] = $columnData[$col->parent]['type'];
$columnData[$col->parent]['subs'][$col->id]['id'] = $lane->type . '-' . $col->type;
$columnData[$col->parent]['subs'][$col->id]['type'] = $col->type;
$columnData[$col->parent]['subs'][$col->id]['name'] = $col->name;
$columnData[$col->parent]['subs'][$col->id]['color'] = $col->color;
$columnData[$col->parent]['subs'][$col->id]['limit'] = $col->limit;
$columnData[$col->parent]['subs'][$col->id]['parentType'] = $columnData[$col->parent]['type'];
$cardIdList = array_filter(explode(',', $col->cards));
$cardOrder = 1;
@@ -96,7 +96,7 @@ class kanbanModel extends model
}
$kanban[$lane->type]['id'] = $lane->type;
$kanban[$lane->type]['columns'] = $columnData;
$kanban[$lane->type]['columns'] = array_values($columnData);
$kanban[$lane->type]['lanes'] = $laneData;
}
@@ -152,6 +152,7 @@ class kanbanModel extends model
if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID;
if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
if(strpos(',develop,test,', $colType) !== false) $data->parent = -1;
if(strpos(',ready,develop,test,', $colType) === false)
{
$storyStatus = $this->config->kanban->storyColumnStatusList[$colType];