diff --git a/module/task/js/edit.ui.js b/module/task/js/edit.ui.js index 87f3e4522e..c9fada5c81 100644 --- a/module/task/js/edit.ui.js +++ b/module/task/js/edit.ui.js @@ -264,3 +264,11 @@ function updateAssignedTo() $('#assignedTo').picker({disabled: true}); } } + +window.refreshConsumed = function(consumed) +{ + $('input[name=consumed]').val(consumed); + + consumed = String(consumed) + 'h'; + $('#consumedSpan').html(consumed); +} diff --git a/module/task/tao.php b/module/task/tao.php index 29fc4ee79d..bc8f9bd936 100644 --- a/module/task/tao.php +++ b/module/task/tao.php @@ -53,7 +53,6 @@ class taskTao extends taskModel $newTask = clone $task; $newTask->consumed += $record->consumed; $newTask->lastEditedBy = $this->app->user->account; - $newTask->lastEditedDate = $now; if(!$task->realStarted) $newTask->realStarted = $now; if($lastDate <= $record->date) $newTask->left = $record->left; diff --git a/module/task/zen.php b/module/task/zen.php index 891e15ee74..d8e6f757af 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -1593,7 +1593,14 @@ class taskZen extends task if($this->app->rawMethod == 'recordworkhour') { - $response['callback'] = "loadModal('" . inLink('recordworkhour', "taskID={$task->id}") . "', '#modal-record-hours-task-{$task->id}')"; + if($from == 'edittask') + { + $response['callback'] = "refreshConsumed('{$task->consumed}');"; + } + else + { + $response['callback'] = "loadModal('" . inLink('recordworkhour', "taskID={$task->id}") . "', '#modal-record-hours-task-{$task->id}')"; + } } else {