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

+ add changes of edit and delete estimate.

Browse Source
This commit is contained in:
zhujinyong
2013-03-03 00:36:25 +00:00
parent ac39ce3dca
commit 7581d12cb7
2 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
module/task/control.php
View File

@@ -462,9 +462,12 @@ class task extends control
$estimate = $this->task->getEstimateById($estimateID);
if(!empty($_POST))
{
$this->task->updateEstimate($estimateID);
$changes = $this->task->updateEstimate($estimateID);
if(dao::isError()) die(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('task', $estimate->task, 'EditEstimate');
$this->action->logHistory($actionID, $changes);
$url = $this->session->estimateList ? $this->session->estimateList : inlink('record', "taskID={$estimate->task}");
die(js::locate($url, 'parent'));
}
@@ -493,7 +496,12 @@ class task extends control
}
else
{
$this->task->deleteEstimate($estimateID);
$estimate = $this->task->getEstimateById($estimateID);
$changes = $this->task->deleteEstimate($estimateID);
if(dao::isError()) die(js::error(dao::getError()));
$actionID = $this->loadModel('action')->create('task', $estimate->task, 'DeleteEstimate');
$this->action->logHistory($actionID, $changes);
die(js::reload('parent'));
}
}

25
module/task/model.php
View File

@@ -857,7 +857,6 @@ class taskModel extends model
->check('consumed', 'notempty')
->where('id')->eq((int)$estimateID)
->exec();
$this->loadModel('action')->create('task', $oldEstimate->task, 'EditEstimate');
$consumed = $task->consumed + $estimate->consumed - $oldEstimate->consumed;
$lastEstimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)->where('task')->eq($task->id)->orderBy('id desc')->fetch();
if($lastEstimate and $estimateID == $lastEstimate->id)
@@ -873,6 +872,14 @@ class taskModel extends model
->set('`left`')->eq($left)
->where('id')->eq($task->id)
->exec();
$oldTask = new stdClass();
$newTask = new stdClass();
$oldTask->consumed = $task->consumed;
$newTask->consumed = $consumed;
$oldTask->left = $task->left;
$newTask->left = $left;
if(!dao::isError()) return common::createChanges($oldTask, $newTask);
}
/**
@@ -884,11 +891,21 @@ class taskModel extends model
*/
public function deleteEstimate($estimateID)
{
$estimate = $this->getEstimateById($estimateID);
$estimate = $this->getEstimateById($estimateID);
$task = $this->getById($estimate->task);
$this->dao->delete()->from(TABLE_TASKESTIMATE)->where('id')->eq($estimateID)->exec();
$lastEstimate = $this->dao->select('*')->from(TABLE_TASKESTIMATE)->where('task')->eq($estimate->task)->orderBy('id desc')->fetch();
$this->dao->update(TABLE_TASK)->set("consumed = consumed - {$estimate->consumed}")->set('`left`')->eq($lastEstimate->left)->where('id')->eq($estimate->task)->exec();
$this->loadModel('action')->create('task', $estimate->task, 'DeleteEstimate');
$consumed = $task->consumed - $estimate->consumed;
$left = $lastEstimate->left;
$this->dao->update(TABLE_TASK)->set("consumed")->eq($consumed)->set('`left`')->eq($left)->where('id')->eq($estimate->task)->exec();
$oldTask = new stdClass();
$newTask = new stdClass();
$oldTask->consumed = $task->consumed;
$newTask->consumed = $consumed;
$oldTask->left = $task->left;
$newTask->left = $left;
if(!dao::isError()) return common::createChanges($oldTask, $newTask);
}
/**