+ add the status of cancel to task.
This commit is contained in:
@@ -102,7 +102,7 @@ class projectModel extends model
|
||||
public function findById($projectID)
|
||||
{
|
||||
$project = $this->dao->findById((int)$projectID)->from(TABLE_PROJECT)->fetch();
|
||||
$total = $this->dao->select('SUM(estimate) AS totalEstimate, SUM(consumed) AS totalConsumed, SUM(`left`) AS totalLeft')->from(TABLE_TASK)->where('project')->eq((int)$projectID)->fetch();
|
||||
$total = $this->dao->select('SUM(estimate) AS totalEstimate, SUM(consumed) AS totalConsumed, SUM(`left`) AS totalLeft')->from(TABLE_TASK)->where('project')->eq((int)$projectID)->andWhere('status')->ne('cancel')->fetch();
|
||||
$project->totalEstimate = round($total->totalEstimate, 1);
|
||||
$project->totalConsumed = round($total->totalConsumed, 1);
|
||||
$project->totalLeft = round($total->totalLeft, 1);
|
||||
|
||||
@@ -47,6 +47,7 @@ $lang->task->desc = '描述';
|
||||
$lang->task->statusList->wait = '未开始';
|
||||
$lang->task->statusList->doing = '进行中';
|
||||
$lang->task->statusList->done = '已完成';
|
||||
$lang->task->statusList->cancel= '已取消';
|
||||
|
||||
$lang->task->priList[3] = '一般';
|
||||
$lang->task->priList[1] = '最高';
|
||||
|
||||
Reference in New Issue
Block a user