* move to extension

This commit is contained in:
Zongjun Lan
2022-02-24 16:22:27 +08:00
parent e21fe4bf8a
commit d97c7ee4a2
4 changed files with 317 additions and 40 deletions
-33
View File
@@ -2118,26 +2118,6 @@ class taskModel extends model
if($task->parent > 0) $parents[$task->parent] = $task->parent;
}
$parents = $this->dao->select('*')->from(TABLE_TASK)->where('id')->in($parents)->fetchAll('id');
$lanes = array();
$cardsWhere = '';
foreach($tasks as $task)
{
if(empty($cardsWhere))
{
$cardsWhere = "cards like '%,{$task->id},%'";
}
else
{
$cardsWhere .= " or cards like '%,{$task->id},%'";
}
}
$lanes = $this->dao->select('t1.lane,t2.name,t1.cards')
->from(TABLE_KANBANCELL)->alias('t1')
->leftJoin(TABLE_KANBANLANE)->alias('t2')->on('t1.lane = t2.id')
->where('t1.kanban')->eq($executionID)
->andWhere("($cardsWhere)")
->fetchAll('cards');
foreach($tasks as $task)
{
@@ -2154,15 +2134,6 @@ class taskModel extends model
$task->parentName = $parent->name;
}
}
$task->lane = '';
if(!empty($lanes))
{
foreach($lanes as $lane)
{
if(strpos($lane->cards, $task->id) !== false) $task->lane = $lane->name;
}
}
}
return $this->processTasks($tasks);
@@ -3130,7 +3101,6 @@ class taskModel extends model
if($id == 'deadline') $class .= ' text-center';
if($id == 'deadline' and isset($task->delay)) $class .= ' delayed';
if($id == 'assignedTo') $class .= ' has-btn text-left';
if($id == 'lane') $class .= ' text-left';
if(strpos('progress', $id) !== false) $class .= ' text-right';
$title = '';
@@ -3212,9 +3182,6 @@ class taskModel extends model
case 'assignedTo':
$this->printAssignedHtml($task, $users);
break;
case 'lane':
echo trim($task->lane);
break;
case 'assignedDate':
echo substr($task->assignedDate, 5, 11);
break;