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

* code for task#1477.

Browse Source
This commit is contained in:
zhujinyong
2013-07-03 05:59:04 +00:00
parent 8746544e5b
commit 1abc0b6546
4 changed files with 38 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/task/js/editestimate.js Normal file
View File

@@ -0,0 +1,4 @@
function confirmLeft()
{
if($('#left').val() === '0') return confirm(confirmRecord);
}

5
module/task/js/recordestimate.js
View File

@@ -13,8 +13,5 @@ $("#recordForm").submit(function()
{
if($(this).val() !== '') left = $(this).val();
});
if(left === '0')
{
return confirm(confirmRecord);
}
if(left === '0') return confirm(confirmRecord);
});

45
module/task/model.php
View File

@@ -462,12 +462,17 @@ class taskModel extends model
{
$task->status = 'doing';
}
$this->dao->update(TABLE_TASK)
->set('consumed')->eq($task->consumed + $consumed)
->set('`left`')->eq($left)
->set('status')->eq($task->status)
->where('id')->eq($taskID)
->exec();
$data = new stdClass();
$data->consumed = $task->consumed + $consumed;
$data->left = $left;
$data->status = $task->status;
$data->lastEditedBy = $this->app->user->account;
$data->lastEditedDate = helper::now();
if($left == 0) $data->finishedBy = $this->app->user->account;
if($left == 0) $data->finishedDate = helper::now();
$this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($taskID)->exec();
$oldTask = new stdClass();
$newTask = new stdClass();
@@ -858,10 +863,17 @@ class taskModel extends model
*/
public function getEstimateById($estimateID)
{
return $this->dao->select('*')
$estimate = $this->dao->select('*')
->from(TABLE_TASKESTIMATE)
->where('id')->eq($estimateID)
->fetch();
$lastID = $this->dao->select('id')
->from(TABLE_TASKESTIMATE)
->where('task')->eq($estimate->task)
->andWhere('id')->gt($estimate->id)
->fetch('id');
$estimate->isLast = $lastID ? false :true;
return $estimate;
}
/**
@@ -892,13 +904,18 @@ class taskModel extends model
{
$left = $task->left;
}
if($left == 0) $task->status = 'done';
$this->dao->update(TABLE_TASK)
->set('consumed')->eq($consumed)
->set('`left`')->eq($left)
->set('status')->eq($task->status)
->where('id')->eq($task->id)
->exec();
if($left == 0) $task->status = 'done';
$data = new stdClass();
$data->consumed = $consumed;
$data->left = $left;
$data->status = $task->status;
$data->lastEditedBy = $this->app->user->account;
$data->lastEditedDate = helper::now();
if($left == 0) $data->finishedBy = $this->app->user->account;
if($left == 0) $data->finishedDate = helper::now();
$this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($task->id)->exec();
$oldTask = new stdClass();
$newTask = new stdClass();

3
module/task/view/editestimate.html.php
View File

@@ -12,7 +12,8 @@
?>
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<form method='post' target='hiddenwin'>
<?php js::set('confirmRecord', $lang->task->confirmRecord);?>
<form method='post' target='hiddenwin' <?php if($estimate->isLast) echo "onsubmit='return confirmLeft();'"?>>
<table class='table-1 a-left'>
<caption><?php echo $lang->task->editEstimate;?></caption>
<tr>