From ed33ef033a84816d9604753f6da60dfedd40d545 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 11 Jan 2024 14:56:04 +0800
Subject: [PATCH] * Add required icon for task recordworkhour. bug #42352.

---
 module/execution/zen.php               |  4 +--
 module/task/tao.php                    |  2 +-
 module/task/ui/recordworkhour.html.php | 49 ++++++++++++++------------
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/module/execution/zen.php b/module/execution/zen.php
index 4483fcaafd..19daaeb1f7 100644
--- a/module/execution/zen.php
+++ b/module/execution/zen.php
@@ -1557,11 +1557,11 @@ class executionZen extends execution
         {
             $link = helper::createLink($module, 'task', "executionID=%s");
         }
-        elseif($module == 'execution' and $method == 'storyview')
+        elseif($module == 'execution' && $method == 'storyview')
         {
             $link = helper::createLink($module, 'story', "executionID=%s");
         }
-        elseif($module == 'execution' and in_array($method, array('kanban', 'cfd')))
+        elseif($module == 'execution' && in_array($method, array('kanban', 'cfd')))
         {
             $link = helper::createLink($module, 'view', "executionID=%s");
         }
diff --git a/module/task/tao.php b/module/task/tao.php
index e177edc38c..33604b20c7 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');
         }
diff --git a/module/task/ui/recordworkhour.html.php b/module/task/ui/recordworkhour.html.php
index 57a3f2c0be..3b1ae35d09 100644
--- a/module/task/ui/recordworkhour.html.php
+++ b/module/task/ui/recordworkhour.html.php
@@ -63,31 +63,31 @@ if($efforts)
         foreach($efforts as $effort)
         {
             $effortRows[] = h::tr
+            (
+                h::td($effort->id),
+                h::td($effort->date),
+                h::td(zget($users, $effort->account)),
+                h::td(html($effort->work)),
+                h::td($effort->consumed . ' H'),
+                h::td($effort->left . ' H'),
+                h::td
                 (
-                    h::td($effort->id),
-                    h::td($effort->date),
-                    h::td(zget($users, $effort->account)),
-                    h::td(html($effort->work)),
-                    h::td($effort->consumed . ' H'),
-                    h::td($effort->left . ' H'),
-                    h::td
+                    common::hasPriv('task', 'editEffort') ? a
                     (
-                        common::hasPriv('task', 'editEffort') ? a
-                        (
-                            setClass('btn ghost toolbar-item square size-sm text-primary'),
-                            set::href(createLink('task', 'editEffort', "id={$effort->id}")),
-                            set('data-toggle', 'modal'),
-                            icon('edit'),
-                        ) : null,
-                        common::hasPriv('task', 'deleteWorkhour') ? a
-                        (
-                            setClass('btn ghost toolbar-item square size-sm ajax-submit text-primary'),
-                            set('data-confirm', $lang->task->confirmDeleteEffort),
-                            set::href(createLink('task', 'deleteWorkhour', "id={$effort->id}")),
-                            icon('trash')
-                        ) : null
-                    )
-                );
+                        setClass('btn ghost toolbar-item square size-sm text-primary'),
+                        set::href(createLink('task', 'editEffort', "id={$effort->id}")),
+                        set('data-toggle', 'modal'),
+                        icon('edit'),
+                    ) : null,
+                    common::hasPriv('task', 'deleteWorkhour') ? a
+                    (
+                        setClass('btn ghost toolbar-item square size-sm ajax-submit text-primary'),
+                        set('data-confirm', $lang->task->confirmDeleteEffort),
+                        set::href(createLink('task', 'deleteWorkhour', "id={$effort->id}")),
+                        icon('trash')
+                    ) : null
+                )
+            );
         }
         div
         (
@@ -176,6 +176,7 @@ else
         ),
         formBatchItem
         (
+            set::required(true),
             set::name('date'),
             set::label($lang->task->date),
             set::width('120px'),
@@ -191,6 +192,7 @@ else
         ),
         formBatchItem
         (
+            set::required(true),
             set::name('consumed'),
             set::label($lang->task->consumedHours),
             set::width('80px'),
@@ -205,6 +207,7 @@ else
         ),
         formBatchItem
         (
+            set::required(true),
             set::name('left'),
             set::label($lang->task->leftAB),
             set::width('80px'),