From 77aca9f1895a114243dffb59c87dd4dd02392aad Mon Sep 17 00:00:00 2001 From: sunguangming Date: Thu, 15 Jun 2023 09:51:20 +0800 Subject: [PATCH] * Code for task #95357. --- module/task/lang/de.php | 1 + module/task/lang/en.php | 1 + module/task/lang/fr.php | 1 + module/task/lang/zh-cn.php | 1 + module/task/ui/recordworkhour.html.php | 31 +++++++++++++++++++++----- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/module/task/lang/de.php b/module/task/lang/de.php index bb20dc354f..2809b75a98 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -64,6 +64,7 @@ $lang->task->teamOrder = 'Order'; $lang->task->manageTeam = 'Manage Team'; $lang->task->unfoldEffort = 'Unfold Effort'; $lang->task->foldEffort = 'Fold Effort'; +$lang->task->addEffort = 'Add Effort'; $lang->task->common = 'Aufgabe'; $lang->task->id = 'ID'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index b241936f1c..9c2e72ea07 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -64,6 +64,7 @@ $lang->task->teamOrder = 'Order'; $lang->task->manageTeam = 'Manage Team'; $lang->task->unfoldEffort = 'Unfold Effort'; $lang->task->foldEffort = 'Fold Effort'; +$lang->task->addEffort = 'Add Effort'; $lang->task->common = 'Task'; $lang->task->id = 'ID'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index 87dcd07716..e662950730 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -64,6 +64,7 @@ $lang->task->teamOrder = 'Order'; $lang->task->manageTeam = 'Manage Team'; $lang->task->unfoldEffort = 'Unfold Effort'; $lang->task->foldEffort = 'Fold Effort'; +$lang->task->addEffort = 'Add Effort'; $lang->task->common = 'Tâche'; $lang->task->id = 'ID'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 425bc7ed92..4591b4f326 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -64,6 +64,7 @@ $lang->task->teamOrder = '工序'; $lang->task->manageTeam = '维护团队'; $lang->task->unfoldEffort = '展开日志'; $lang->task->foldEffort = '收起日志'; +$lang->task->addEffort = '新增日志'; $lang->task->common = '任务'; $lang->task->id = '编号'; diff --git a/module/task/ui/recordworkhour.html.php b/module/task/ui/recordworkhour.html.php index 150c55a73f..54175aaa5a 100644 --- a/module/task/ui/recordworkhour.html.php +++ b/module/task/ui/recordworkhour.html.php @@ -10,15 +10,36 @@ declare(strict_types=1); */ namespace zin; -$tableData = initTableData($efforts, $config->task->effortTable->fieldList['actions'], $this->task); -dtable +entityLabel ( - set::cols(array_values($config->task->effortTable->fieldList)), - set::data($tableData), + setClass('my-3 gap-x-3'), + set::level(1), + set::text($task->name), + set::entityID($task->id), + set::reverse(true), ); -formBatch +if($efforts) +{ + $tableData = initTableData($efforts, $config->task->effortTable->fieldList['actions'], $this->task); + dtable + ( + set::cols(array_values($config->task->effortTable->fieldList)), + set::data($tableData), + ); +} + +formBatchPanel ( + set::title($lang->task->addEffort), + set::shadow(!isonlybody()), + formBatchItem + ( + set::name('id'), + set::label($lang->idAB), + set::control('index'), + set::width('32px'), + ), formBatchItem ( set::name('date'),