diff --git a/db/update12.4.4.sql b/db/update12.4.4.sql new file mode 100644 index 0000000000..800a156e2a --- /dev/null +++ b/db/update12.4.4.sql @@ -0,0 +1 @@ +ALTER TABLE `zt_task` CHANGE `realStarted` `realStarted` datetime NOT NULL AFTER `estStarted`; diff --git a/module/task/model.php b/module/task/model.php index 1dc1335430..ac33cf55d5 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1283,7 +1283,7 @@ class taskModel extends model /* Record consumed and left. */ $estimate = new stdclass(); - $estimate->date = zget($task, 'realStarted', date(DT_DATE1)); + $estimate->date = zget($task, 'realStarted', $now); $estimate->task = $taskID; $estimate->consumed = zget($_POST, 'consumed', 0); $estimate->left = zget($_POST, 'left', 0); diff --git a/module/task/view/finish.html.php b/module/task/view/finish.html.php index e756408374..35c9384c25 100644 --- a/module/task/view/finish.html.php +++ b/module/task/view/finish.html.php @@ -67,7 +67,7 @@ task->finishedDate;?> -
+
task->status;?> diff --git a/module/task/view/start.html.php b/module/task/view/start.html.php index 70fc5c50ce..a64a46167f 100644 --- a/module/task/view/start.html.php +++ b/module/task/view/start.html.php @@ -48,7 +48,7 @@ task->realStarted;?> -
realStarted == '0000-00-00' ? helper::today() : $task->realStarted, "class='form-control form-date' data-picker-position='bottom-right'");?>
+
realStarted == '0000-00-00 00:00:00' ? helper::now() : $task->realStarted, "class='form-control form-datetime' data-picker-position='bottom-right'");?>