From ad1885be6af1fc9bcf43d65db9d5d42ecb46db09 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 18 Jan 2021 09:04:44 +0800 Subject: [PATCH 1/3] * Finish task #9020. --- module/story/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/story/model.php b/module/story/model.php index 0e1a75594e..136ecd5e20 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2392,6 +2392,7 @@ class storyModel extends model $branches = array(); foreach($stories as $story) { + $story->estimate .= $this->lang->story->hour; if(empty($story->branch) and $story->productType != 'normal') $branches[$story->productBranch][$story->id] = $story->id; } foreach($branches as $branchID => $storyIdList) From 2f4c8a0efb820db0caeb823d1e7c0f7d7e411afa Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Mon, 18 Jan 2021 09:10:55 +0800 Subject: [PATCH 2/3] * Finish task #8968,8967. --- module/common/lang/de.php | 6 ++++-- module/common/lang/en.php | 6 ++++-- module/common/lang/fr.php | 6 ++++-- module/common/lang/vi.php | 6 ++++-- module/common/lang/zh-cn.php | 6 ++++-- module/my/control.php | 7 ++++++- module/my/js/common.js | 1 - module/my/view/testcase.html.php | 3 --- module/my/view/testtask.html.php | 3 --- 9 files changed, 26 insertions(+), 18 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 8e4bd84576..a30757387e 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -291,7 +291,8 @@ $lang->my->workMenu->task = 'Task|my|work|mode=task'; $lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; $lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->testcase = 'Test Case|my|work|mode=testcase&type=assigntome'; +$lang->my->workMenu->testtask = 'Test Task|my|work|mode=testtask&type=wait'; $lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; $lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; @@ -300,7 +301,8 @@ $lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; $lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; +$lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done'; $lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; $lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 5b9beda9b7..cb3503a59f 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -291,7 +291,8 @@ $lang->my->workMenu->task = 'Task|my|work|mode=task'; $lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; $lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->testcase = 'Test Case|my|work|mode=testcase&type=assigntome'; +$lang->my->workMenu->testtask = 'Test Task|my|work|mode=testtask&type=wait'; $lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; $lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; @@ -300,7 +301,8 @@ $lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; $lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; +$lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done'; $lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; $lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 42fd434ffc..d4272c518c 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -291,7 +291,8 @@ $lang->my->workMenu->task = 'Task|my|work|mode=task'; $lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; $lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->testcase = 'Test Case|my|work|mode=testcase&type=assigntome'; +$lang->my->workMenu->testtask = 'Test Task|my|work|mode=testtask&type=wait'; $lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; $lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; @@ -300,7 +301,8 @@ $lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; $lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; +$lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done'; $lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; $lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 415015fb83..9d5fba3327 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -291,7 +291,8 @@ $lang->my->workMenu->task = 'Task|my|work|mode=task'; $lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; $lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->testcase = 'Test Case|my|work|mode=testcase&type=assigntome'; +$lang->my->workMenu->testtask = 'Test Task|my|work|mode=testtask&type=wait'; $lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; $lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; @@ -300,7 +301,8 @@ $lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; $lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->testcase = 'Test Case|my|contribute|mode=testtask&type=openedbyme'; +$lang->my->contributeMenu->testtask = 'Test Task|my|contribute|mode=testtask&type=done'; $lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; $lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 53af413c7a..e403b51e9b 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -296,7 +296,8 @@ $lang->my->workMenu->task = '任务|my|work|mode=task'; $lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; $lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; $lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = '测试|my|work|mode=testtask&type=wait'; +$lang->my->workMenu->testcase = '用例|my|work|mode=testcase&type=assigntome'; +$lang->my->workMenu->testtask = '测试单|my|work|mode=testtask&type=wait'; $lang->my->workMenu->issue = '问题|my|work|mode=issue'; $lang->my->workMenu->risk = '风险|my|work|mode=risk'; @@ -305,7 +306,8 @@ $lang->my->contributeMenu->task = '任务|my|contribute|mode=task'; $lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; $lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; $lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = '用例|my|contribute|mode=testtask&type=done'; +$lang->my->contributeMenu->testcase = '用例|my|contribute|mode=testcase&type=openedbyme'; +$lang->my->contributeMenu->testtask = '测试单|my|contribute|mode=testtask&type=done'; $lang->my->contributeMenu->issue = '问题|my|contribute|mode=issue'; $lang->my->contributeMenu->risk = '风险|my|contribute|mode=risk'; diff --git a/module/my/control.php b/module/my/control.php index 7327fdffdf..c8bfaa9eaf 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -358,6 +358,11 @@ class my extends control /** * My test task. * + * @param string $type wait|done + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID * @access public * @return void */ @@ -393,7 +398,7 @@ class my extends control /** * My test case. * - * @param string $type + * @param string $type assigntome|openedbyme * @param string $orderBy * @param int $recTotal * @param int $recPerPage diff --git a/module/my/js/common.js b/module/my/js/common.js index 251d0390a4..37a1292422 100644 --- a/module/my/js/common.js +++ b/module/my/js/common.js @@ -2,7 +2,6 @@ $(function() { if(typeof mode === 'string') { - if(mode == 'testcase') mode = 'testtask'; $('#subNavbar li[data-id=' + mode + ']').addClass('active'); } var scp = $('[data-id="changePassword"] a'); diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index e4185fe55f..39735521c4 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -20,9 +20,6 @@
{$pager->recTotal}"; - if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=testtask&type=wait"), "{$lang->testtask->wait}", '', "class='btn btn-link'"); - if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=testtask&type=done"), "{$lang->testtask->done}", '', "class='btn btn-link'"); - echo ""; if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=$mode&type=assigntome"), "{$lang->testcase->assignToMe}" . ($type == 'assigntome' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'assigntome' ? ' btn-active-text' : '') . "'"); if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=$mode&type=openedbyme"), "{$lang->testcase->openedByMe}" . ($type == 'openedbyme' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'openedbyme' ? ' btn-active-text' : '') . "'"); ?> diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php index ae349ee7c4..9eabf844e7 100644 --- a/module/my/view/testtask.html.php +++ b/module/my/view/testtask.html.php @@ -19,9 +19,6 @@ $recTotalLabel = " {$pager->recTotal}"; if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=$mode&type=wait"), "{$lang->testtask->wait}" . ($type == 'wait' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'wait' ? ' btn-active-text' : '') . "'"); if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=$mode&type=done"), "{$lang->testtask->done}" . ($type == 'done' ? $recTotalLabel : ''), '', "class='btn btn-link" . ($type == 'done' ? ' btn-active-text' : '') . "'"); - echo ""; - if($app->rawMethod == 'work') echo html::a(inlink($app->rawMethod, "mode=testcase&type=assigntome"), "{$lang->testcase->assignToMe}", '', "class='btn btn-link'"); - if($app->rawMethod == 'contribute') echo html::a(inlink($app->rawMethod, "mode=testcase&type=openedbyme"), "{$lang->testcase->openedByMe}", '', "class='btn btn-link'"); ?>
From 8b90a207c003848c8db36940b5d1432fe2adf882 Mon Sep 17 00:00:00 2001 From: Yagami <976204163@qq.com> Date: Mon, 18 Jan 2021 09:11:31 +0800 Subject: [PATCH 3/3] * Finish task #9010. --- module/story/config.php | 2 +- module/story/model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/story/config.php b/module/story/config.php index 1f334ad7b7..14bad73301 100644 --- a/module/story/config.php +++ b/module/story/config.php @@ -97,7 +97,7 @@ $config->story->datatable->fieldList['status']['required'] = 'no'; $config->story->datatable->fieldList['estimate']['title'] = 'estimateAB'; $config->story->datatable->fieldList['estimate']['fixed'] = 'no'; -$config->story->datatable->fieldList['estimate']['width'] = '65'; +$config->story->datatable->fieldList['estimate']['width'] = '80'; $config->story->datatable->fieldList['estimate']['required'] = 'no'; $config->story->datatable->fieldList['stage']['title'] = 'stageAB'; diff --git a/module/story/model.php b/module/story/model.php index 136ecd5e20..aef6483d5e 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -2392,7 +2392,7 @@ class storyModel extends model $branches = array(); foreach($stories as $story) { - $story->estimate .= $this->lang->story->hour; + $story->estimate .= ' ' . $this->lang->story->hour; if(empty($story->branch) and $story->productType != 'normal') $branches[$story->productBranch][$story->id] = $story->id; } foreach($branches as $branchID => $storyIdList) @@ -3385,7 +3385,7 @@ class storyModel extends model echo ''; break; case 'estimate': - echo $story->estimate; + echo $story->estimate . ' ' . $this->lang->story->hour; break; case 'stage': if(isset($storyStages[$story->id]) and !empty($branches))