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

Merge branch 'spirnt/168_liyuchun_43929' into 'sprint/168'

Browse Source 
* Finish task #43929.

See merge request easycorp/zentaopms!332
This commit is contained in:
孙广明
2021-11-08 05:40:08 +00:00
parent ceef9ab63f 743f03c2cf
commit 4bb2fa0ea8
1 changed files with 85 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/model.php
+85 -52
View File
@@ -486,7 +486,7 @@ class kanbanModel extends model
if($groupBy == 'story') $objectPairs = $this->dao->select('id,title')->from(TABLE_STORY)->where('deleted')->eq(0)->fetchPairs();
if($groupBy == 'assignedTo') $objectPairs = $this->loadModel('user')->getPairs('noletter');
$laneOrder = $colorIndex = 0;
$colorIndex = 0;
foreach($lanes as $laneID => $lane)
{
@@ -506,14 +506,11 @@ class kanbanModel extends model
$laneName = zget($namePairs, $lane->extra);
}
$data = new stdClass();
$data->name = $laneName;
$data->order = $laneOrder;
$laneOrder += 5;
$colorIndex += 1;
$this->dao->update(TABLE_KANBANLANE)->data($lane)->where('id')->eq($laneID)->exec();
$this->dao->update(TABLE_KANBANLANE)->set('name')->eq($laneName)->where('id')->eq($laneID)->exec();
$this->updateCards($lane);
$colorIndex += 1;
if($colorIndex == count($this->config->kanban->laneColorList)) $colorIndex = 0;
}
}
@@ -534,16 +531,68 @@ class kanbanModel extends model
$lane->extra = $groupKey;
$lane->name = $laneName;
$lane->color = $this->config->kanban->laneColorList[$colorIndex];
$lane->order = $laneOrder;
$laneOrder += 5;
$colorIndex += 1;
if($colorIndex == count($this->config->kanban->laneColorList) + 1) $colorIndex = 0;
if($colorIndex == count($this->config->kanban->laneColorList)) $colorIndex = 0;
$this->dao->insert(TABLE_KANBANLANE)->data($lane)->exec();
$laneID = $this->dao->lastInsertId();
$this->createColumns($laneID, $type, $executionID, $groupBy, $groupKey);
}
$this->resetLaneOrder($executionID, $type, $groupBy);
}
/**
* Update lane column.
*
* @param int $columnID
* @param object $column
* @access public
* @return array
*/
public function updateLaneColumn($columnID, $column)
{
$data = fixer::input('post')->get();
$this->dao->update(TABLE_KANBANCOLUMN)->data($data)
->autoCheck()
->batchcheck($this->config->kanban->setlaneColumn->requiredFields, 'notempty')
->where('id')->eq($columnID)
->exec();
if(dao::isError()) return;
$changes = common::createChanges($column, $data);
return $changes;
}
/**
* Change the order through the lane move up and down.
*
* @param int $executionID
* @param string $currentType
* @param string $targetType
* @access public
* @return void
*/
public function updateLaneOrder($executionID, $currentType, $targetType)
{
$orderList = $this->dao->select('id,type,`order`')->from(TABLE_KANBANLANE)
->where('execution')->eq($executionID)
->andWhere('type')->in(array($currentType, $targetType))
->andWhere('groupby')->eq('')
->fetchAll('type');
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$targetType]->order)
->where('id')->eq($orderList[$currentType]->id)
->andWhere('groupby')->eq('')
->exec();
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$currentType]->order)
->where('id')->eq($orderList[$targetType]->id)
->andWhere('groupby')->eq('')
->exec();
}
/**
@@ -636,55 +685,39 @@ class kanbanModel extends model
}
/**
* Update lane column.
* Reset order of lane.
*
* @param int $columnID
* @param object $column
* @access public
* @return array
*/
public function updateLaneColumn($columnID, $column)
{
$data = fixer::input('post')->get();
$this->dao->update(TABLE_KANBANCOLUMN)->data($data)
->autoCheck()
->batchcheck($this->config->kanban->setlaneColumn->requiredFields, 'notempty')
->where('id')->eq($columnID)
->exec();
if(dao::isError()) return;
$changes = common::createChanges($column, $data);
return $changes;
}
/**
* Change the order through the lane move up and down.
*
* @param int $executionID
* @param string $currentType
* @param string $targetType
* @param int $executionID
* @param int $type
* @param int $groupBy
* @access public
* @return void
*/
public function updateLaneOrder($executionID, $currentType, $targetType)
public function resetLaneOrder($executionID, $type, $groupBy)
{
$orderList = $this->dao->select('id,type,`order`')->from(TABLE_KANBANLANE)
$lanes = $this->dao->select('id,extra')->from(TABLE_KANBANLANE)
->where('execution')->eq($executionID)
->andWhere('type')->in(array($currentType, $targetType))
->andWhere('groupby')->eq('')
->fetchAll('type');
->andWhere('type')->eq($type)
->andWhere('groupBy')->eq($groupBy)
->orderBy('extra_asc')
->fetchPairs();
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$targetType]->order)
->where('id')->eq($orderList[$currentType]->id)
->andWhere('groupby')->eq('')
->exec();
$laneOrder = 5;
$noExtra = 0;
$this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$currentType]->order)
->where('id')->eq($orderList[$targetType]->id)
->andWhere('groupby')->eq('')
->exec();
foreach($lanes as $laneID => $extra)
{
if(!$extra)
{
$noExtra = $laneID;
continue;
}
$this->dao->update(TABLE_KANBANLANE)->set('order')->eq($laneOrder)->where('id')->eq($laneID)->exec();
$laneOrder += 5;
}
if($noExtra) $this->dao->update(TABLE_KANBANLANE)->set('order')->eq($laneOrder)->where('id')->eq($noExtra)->exec();
}
/**