From f6344e22b1f9e43d346dbc8c75fd520834909cc9 Mon Sep 17 00:00:00 2001 From: daitingting Date: Tue, 16 Jan 2024 02:25:43 +0000 Subject: [PATCH] * Adjust budget field. --- module/program/ui/common.field.php | 1 + module/program/ui/create.field.php | 4 ++-- module/program/ui/edit.field.php | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/module/program/ui/common.field.php b/module/program/ui/common.field.php index 7eb3b0d55f..0f86aac7d4 100644 --- a/module/program/ui/common.field.php +++ b/module/program/ui/common.field.php @@ -19,6 +19,7 @@ $fields->field('begin'); $fields->field('budget') ->control('inputGroup') + ->label($lang->project->budget . $lang->project->budgetUnit) ->checkbox(array('name' => 'future', 'text' => $lang->project->future)); $fields->field('desc') diff --git a/module/program/ui/create.field.php b/module/program/ui/create.field.php index 9f5911c9fa..010efc70d4 100644 --- a/module/program/ui/create.field.php +++ b/module/program/ui/create.field.php @@ -13,8 +13,8 @@ $fields->field('begin') ->itemBegin('end')->require()->type('datePicker')->placeholder($lang->project->end)->itemEnd(); $fields->field('budget') - ->itemBegin('budget')->control('input')->prefix(data('parentProgram') ? data('parentProgram.budgetUnit') : '')->prefixWidth(20)->itemEnd() - ->item(data('parentProgram') ? field('budgetUnit')->hidden(true)->value(data('parentProgram.budgetUnit')) : field('budgetUnit')->required()->control('picker')->name('budgetUnit')->items(data('budgetUnitList'))->value($config->project->defaultCurrency)); + ->itemBegin('budget')->control('input')->itemEnd() + ->item(data('parentProgram') ? field('budgetUnit')->className('hidden')->value(data('parentProgram.budgetUnit')) : field('budgetUnit')->required()->control('picker')->name('budgetUnit')->items(data('budgetUnitList'))->value($config->project->defaultCurrency)); $fields->field('acl') ->items(data('parentProgram') ? $lang->program->subAclList : $lang->program->aclList) diff --git a/module/program/ui/edit.field.php b/module/program/ui/edit.field.php index 6b74dcef84..34d53af7b9 100644 --- a/module/program/ui/edit.field.php +++ b/module/program/ui/edit.field.php @@ -14,10 +14,10 @@ $fields->field('begin') $fields->field('budget') ->checkbox(array('name' => 'future', 'text' => $lang->project->future, 'checked' => data('program.budget') == 0 ? true : false)) - ->itemBegin('budget')->control('input')->value(data('program.budget'))->prefix(data('parentProgram') ? data('parentProgram.budgetUnit') : '')->prefixWidth(20)->itemEnd() - ->item(data('program.parent') ? field('budgetUnit')->hidden(true)->value(data('parentProgram.budgetUnit')) : field('budgetUnit')->required()->control('picker')->name('budgetUnit')->items(data('budgetUnitList'))->value($config->project->defaultCurrency)); - //->item('syncPRJUnit')->hidden()->value('false') - //->item('exchangeRate')->hidden()->value(''); + ->itemBegin('budget')->control('input')->value(data('program.budget'))->disabled(data('program.budget') == 0 ? true : false)->itemEnd() + ->item(data('program.parent') ? field('budgetUnit')->className('hidden')->value(data('parentProgram.budgetUnit')) : field('budgetUnit')->required()->control('picker')->name('budgetUnit')->items(data('budgetUnitList'))->value($config->project->defaultCurrency)) + ->itemBegin('syncPRJUnit')->className('hidden')->value('false')->itemEnd() + ->itemBegin('exchangeRate')->className('hidden')->value('')->itemEnd(); $fields->field('acl') ->items(data('program.parent') ? $lang->program->subAclList : $lang->program->aclList);