From a6cac7f79d7f346f128590bb753072aee02eb952 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 24 May 2024 10:19:29 +0800 Subject: [PATCH] * Fix bug #49159, move taskTao::checkWorkhour to taskModel::checkWorkhour. --- module/task/model.php | 61 ++++++++++++++++++++++++++++++++++++++++++- module/task/tao.php | 59 ----------------------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index c3d49e4123..6829f29138 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2588,7 +2588,7 @@ class taskModel extends model $task->team = $this->dao->select('*')->from(TABLE_TASKTEAM)->where('task')->eq($taskID)->orderBy('order')->fetchAll('id'); /* Check if field is valid. */ - $workhour = $this->taskTao->checkWorkhour($task, $workhour); + $workhour = $this->checkWorkhour($task, $workhour); if(!$workhour || dao::isError()) return array(); /* Add field to workhour. */ @@ -2640,6 +2640,65 @@ class taskModel extends model return $allChanges; } + /** + * 检查录入日志的字段必填性及日志记录人要在多人任务的团队中。 + * Check that the required fields of the effort must be filled in and the effort recorder must be in the multi-task team. + * + * @param object $task + * @param array $workhour + * @access public + * @return false|array + */ + public function checkWorkhour(object $task, array $workhour): false|array + { + foreach($workhour as $id => $record) + { + if(!$record->work && !$record->consumed && !$record->left) + { + unset($workhour[$id]); + continue; + } + + $date = $record->date; + $consumed = $record->consumed; + $left = $record->left; + + /* Check the date of workhour. */ + if(helper::isZeroDate($date)) dao::$errors["date[$id]"] = $this->lang->task->error->dateEmpty; + if($date > helper::today()) dao::$errors["date[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->date; + + /* Check consumed hours. */ + if(!$consumed) + { + dao::$errors["consumed[$id]"] = $this->lang->task->error->consumedThisTime; + } + elseif(!is_numeric($consumed) && !empty($consumed)) + { + dao::$errors["consumed[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->totalNumber; + } + elseif(is_numeric($consumed) && $consumed <= 0) + { + dao::$errors["consumed[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->record, '0'); + } + elseif(!$record->work && $this->config->edition != 'open') + { + dao::$errors["work[$id]"] = sprintf($this->lang->error->notempty, $this->lang->task->work); + } + + /* Check left hours. */ + if($left === '') dao::$errors["left[$id]"] = $this->lang->task->error->left; + if(!is_numeric($left)) dao::$errors["left[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->leftNumber; + if(is_numeric($left) && $left < 0) dao::$errors["left[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->left, '0'); + } + + if(dao::isError()) return false; + + $inTeam = $this->dao->select('id')->from(TABLE_TASKTEAM)->where('task')->eq($task->id)->andWhere('account')->eq($this->app->user->account)->fetch('id'); + if($task->team && !$inTeam) return false; + + return $workhour; + } + /** * 设置任务的附件。 * Set attachments for tasks. diff --git a/module/task/tao.php b/module/task/tao.php index d35c417523..530469757b 100644 --- a/module/task/tao.php +++ b/module/task/tao.php @@ -249,65 +249,6 @@ class taskTao extends taskModel return true; } - /** - * 检查录入日志的字段必填性及日志记录人要在多人任务的团队中。 - * Check that the required fields of the effort must be filled in and the effort recorder must be in the multi-task team. - * - * @param object $task - * @param array $workhour - * @access protected - * @return false|array - */ - protected function checkWorkhour(object $task, array $workhour): false|array - { - foreach($workhour as $id => $record) - { - if(!$record->work && !$record->consumed && !$record->left) - { - unset($workhour[$id]); - continue; - } - - $date = $record->date; - $consumed = $record->consumed; - $left = $record->left; - - /* Check the date of workhour. */ - if(helper::isZeroDate($date)) dao::$errors["date[$id]"] = $this->lang->task->error->dateEmpty; - if($date > helper::today()) dao::$errors["date[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->date; - - /* Check consumed hours. */ - if(!$consumed) - { - dao::$errors["consumed[$id]"] = $this->lang->task->error->consumedThisTime; - } - elseif(!is_numeric($consumed) && !empty($consumed)) - { - dao::$errors["consumed[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->totalNumber; - } - elseif(is_numeric($consumed) && $consumed <= 0) - { - dao::$errors["consumed[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->record, '0'); - } - elseif(!$record->work && $this->config->edition != 'open') - { - dao::$errors["work[$id]"] = sprintf($this->lang->error->notempty, $this->lang->task->work); - } - - /* Check left hours. */ - if($left === '') dao::$errors["left[$id]"] = $this->lang->task->error->left; - if(!is_numeric($left)) dao::$errors["left[$id]"] = 'ID #' . $id . ' ' . $this->lang->task->error->leftNumber; - if(is_numeric($left) && $left < 0) dao::$errors["left[$id]"] = sprintf($this->lang->error->gt, 'ID #' . $id . ' ' . $this->lang->task->left, '0'); - } - - if(dao::isError()) return false; - - $inTeam = $this->dao->select('id')->from(TABLE_TASKTEAM)->where('task')->eq($task->id)->andWhere('account')->eq($this->app->user->account)->fetch('id'); - if($task->team && !$inTeam) return false; - - return $workhour; - } - /** * 获取任务的进度，通过任务的消耗和剩余工时计算，结果以百分比的数字部分显示。 * Compute progress of a task.