From 393383399ff681c5915be91cfa9d4904a2cd4b30 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 11 Jan 2024 15:16:26 +0800
Subject: [PATCH] * Fix check recordWorkhour form data error.

---
 module/task/config/form.php | 8 ++++----
 module/task/tao.php         | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/task/config/form.php b/module/task/config/form.php
index 0a5583d17c..342dfc032e 100644
--- a/module/task/config/form.php
+++ b/module/task/config/form.php
@@ -189,10 +189,10 @@ $config->task->form->testTask->create['estStartedDitto'] = array('type' => 'arra
 $config->task->form->testTask->create['deadlineDitto']   = array('type' => 'array', 'required' => false, 'default' => array());
 
 $config->task->form->recordWorkhour = array();
-$config->task->form->recordWorkhour['date']     = array('type' => 'date',   'required' => true,  'default' => array());
-$config->task->form->recordWorkhour['work']     = array('type' => 'string', 'required' => true,  'default' => array(), 'base' => true);
-$config->task->form->recordWorkhour['consumed'] = array('type' => 'float',  'required' => true,  'default' => array());
-$config->task->form->recordWorkhour['left']     = array('type' => 'float',  'required' => false, 'default' => array()); /* Set required to false as the required field can NOT be 0. */
+$config->task->form->recordWorkhour['date']     = array('type' => 'date',   'required' => true, 'default' => array());
+$config->task->form->recordWorkhour['work']     = array('type' => 'string', 'required' => true, 'default' => array(), 'base' => true);
+$config->task->form->recordWorkhour['consumed'] = array('type' => 'string', 'required' => true, 'default' => array());
+$config->task->form->recordWorkhour['left']     = array('type' => 'string', 'required' => true, 'default' => array()); /* Set required to false as the required field can NOT be 0. */
 
 $config->task->form->editEffort = array();
 $config->task->form->editEffort['date']     = array('type' => 'date',   'required' => true,  'default' => '');
diff --git a/module/task/tao.php b/module/task/tao.php
index 33604b20c7..e177edc38c 100644
--- a/module/task/tao.php
+++ b/module/task/tao.php
@@ -292,7 +292,7 @@ class taskTao extends taskModel
             }
 
             /* Check left hours. */
-            if(!$left) dao::$errors["left[$id]"] = $this->lang->task->error->left;
+            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');
         }