diff --git a/module/execution/model.php b/module/execution/model.php index 37856dcef0..132dc5954f 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -694,10 +694,10 @@ class executionModel extends model public function start($executionID) { $oldExecution = $this->getById($executionID); - $now = helper::now(); + $now = helper::now(); $execution = fixer::input('post') - ->add('realBegan', $now) + ->add('realBegan', helper::today()) ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) @@ -718,7 +718,8 @@ class executionModel extends model public function putoff($executionID) { $oldExecution = $this->getById($executionID); - $now = helper::now(); + $now = helper::now(); + $execution = fixer::input('post') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) @@ -746,7 +747,8 @@ class executionModel extends model public function suspend($executionID) { $oldExecution = $this->getById($executionID); - $now = helper::now(); + $now = helper::now(); + $execution = fixer::input('post') ->setDefault('status', 'suspended') ->setDefault('lastEditedBy', $this->app->user->account) @@ -771,7 +773,8 @@ class executionModel extends model public function activate($executionID) { $oldExecution = $this->getById($executionID); - $now = helper::now(); + $now = helper::now(); + $execution = fixer::input('post') ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) @@ -838,10 +841,11 @@ class executionModel extends model public function close($executionID) { $oldExecution = $this->getById($executionID); - $now = helper::now(); + $now = helper::now(); + $execution = fixer::input('post') ->setDefault('status', 'closed') - ->setDefault('realEnd', $now) + ->setDefault('realEnd', helper::today()) ->setDefault('closedBy', $this->app->user->account) ->setDefault('closedDate', $now) ->setDefault('lastEditedBy', $this->app->user->account) diff --git a/module/project/model.php b/module/project/model.php index a29a431781..5f045f624a 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1113,7 +1113,7 @@ class projectModel extends model $now = helper::now(); $project = fixer::input('post') - ->add('realBegan', $now) + ->add('realBegan', helper::today()) ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) @@ -1135,6 +1135,7 @@ class projectModel extends model { $oldProject = $this->getById($projectID); $now = helper::now(); + $project = fixer::input('post') ->setDefault('lastEditedBy', $this->app->user->account) ->setDefault('lastEditedDate', $now) @@ -1185,6 +1186,7 @@ class projectModel extends model { $oldProject = $this->getById($projectID); $now = helper::now(); + $project = fixer::input('post') ->setDefault('status', 'doing') ->setDefault('lastEditedBy', $this->app->user->account) @@ -1252,6 +1254,7 @@ class projectModel extends model { $oldProject = $this->getById($projectID); $now = helper::now(); + $project = fixer::input('post') ->setDefault('status', 'closed') ->setDefault('closedBy', $this->app->user->account)