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

Merge branch 'master_xieqiyu_kanban' into 'master'

Browse Source 
Master xieqiyu kanban

See merge request easycorp/zentaopms!4371
This commit is contained in:
王怡栋
2022-07-06 06:05:06 +00:00
parent 26a087a069 2536d83a98
commit b6b2035566
1 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+33 -5
View File
@@ -543,6 +543,17 @@ class kanban extends control
$this->loadModel('action')->create('kanbanLane', $laneID, 'created');
if($from == 'execution')
{
if(dao::isError()) return $this->sendError(dao::getError());
$execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
$execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
$kanbanData = $this->loadModel('kanban')->getRDKanban($kanbanID, $execLaneType, 'id_desc', $regionID, $execGroupBy);
$kanbanData = json_encode($kanbanData);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, $regionID)"));
}
$kanbanGroup = $this->kanban->getKanbanData($kanbanID, $regionID);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => 1, 'callback' => array('target' => 'parent', 'name' => 'updateRegion', 'params' => array($regionID, $kanbanGroup))));
}
@@ -625,6 +636,17 @@ class kanban extends control
{
$this->kanban->delete(TABLE_KANBANLANE, $laneID);
if($this->app->tab == 'execution')
{
if(dao::isError()) return $this->sendError(dao::getError());
$execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
$execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
$kanbanData = $this->loadModel('kanban')->getRDKanban($kanbanID, $execLaneType, 'id_desc', $regionID, $execGroupBy);
$kanbanData = json_encode($kanbanData);
return print("<script>parent.updateKanban($kanbanData, $regionID)</script>");
}
$kanbanGroup = $this->kanban->getKanbanData($kanbanID, $regionID);
$kanbanGroup = json_encode($kanbanGroup);
return print("<script>parent.updateRegion($regionID, $kanbanGroup)</script>");
@@ -1497,18 +1519,24 @@ class kanban extends control
if($from == 'RDKanban')
{
if(dao::isError()) return $this->sendError(dao::getError());
$regionID = $column->region;
$execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
$execGroupBy = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
$kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', $regionID, $execGroupBy);
$kanbanData = json_encode($kanbanData);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, $regionID)"));
}
$region = $this->kanban->getRegionByID($column->region);
$kanbanGroup = $this->kanban->getKanbanData($region->kanban, $region->id);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => array('target' => 'parent', 'name' => 'updateRegion', 'params' => array($column->region, $kanbanGroup))));
elseif($from == 'kanban')
{
$region = $this->kanban->getRegionByID($column->region);
$kanbanGroup = $this->kanban->getKanbanData($region->kanban, $region->id);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => array('target' => 'parent', 'name' => 'updateRegion', 'params' => array($column->region, $kanbanGroup))));
}
else
{
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
}
$this->app->loadLang('story');