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

* Refactor code.

Browse Source
This commit is contained in:
孙广明
2021-12-31 11:06:46 +08:00
parent 3dd747f40a
commit ad25920cf0
3 changed files with 101 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+1 -1
View File
@@ -467,7 +467,7 @@ class actionModel extends model
$name = $this->dao->select('name')->from(TABLE_TESTSUITE)->where('id')->eq($action->extra)->fetch('name');
if($name) $action->extra = common::hasPriv('caselib', 'browse') ? html::a(helper::createLink('caselib', 'browse', "libID=$action->extra"), $name) : $name;
}
elseif(strpos('importfromstorylib,importfromrisklib,importfromissuelib,importfromopportunitylib', $actionName)!== false)
elseif(strpos('importfromstorylib,importfromrisklib,importfromissuelib,importfromopportunitylib', $actionName) !== false)
{
$name = $this->dao->select('name')->from(TABLE_ASSETLIB)->where('id')->eq($action->extra)->fetch('name');
if($name) $action->extra = common::hasPriv('assetlib', $action->objectType) ? html::a(helper::createLink('assetlib', $action->objectType, "libID=$action->extra"), $name) : $name;
module/productplan/control.php
+20 -50
View File
@@ -402,6 +402,18 @@ class productplan extends control
public function start($planID, $confirm = 'no')
{
$plan = $this->productplan->getByID($planID);
if($_POST)
{
$changes = $this->productplan->start($planID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$actionID = $this->loadModel('action')->create('productplan', $planID, 'started');
$this->action->logHistory($actionID, $changes);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
}
if(!isonlybody())
{
if($confirm == 'no')
@@ -410,35 +422,14 @@ class productplan extends control
}
else
{
$changes = $this->productplan->updateStatus($planID, 'doing');
$this->productplan->updateStatus($planID, 'doing', 'started');
if(dao::isError()) die(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('productplan', $planID, 'started');
$this->action->logHistory($actionID, $changes);
if($plan->parent > 0) $this->productplan->updateParentStatus($plan->parent);
if(dao::isError()) die(js::error(dao::getError()));
die(js::reload('parent'));
}
}
else
{
if(!empty($_POST))
{
$_POST['status'] = 'doing';
$changes = $this->productplan->updateStatus($planID, 'doing');
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$actionID = $this->loadModel('action')->create('productplan', $planID, 'started');
$this->action->logHistory($actionID, $changes);
if($plan->parent > 0) $this->productplan->updateParentStatus($plan->parent);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess,'locate' => 'parent'));
}
$this->view->plan = $plan;
$this->display();
}
@@ -460,16 +451,9 @@ class productplan extends control
}
else
{
$changes = $this->productplan->updateStatus($planID, 'done');
$this->productplan->updateStatus($planID, 'done', 'finished');
if(dao::isError()) die(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('productplan', $planID, 'finished');
$this->action->logHistory($actionID, $changes);
$plan = $this->productplan->getByID($planID);
if($plan->parent > 0) $this->productplan->updateParentStatus($plan->parent);
if(dao::isError()) die(js::error(dao::getError()));
die(js::reload('parent'));
}
}
@@ -490,16 +474,9 @@ class productplan extends control
}
else
{
$changes = $this->productplan->updateStatus($planID, 'closed');
$this->productplan->updateStatus($planID, 'closed', 'closed');
if(dao::isError()) die(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('productplan', $planID, 'closed');
$this->action->logHistory($actionID, $changes);
$plan = $this->productplan->getByID($planID);
if($plan->parent > 0) $this->productplan->updateParentStatus($plan->parent);
if(dao::isError()) die(js::error(dao::getError()));
die(js::reload('parent'));
}
}
@@ -520,16 +497,9 @@ class productplan extends control
}
else
{
$changes = $this->productplan->updateStatus($planID, 'doing');
$this->productplan->updateStatus($planID, 'doing', 'activated');
if(dao::isError()) die(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('productplan', $planID, 'activated');
$this->action->logHistory($actionID, $changes);
$plan = $this->productplan->getByID($planID);
if($plan->parent > 0) $this->productplan->updateParentStatus($plan->parent);
if(dao::isError()) die(js::error(dao::getError()));
die(js::reload('parent'));
}
}
module/productplan/model.php
+80 -65
View File
@@ -494,6 +494,7 @@ class productplanModel extends model
->checkIF(!$this->post->future && !empty($_POST['begin']) && !empty($_POST['end']), 'end', 'ge', $plan->begin)
->where('id')->eq((int)$planID)
->exec();
if(!dao::isError())
{
$this->file->updateObjectID($this->post->uid, $planID, 'plan');
@@ -501,101 +502,115 @@ class productplanModel extends model
}
}
/**
* Start a plan.
*
* @param int $planID
* @access public
* @return array
*/
public function start($planID)
{
$oldPlan = $this->getByID($planID);
$plan = fixer::input('post')
->add('status', 'doing')
->stripTags($this->config->productplan->editor->start['id'], $this->config->allowedTags)
->remove('uid')
->get();
$this->checkDate4Plan($oldPlan, $plan->begin, $plan->end);
if(dao::isError()) return false;
$plan = $this->loadModel('file')->processImgURL($plan, $this->config->productplan->editor->start['id'], $this->post->uid);
$this->dao->update(TABLE_PRODUCTPLAN)
->data($plan)
->autoCheck()
->batchCheck($this->config->productplan->start->requiredFields, 'notempty')
->checkIF(!empty($plan->begin) and !empty($plan->end), 'end', 'ge', $plan->begin)
->where('id')->eq($planID)
->exec();
if(dao::isError()) return false;
if($oldPlan->parent > 0) $this->updateParentStatus($oldPlan->parent, 'started');
$this->file->updateObjectID($this->post->uid, $planID, 'productplan');
return common::createChanges($oldPlan, $plan);
}
/**
* Update a plan's status.
*
* @param int $planID
* @param string $status doing|done|closed
* @param string $action started|finished|closed|activated
* @access public
* @return array
*/
public function updateStatus($planID, $status = '')
public function updateStatus($planID, $status = '', $action = '')
{
$planID = (int)$planID;
$oldPlan = $this->getByID($planID);
if($status == 'doing' and !empty($_POST))
{
$plan = fixer::input('post')
->add('status', $status)
->stripTags($this->config->productplan->editor->start['id'], $this->config->allowedTags)
->remove('uid')
->get();
$plan = new stdclass();
$plan->status = $status;
$this->checkDate4Plan($oldPlan, $plan->begin, $plan->end);
if(dao::isError()) return false;
$plan = $this->loadModel('file')->processImgURL($plan, $this->config->productplan->editor->start['id'], $this->post->uid);
$this->dao->update(TABLE_PRODUCTPLAN)
->data($plan)
->autoCheck()
->batchCheck($this->config->productplan->start->requiredFields, 'notempty')
->checkIF(!empty($plan->begin) and !empty($plan->end), 'end', 'ge', $plan->begin)
->where('id')->eq($planID)
->exec();
}
else
{
$plan = new stdClass();
$plan->status = $status;
$this->dao->update(TABLE_PRODUCTPLAN)->data($plan)->where('id')->eq($planID)->exec();
}
$this->dao->update(TABLE_PRODUCTPLAN)->data($plan)->where('id')->eq($planID)->exec();
if(dao::isError()) return false;
if(isset($this->post->uid)) $this->file->updateObjectID($this->post->uid, $planID, 'productplan');
return common::createChanges($oldPlan, $plan);
$changes = common::createChanges($oldPlan, $plan);
$actionID = $this->loadModel('action')->create('productplan', $planID, $action);
$this->action->logHistory($actionID, $changes);
if($oldPlan->parent > 0) $this->updateParentStatus($oldPlan->parent, $action);
return !dao::isError();
}
/**
* Update a parent plan's status.
*
* @param int $parentID
* @param string $action started|finished|closed|activated
* @access public
* @return void
*/
public function updateParentStatus($parentID)
public function updateParentStatus($parentID, $action)
{
$method = $this->app->rawMethod;
$needChange = true;
$parentPlan = $this->getByID($parentID);
$childStatus = $this->dao->select('status')->from(TABLE_PRODUCTPLAN)->where('parent')->eq($parentID)->andWhere('deleted')->eq(0)->fetchPairs('status', 'status');
$parent = $this->getByID($parentID);
$childStatus = $this->dao->select('status')->from(TABLE_PRODUCTPLAN)->where('parent')->eq($parentID)->andWhere('deleted')->eq(0)->fetchPairs();
if(isset($childStatus['doing']))
switch($action)
{
$parentStatus = 'doing';
if($parentPlan->status != $parentStatus and $method == 'start') $parentAction = 'startedbychild';
if($parentPlan->status != $parentStatus and $method == 'activate') $parentAction = 'activatedbychild';
}
elseif(isset($childStatus['wait']) and count($childStatus) == 1)
{
$parentStatus = 'wait';
}
elseif(isset($childStatus['wait']))
{
$parentStatus = 'doing';
if($parentPlan->status != $parentStatus and $method == 'start') $parentAction = 'startedbychild';
}
elseif(isset($childStatus['closed']) and count($childStatus) == 1)
{
$parentStatus = 'closed';
if($parentPlan->status != $parentStatus) $parentAction = 'closedbychild';
}
else
{
$parentStatus = 'done';
if($parentPlan->status != $parentStatus) $parentAction = 'finishedbychild';
case 'started':
$parentStatus = 'doing';
$parentAction = $parent->status != 'doing' ? 'startedbychild' : '';
break;
case 'finished':
if(count($childStatus) == 1 and $parent->status != 'done')
{
$parentStatus = 'done';
$parentAction = 'finishedbychild';
}
break;
case 'closed':
if(count($childStatus) == 1 and $parent->status != 'closed')
{
$parentAction = 'closedbychild';
$parentStatus = 'closed';
}
break;
case 'activated':
$parentStatus = 'doing';
$parentAction = $parent->status != 'doing' ? 'activatedbychild' : '';
break;
}
if($parentPlan->status != $parentStatus)
{
$this->dao->update(TABLE_PRODUCTPLAN)->set('status')->eq($parentStatus)->where('id')->eq($parentID)->exec();
if(dao::isError()) return false;
if(isset($parentStatus)) $this->dao->update(TABLE_PRODUCTPLAN)->set('status')->eq($parentStatus)->where('id')->eq($parentID)->exec();
if(isset($parentAction)) $this->loadModel('action')->create('productplan', $parentID, $parentAction, '', $parentAction);
if(isset($parentAction)) $this->loadModel('action')->create('productplan', $parentID, $parentAction, '', $parentAction);
}
return !dao::isError();
}
/**