Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Add required icon for task recordworkhour. bug #42352.

Browse Source
This commit is contained in:
wangyuting
2024-01-11 14:56:04 +08:00
parent 417a2a55de
commit ed33ef033a
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/tao.php
+1 -1
View File
@@ -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');
}
module/task/ui/recordworkhour.html.php
+26 -23
View File
@@ -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'),