* fix bug.

This commit is contained in:
tanghucheng
2022-02-16 08:32:47 +08:00
parent cfb17ef6e3
commit 879d3c2f17
2 changed files with 108 additions and 0 deletions
@@ -0,0 +1,8 @@
<?php
$lang->kanban->taskColumn = array();
$lang->kanban->taskColumn['wait'] = '未开始';
$lang->kanban->taskColumn['developing'] = '进行中';
$lang->kanban->taskColumn['developed'] = '已完成';
$lang->kanban->taskColumn['pause'] = '已暂停';
$lang->kanban->taskColumn['canceled'] = '已取消';
$lang->kanban->taskColumn['closed'] = '已关闭';
+100
View File
@@ -4,3 +4,103 @@ public function __construct($appName = '')
parent::__construct($appName);
$this->lang->kanban->menu = new stdclass();
}
public function getKanban4Group($executionID, $browseType, $groupBy)
{
/* Get card data. */
$cardList = array();
if($browseType == 'story') $cardList = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, 't1.`order`_desc', 'allStory');
if($browseType == 'bug') $cardList = $this->loadModel('bug')->getExecutionBugs($executionID);
if($browseType == 'task') $cardList = $this->loadModel('execution')->getKanbanTasks($executionID, "id");
$lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList);
if(empty($lanes)) return array();
$columns = $this->dao->select('t1.*, t2.`type` as columnType')->from(TABLE_KANBANCELL)->alias('t1')
->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.`column` = t2.id')
->where('t1.kanban')->eq($executionID)
->andWhere('t1.`type`')->eq($browseType)
->fetchAll();
$cardGroup = array();
foreach($columns as $column)
{
if(empty($column->cards)) continue;
foreach($cardList as $card)
{
if(strpos($column->cards, ",$card->id,") !== false) $cardGroup[$column->columnType][$card->id] = $card;
}
}
/* Build kanban group data. */
$kanbanGroup = array();
foreach($lanes as $laneID => $lane)
{
$laneData = array();
$columnData = array();
$columnList = $this->lang->kanban->{$browseType . 'Column'};
$laneData['id'] = $groupBy . $laneID;
$laneData['laneID'] = $groupBy . $laneID;
$laneData['name'] = (($groupBy == 'pri' or $groupBy == 'severity') and $laneID) ? $this->lang->$browseType->$groupBy . ':' . $lane->name : $lane->name;
$laneData['color'] = $lane->color;
$laneData['order'] = $lane->order;
$laneData['defaultCardType'] = $browseType;
/* Construct kanban column data. */
foreach($columnList as $columnID => $columnName)
{
$parentColumn = '';
if(in_array($columnID, array('testing', 'tested'))) $parentColumn = 'test';
if(in_array($columnID, array('fixing', 'fixed'))) $parentColumn = 'resolving';
$columnData[$columnID]['id'] = $columnID;
$columnData[$columnID]['type'] = $columnID;
$columnData[$columnID]['name'] = $columnName;
$columnData[$columnID]['color'] = '#333';
$columnData[$columnID]['limit'] = -1;
$columnData[$columnID]['laneType'] = $browseType;
$columnData[$columnID]['asParent'] = in_array($columnID, array('develop', 'test', 'resolving')) ? true : false;
$columnData[$columnID]['parentType'] = $parentColumn;
$cardOrder = 1;
$objects = zget($cardGroup, $columnID, array());
foreach($objects as $object)
{
if(empty($object)) continue;
$cardData = array();
if(in_array($groupBy, array('module', 'story', 'pri', 'severity')) and (int)$object->$groupBy !== $laneID) continue;
if(in_array($groupBy, array('assignedTo', 'type', 'category', 'source')) and $object->$groupBy != $laneID) continue;
$cardData['id'] = $object->id;
$cardData['order'] = $cardOrder;
$cardData['pri'] = $object->pri ? $object->pri : '';
$cardData['estimate'] = $browseType == 'bug' ? '' : $object->estimate;
$cardData['assignedTo'] = $object->assignedTo;
$cardData['deadline'] = $browseType == 'story' ? '' : $object->deadline;
$cardData['severity'] = $browseType == 'bug' ? $object->severity : '';
if($browseType == 'task')
{
$cardData['name'] = $object->name;
}
else
{
$cardData['title'] = $object->title;
}
$laneData['cards'][$columnID][] = $cardData;
$cardOrder ++;
}
if(!isset($laneData['cards'][$columnID])) $laneData['cards'][$columnID] = array();
}
$kanbanGroup[$groupBy]['id'] = $groupBy . $laneID;
$kanbanGroup[$groupBy]['columns'] = array_values($columnData);
$kanbanGroup[$groupBy]['lanes'][] = $laneData;
$kanbanGroup[$groupBy]['defaultCardType'] = $browseType;
}
return $kanbanGroup;
}