From cc5e5d3c1dd46de528e946091f35b23b0533b0ed Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 29 Sep 2022 18:06:12 +0800 Subject: [PATCH] * Fix bug #28192. --- module/product/config.php | 2 +- module/product/control.php | 20 ++++++-------------- module/product/lang/de.php | 2 ++ module/product/lang/en.php | 2 ++ module/product/lang/fr.php | 2 ++ module/product/lang/zh-cn.php | 2 ++ 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/module/product/config.php b/module/product/config.php index c42c6ce6bd..ac10fd7bfa 100644 --- a/module/product/config.php +++ b/module/product/config.php @@ -11,7 +11,7 @@ $config->product->custom->batchEditFields = 'line,PO,QD,RD'; if($config->systemMode == 'new') $config->product->custom->batchEditFields .= ',program'; $config->product->list = new stdclass(); -$config->product->list->exportFields = 'id,program,line,name,activeRequirements,changedRequirements,draftRequirements,closedRequirements,requireCompleteRate,activeStories,changedStories,draftStories,closedStories,storyCompleteRate,plans,releases,bugs,unResolvedBugs,assignToNullBugs,closedBugs,bugFixedRate'; +$config->product->list->exportFields = 'id,program,line,name,manager,draftStories,activeStories,changedStories,reviewingStories,closedStories,storyCompleteRate,bugs,unResolvedBugs,assignToNullBugs,bugFixedRate,plans,releases'; $config->product->showBranchMethod = 'browse,project'; diff --git a/module/product/control.php b/module/product/control.php index 2bd4c6fb33..66833d346f 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -1440,7 +1440,6 @@ class product extends control $productConfig = $this->config->product; /* Create field lists. */ - if(!$this->config->URAndSR) $productConfig->list->exportFields = str_replace('activeRequirements,changedRequirements,draftRequirements,closedRequirements,requireCompleteRate,', '', $productConfig->list->exportFields); $fields = $this->post->exportFields ? $this->post->exportFields : explode(',', $productConfig->list->exportFields); foreach($fields as $key => $fieldName) { @@ -1451,28 +1450,21 @@ class product extends control $lastProgram = $lastLine = ''; $lines = $this->product->getLinePairs(); + $users = $this->user->getPairs('noletter'); $productStats = $this->product->getStats('program_desc,line_desc,' . $orderBy, null, $status); foreach($productStats as $i => $product) { - $product->line = zget($lines, $product->line, ''); - if($this->config->URAndSR) - { - $product->activeRequirements = (int) $product->requirements['active']; - $product->changedRequirements = (int) $product->requirements['changing']; - $product->draftRequirements = (int) $product->requirements['draft']; - $product->closedRequirements = (int) $product->requirements['closed']; - $product->totalRequirements = $product->activeRequirements + $product->changedRequirements + $product->draftRequirements + $product->closedRequirements; - $product->requireCompleteRate = ($product->totalRequirements == 0 ? 0 : round($product->closedRequirements / $product->totalRequirements, 3) * 100) . '%'; - } + $product->line = zget($lines, $product->line, ''); + $product->manager = zget($users, $product->PO, ''); + $product->draftStories = (int)$product->stories['draft']; $product->activeStories = (int)$product->stories['active']; $product->changedStories = (int)$product->stories['changing']; - $product->draftStories = (int)$product->stories['draft']; + $product->reviewingStories = (int)$product->stories['reviewing']; $product->closedStories = (int)$product->stories['closed']; - $product->totalStories = $product->activeStories + $product->changedStories + $product->draftStories + $product->closedStories; + $product->totalStories = $product->activeStories + $product->changedStories + $product->draftStories + $product->closedStories + $product->reviewingStories; $product->storyCompleteRate = ($product->totalStories == 0 ? 0 : round($product->closedStories / $product->totalStories, 3) * 100) . '%'; $product->unResolvedBugs = (int)$product->unResolved; $product->assignToNullBugs = (int)$product->assignToNull; - $product->closedBugs = (int)$product->closedBugs; $product->bugFixedRate = (($product->unResolved + $product->fixedBugs) == 0 ? 0 : round($product->fixedBugs / ($product->unResolved + $product->fixedBugs), 3) * 100) . '%'; $product->program = $product->programName; diff --git a/module/product/lang/de.php b/module/product/lang/de.php index 913c2c6eda..0b6f2d3c81 100644 --- a/module/product/lang/de.php +++ b/module/product/lang/de.php @@ -72,6 +72,8 @@ $lang->product->changedStories = 'Geänderte [S]'; $lang->product->changedStoriesTitle = 'Changed Stories'; $lang->product->draftStories = 'Entwurf [S]'; $lang->product->draftStoriesTitle = 'Draft Stories'; +$lang->product->reviewingStories = "Reviewing [S]"; +$lang->product->reviewingStoriesTitle = "Reviewing Stories"; $lang->product->closedStories = 'Geschlossene [S]'; $lang->product->closedStoriesTitle = 'Closed Stories'; $lang->product->storyCompleteRate = "{$lang->SRCommon} Completion rate"; diff --git a/module/product/lang/en.php b/module/product/lang/en.php index bf6a91a961..6fbdd044da 100644 --- a/module/product/lang/en.php +++ b/module/product/lang/en.php @@ -72,6 +72,8 @@ $lang->product->changedStories = 'Changed [S]'; $lang->product->changedStoriesTitle = 'Changed Stories'; $lang->product->draftStories = 'Draft [S]'; $lang->product->draftStoriesTitle = 'Draft Stories'; +$lang->product->reviewingStories = "Reviewing [S]"; +$lang->product->reviewingStoriesTitle = "Reviewing Stories"; $lang->product->closedStories = 'Closed [S]'; $lang->product->closedStoriesTitle = 'Closed Stories'; $lang->product->storyCompleteRate = "{$lang->SRCommon} Completion rate"; diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php index 6154559fac..bd7f8e0ce0 100644 --- a/module/product/lang/fr.php +++ b/module/product/lang/fr.php @@ -72,6 +72,8 @@ $lang->product->changedStories = 'Changées [S]'; $lang->product->changedStoriesTitle = 'Stories Modifiées'; $lang->product->draftStories = 'Brouillon [S]'; $lang->product->draftStoriesTitle = 'Stories en Analyse'; +$lang->product->reviewingStories = "Reviewing [S]"; +$lang->product->reviewingStoriesTitle = "Reviewing Stories"; $lang->product->closedStories = 'Fermées [S]'; $lang->product->closedStoriesTitle = 'Stories Fermées'; $lang->product->storyCompleteRate = "{$lang->SRCommon} Completion rate"; diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php index 6d33a54d1f..46dad4abdc 100644 --- a/module/product/lang/zh-cn.php +++ b/module/product/lang/zh-cn.php @@ -72,6 +72,8 @@ $lang->product->changedStories = "已变更{$lang->SRCommon}"; $lang->product->changedStoriesTitle = "已变更{$lang->SRCommon}"; $lang->product->draftStories = "草稿{$lang->SRCommon}"; $lang->product->draftStoriesTitle = "草稿{$lang->SRCommon}"; +$lang->product->reviewingStories = "评审中{$lang->SRCommon}"; +$lang->product->reviewingStoriesTitle = "评审中{$lang->SRCommon}"; $lang->product->closedStories = "已关闭{$lang->SRCommon}"; $lang->product->closedStoriesTitle = "已关闭{$lang->SRCommon}"; $lang->product->storyCompleteRate = "{$lang->SRCommon}完成率";