From 3af041060fb30567c3370bc24088b95d02c0fbdb Mon Sep 17 00:00:00 2001 From: wangyuting2 <851424971@qq.com> Date: Mon, 26 Sep 2022 07:06:15 +0000 Subject: [PATCH] * Finish task #70194. --- module/custom/js/mode.js | 7 ++++++- module/custom/lang/de.php | 4 ++-- module/custom/lang/en.php | 4 ++-- module/custom/lang/fr.php | 4 ++-- module/custom/lang/vi.php | 2 ++ module/custom/lang/zh-cn.php | 4 ++-- module/custom/view/mode.html.php | 9 ++++----- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/module/custom/js/mode.js b/module/custom/js/mode.js index f5ad1b4fb4..2e3ba0a05d 100644 --- a/module/custom/js/mode.js +++ b/module/custom/js/mode.js @@ -2,7 +2,12 @@ $(function() { $('#modeTab').addClass('btn-active-text'); - $('[name=mode]').change(function(){$("#selectDefaultProgram").toggle($(this).val() == 'lean'); }); + $('[name=mode]').change(function() + { + $('#submit').prop('disabled', 'disabled'); + if(mode != $(this).val()) $('#submit').prop('disabled', ''); + $('#program').closest('tr').toggle(mode == 'new' && $(this).val() == 'lean'); + }); $(document).on('click', '#submit', function() diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php index 43a1ff02c9..b2c99275fd 100644 --- a/module/custom/lang/de.php +++ b/module/custom/lang/de.php @@ -57,6 +57,8 @@ $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Enable or Disable Code'; $lang->custom->execution = 'Execution'; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = 'Set concept'; $lang->custom->reviewRules['allpass'] = 'All passed'; $lang->custom->reviewRules['halfpass'] = 'More than half passed'; - -$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php index b6f2b641b3..4afdf529e1 100644 --- a/module/custom/lang/en.php +++ b/module/custom/lang/en.php @@ -57,6 +57,8 @@ $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Enable or Disable Code'; $lang->custom->execution = 'Execution'; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = 'Set concept'; $lang->custom->reviewRules['allpass'] = 'All passed'; $lang->custom->reviewRules['halfpass'] = 'More than half passed'; - -$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php index 7297b77d29..c021b83ea7 100644 --- a/module/custom/lang/fr.php +++ b/module/custom/lang/fr.php @@ -57,6 +57,8 @@ $lang->custom->dept = 'Dept'; $lang->custom->code = $lang->code; $lang->custom->setCode = 'Activer ou Désactiver le Code'; $lang->custom->execution = 'Execution'; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = 'Set concept'; $lang->custom->reviewRules['allpass'] = 'All passed'; $lang->custom->reviewRules['halfpass'] = 'More than half passed'; - -$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; diff --git a/module/custom/lang/vi.php b/module/custom/lang/vi.php index 2d23c34019..2ff5ae5ab1 100644 --- a/module/custom/lang/vi.php +++ b/module/custom/lang/vi.php @@ -50,6 +50,8 @@ $lang->custom->convertRelationTitle = "Please firstly set the conversion factor if($config->systemMode == 'new') $lang->custom->execution = 'Execution'; if($config->systemMode == 'classic' || !$config->systemMode) $lang->custom->execution = $lang->executionCommon; +$lang->custom->defaultProgram = 'Default program'; +$lang->custom->switchModeHelper = 'Select a default item set. Subsequent data added in the system will be associated with the default item set'; $lang->custom->unitList['efficiency'] = 'Working Hours/'; $lang->custom->unitList['manhour'] = 'Man-hour/'; diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php index a93604106b..51c1be4458 100644 --- a/module/custom/lang/zh-cn.php +++ b/module/custom/lang/zh-cn.php @@ -57,6 +57,8 @@ $lang->custom->dept = '部门'; $lang->custom->code = $lang->code; $lang->custom->setCode = '是否启用代号'; $lang->custom->execution = '执行'; +$lang->custom->defaultProgram = '选择默认项目集'; +$lang->custom->switchModeHelper = '请选择一个默认项目集，后续在系统中新增的数据将关联在默认项目集下'; $lang->custom->unitList['efficiency'] = '工时/'; $lang->custom->unitList['manhour'] = '人时/'; @@ -295,5 +297,3 @@ $lang->custom->scrum->setConcept = '设置项目概念'; $lang->custom->reviewRules['allpass'] = '全部通过通过'; $lang->custom->reviewRules['halfpass'] = '半数以上通过通过'; - -$lang->custom->switchModeHelper = '请选择一个默认项目集，后续在系统中新增的数据将关联在默认项目集下'; diff --git a/module/custom/view/mode.html.php b/module/custom/view/mode.html.php index 5661508113..feb9dfad2b 100644 --- a/module/custom/view/mode.html.php +++ b/module/custom/view/mode.html.php @@ -23,7 +23,7 @@ - + - - > - + + - +
custom->mode;?>custom->mode;?>

@@ -31,9 +31,8 @@

custom->defaultProgram;?>
custom->switch);?>custom->switch, 'disabled');?>