+ finish the task #623.

This commit is contained in:
shiyangyangwork@yahoo.cn
2011-11-18 01:19:32 +00:00
parent 9c6396fbdc
commit 8b5247e83c
8 changed files with 82 additions and 11 deletions
+28
View File
@@ -193,6 +193,34 @@ class task extends control
$this->display();
}
/**
* Update assignedTo of task
*
* @param int $requestID
* @access public
* @return void
*/
public function assignedTo($taskID, $assignedTo)
{
$now = helper::now();
$this->dao->update(TABLE_TASK)
->set('assignedTo')->eq($this->post->assignedTo)
->set('lastEditedBy')->eq($this->app->user->account)
->set('lastEditedDate')->eq($now)
->where('id')->eq($taskID)->exec();
$actionID = $this->loadModel('action')->create('task', $taskID, 'Edited');
$this->dao->insert(TABLE_HISTORY)
->set('company')->eq(1)
->set('action')->eq($actionID)
->set('field')->eq('assignedTo')
->set('old')->eq($assignedTo)
->set('new')->eq($this->post->assignedTo)
->exec();
die(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
}
/**
* View a task.
*
+6
View File
@@ -0,0 +1,6 @@
function assign(taskID, assignedTo)
{
$('.assign').width(150);
$('.assign').height(40);
$('.assign').load(createLink('user', 'ajaxGetUser', 'taskID=' + taskID + '&assignedTo=' + assignedTo));
}
+1
View File
@@ -48,6 +48,7 @@ $lang->task->deadlineAB = 'Deadline';
$lang->task->status = 'Status';
$lang->task->statusCustom = 'Status Order';
$lang->task->desc = 'Desc';
$lang->task->assigne = 'Assign';
$lang->task->assignedTo = 'Assigned To';
$lang->task->assignedToAB = 'Assign';
$lang->task->assignedDate = 'Assigned Date';
+1
View File
@@ -48,6 +48,7 @@ $lang->task->deadlineAB = '截止';
$lang->task->status = '任务状态';
$lang->task->statusCustom = '状态排序';
$lang->task->desc = '任务描述';
$lang->task->assign = '重新指派';
$lang->task->assignedTo = '指派给';
$lang->task->assignedToAB = '指派给';
$lang->task->assignedDate = '指派日期';
+13 -1
View File
@@ -86,8 +86,20 @@
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
<td><?php echo $task->assignedToRealName . $lang->at . $task->assignedDate;?>
<td><?php echo $task->assignedToRealName . $lang->at . $task->assignedDate;?></td>
</tr>
<tr>
<th>
<?php
$assignedTo = empty($task->assignedTo) ? '' : $task->assignedTo;
if(common::hasPriv('task', 'assignedTo'))
{
echo html::a("javascript:assign($task->id, \"$assignedTo\")", $lang->task->assign, '');
}
?>
</th>
<td class='assign'></td>
</tr>
<tr>
<th class='rowhead'><?php echo $lang->task->type;?></th>
<td><?php echo $lang->task->typeList[$task->type];?></td>