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

* Finish task #56469.

Browse Source
This commit is contained in:
liumengyi
2022-06-09 17:33:46 +08:00
parent 74f80b8d71
commit a5d2a87fdf
4 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+2 -1
View File
@@ -1764,7 +1764,8 @@ class kanban extends control
$this->dao->update(TABLE_STORYSTAGE)->set('stage')->eq($toColumn->type)->where('story')->eq($cardID)->exec();
}
$kanbanGroup = $regionID == 0 ? $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy) : $this->kanban->getRDKanban($executionID, $browseType, $orderBy, $regionID, $groupBy);
$taskSearchValue = $this->session->taskSearchValue ? $this->session->taskSearchValue : '';
$kanbanGroup = $regionID == 0 ? $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, $taskSearchValue) : $this->kanban->getRDKanban($executionID, $browseType, $orderBy, $regionID, $groupBy);
echo json_encode($kanbanGroup);
}
module/kanban/model.php
+11 -9
View File
@@ -1327,12 +1327,13 @@ class kanbanModel extends model
* @param int $executionID
* @param string $browseType all|story|bug|task
* @param string $groupBy
* @param string $searchValue
* @access public
* @return array
*/
public function getExecutionKanban($executionID, $browseType = 'all', $groupBy = 'default')
public function getExecutionKanban($executionID, $browseType = 'all', $groupBy = 'default', $searchValue = '')
{
if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy);
if($groupBy != 'default') return $this->getKanban4Group($executionID, $browseType, $groupBy, $searchValue);
$lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
->where('execution')->eq($executionID)
@@ -1414,14 +1415,14 @@ class kanbanModel extends model
if($lane->type == 'task')
{
if(!empty($searchValue) and strpos($object->name, $searchValue) === false) continue;
if($searchValue != '' and strpos($object->name, $searchValue) === false) continue;
$cardData['name'] = $object->name;
$cardData['status'] = $object->status;
$cardData['left'] = $object->left;
}
else
{
if(!empty($searchValue) and strpos($object->title, $searchValue) === false) continue;
if($searchValue != '' and strpos($object->title, $searchValue) === false) continue;
$cardData['title'] = $object->title;
}
@@ -1432,9 +1433,10 @@ class kanbanModel extends model
$laneData['cards'][$column->type][] = $cardData;
$cardOrder ++;
}
if(!isset($laneData['cards'][$column->type])) $laneData['cards'][$column->type] = array();
if($searchValue == '' and !isset($laneData['cards'][$column->type])) $laneData['cards'][$column->type] = array();
}
if($searchValue != '' and empty($laneData['cards'])) continue;
$kanbanGroup[$lane->type]['id'] = $laneID;
$kanbanGroup[$lane->type]['columns'] = array_values($columnData);
$kanbanGroup[$lane->type]['lanes'][] = $laneData;
@@ -1563,24 +1565,24 @@ class kanbanModel extends model
if($browseType == 'task')
{
if(!empty($searchValue) and strpos($object->name, $searchValue) === false) continue;
if($searchValue != '' and strpos($object->name, $searchValue) === false) continue;
$cardData['name'] = $object->name;
$cardData['status'] = $object->status;
$cardData['left'] = $object->left;
}
else
{
if(!empty($searchValue) and strpos($object->title, $searchValue) === false) continue;
if($searchValue != '' and strpos($object->title, $searchValue) === false) continue;
$cardData['title'] = $object->title;
}
$laneData['cards'][$column->columnType][] = $cardData;
$cardOrder ++;
}
if(empty($searchValue) and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array();
if($searchValue == '' and !isset($laneData['cards'][$column->columnType])) $laneData['cards'][$column->columnType] = array();
}
if(!empty($searchValue) and empty($laneData['cards'])) continue;;
if($searchValue != '' and empty($laneData['cards'])) continue;
$kanbanGroup[$groupBy]['id'] = $groupBy . $laneID;
$kanbanGroup[$groupBy]['columns'] = array_values($columnData);
$kanbanGroup[$groupBy]['lanes'][] = $laneData;