diff --git a/module/task/config/dtable.php b/module/task/config/dtable.php index 5e3c2ea5ab..7271f2498b 100644 --- a/module/task/config/dtable.php +++ b/module/task/config/dtable.php @@ -183,7 +183,7 @@ $config->task->effortTable->fieldList['left']['width'] = '80'; $config->task->effortTable->fieldList['actions']['title'] = $lang->actions; $config->task->effortTable->fieldList['actions']['name'] = 'actions'; $config->task->effortTable->fieldList['actions']['fixed'] = 'right'; -$config->task->effortTable->fieldList['actions']['width'] = '100'; +$config->task->effortTable->fieldList['actions']['minWidth'] = '80'; $config->task->effortTable->fieldList['actions']['type'] = 'actions'; $config->task->effortTable->fieldList['actions']['sortType'] = false; $config->task->effortTable->fieldList['actions']['menu'] = array('editEffort', 'deleteWorkhour'); diff --git a/module/task/css/recordworkhour.ui.css b/module/task/css/recordworkhour.ui.css new file mode 100644 index 0000000000..ff3a8aca65 --- /dev/null +++ b/module/task/css/recordworkhour.ui.css @@ -0,0 +1,5 @@ +.modal-body > .table-title {font-weight: 700; margin-bottom: 2px} +.panel-form{padding: 0px !important} +.panel-form .panel-heading {padding: 1.5rem 0 !important} +.panel-form .panel-heading .panel-title {font-size: 14px} +.panel-form .panel-body {padding: 0 0 1rem 0 !important} diff --git a/module/task/lang/de.php b/module/task/lang/de.php index 64a5db4c27..25450b53b1 100644 --- a/module/task/lang/de.php +++ b/module/task/lang/de.php @@ -58,6 +58,7 @@ $lang->task->copy = 'Aufgabe kopieren'; $lang->task->waitTask = 'Waiting Task'; $lang->task->allModule = 'All Module'; $lang->task->replace = 'Replace'; +$lang->task->committed = 'Committed'; $lang->task->myEffort = 'My Effort'; $lang->task->allEffort = 'Team Effort'; $lang->task->teamOrder = 'Order'; diff --git a/module/task/lang/en.php b/module/task/lang/en.php index e44aa4e86a..3dd296c5ca 100755 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -58,6 +58,7 @@ $lang->task->copy = 'Copy Task'; $lang->task->waitTask = 'Waiting Task'; $lang->task->allModule = 'All Module'; $lang->task->replace = 'Replace'; +$lang->task->committed = 'Committed'; $lang->task->myEffort = 'My Effort'; $lang->task->allEffort = 'Team Effort'; $lang->task->teamOrder = 'Order'; diff --git a/module/task/lang/fr.php b/module/task/lang/fr.php index 897a28f8ce..f1c5b6c178 100644 --- a/module/task/lang/fr.php +++ b/module/task/lang/fr.php @@ -58,6 +58,7 @@ $lang->task->copy = 'Copier Tâche'; $lang->task->waitTask = 'Tâche en attente'; $lang->task->allModule = 'Tous Modules'; $lang->task->replace = 'Replace'; +$lang->task->committed = 'Committed'; $lang->task->myEffort = 'My Effort'; $lang->task->allEffort = 'Team Effort'; $lang->task->teamOrder = 'Order'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index a840f29f00..31b9430c21 100755 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -58,6 +58,7 @@ $lang->task->copy = '复制任务'; $lang->task->waitTask = '未开始的任务'; $lang->task->allModule = '所有模块'; $lang->task->replace = '替换'; +$lang->task->committed = '已提交的日志'; $lang->task->myEffort = '我的日志'; $lang->task->allEffort = '团队日志'; $lang->task->teamOrder = '工序'; diff --git a/module/task/ui/recordworkhour.html.php b/module/task/ui/recordworkhour.html.php index e801d9a348..8b39205474 100644 --- a/module/task/ui/recordworkhour.html.php +++ b/module/task/ui/recordworkhour.html.php @@ -12,17 +12,51 @@ namespace zin; jsVar('confirmRecord', $lang->task->confirmRecord); -entityLabel +to::header ( - setClass('my-3 gap-x-3'), - set::level(1), - set::text($task->name), - set::entityID($task->id), - set::reverse(true), + $lang->task->addEffort, + entityLabel + ( + set::level(1), + set::text($task->name), + set::entityID($task->id), + set::reverse(true), + ), + span + ( + setClass('flex gap-x-2 mr-3'), + $lang->task->estimate, + span + ( + setClass('label secondary-pale'), + $task->estimate . $lang->task->suffixHour, + ), + ), + span + ( + setClass('flex gap-x-2'), + $lang->task->consumed, + span + ( + setClass('label warning-pale'), + span + ( + setID('totalConsumed'), + $task->consumed + ), + $lang->task->suffixHour, + ) + ) ); + if($efforts) { + div + ( + setClass('table-title'), + $lang->task->committed + ); $tableData = initTableData($efforts, $config->task->effortTable->fieldList, $this->task); dtable ( @@ -35,6 +69,7 @@ formBatchPanel ( set::title($lang->task->addEffort), set::shadow(!isonlybody()), + set::actions(array('submit')), formBatchItem ( set::name('id'),