diff --git a/module/execution/ui/view.html.php b/module/execution/ui/view.html.php
index b22fe06865..1532680cce 100644
--- a/module/execution/ui/view.html.php
+++ b/module/execution/ui/view.html.php
@@ -194,7 +194,7 @@ div
set('data-placement', 'bottom'),
set('data-type', 'white'),
set('data-class-name', 'text-gray border border-light'),
- setClass('text-gray ')
+ setClass('text-gray')
)
)
)
diff --git a/module/product/lang/de.php b/module/product/lang/de.php
index 8207693169..e8eafe5d52 100644
--- a/module/product/lang/de.php
+++ b/module/product/lang/de.php
@@ -93,6 +93,7 @@ $lang->product->closedBugs = 'Closed Bug';
$lang->product->bugFixedRate = 'Repair Rate';
$lang->product->unfoldClosed = 'Unfold Closed';
$lang->product->storyDeliveryRate = "Story Delivery Rate";
+$lang->product->storyDeliveryRateTip = "Story Delivery Rate = The released or done stories / (Total stories - Closed reason is not done)* 100%";
$lang->product->confirmDelete = " Möchten Sie {$lang->productCommon} löschen?";
$lang->product->errorNoProduct = "Kein {$lang->productCommon} erstellt!";
diff --git a/module/product/lang/en.php b/module/product/lang/en.php
index 3c9f487e6c..16a1df482d 100644
--- a/module/product/lang/en.php
+++ b/module/product/lang/en.php
@@ -93,6 +93,7 @@ $lang->product->closedBugs = 'Closed Bug';
$lang->product->bugFixedRate = 'Repair Rate';
$lang->product->unfoldClosed = 'Unfold Closed';
$lang->product->storyDeliveryRate = "Story Delivery Rate";
+$lang->product->storyDeliveryRateTip = "Story Delivery Rate = The released or done stories / (Total stories - Closed reason is not done)* 100%";
$lang->product->confirmDelete = " Do you want to delete the {$lang->productCommon}?";
$lang->product->errorNoProduct = "No {$lang->productCommon} is created yet!";
diff --git a/module/product/lang/fr.php b/module/product/lang/fr.php
index 598131d679..a6e5ef5248 100644
--- a/module/product/lang/fr.php
+++ b/module/product/lang/fr.php
@@ -93,6 +93,7 @@ $lang->product->closedBugs = 'Closed Bug';
$lang->product->bugFixedRate = 'Repair Rate';
$lang->product->unfoldClosed = 'Unfold Closed';
$lang->product->storyDeliveryRate = "Story Delivery Rate";
+$lang->product->storyDeliveryRateTip = "Story Delivery Rate = The released or done stories / (Total stories - Closed reason is not done)* 100%";
$lang->product->confirmDelete = "Voulez-vous vraiment supprimer le {$lang->productCommon} ?";
$lang->product->errorNoProduct = "Aucun {$lang->productCommon} n'est créé pour l'instant !";
diff --git a/module/product/lang/zh-cn.php b/module/product/lang/zh-cn.php
index 49ad19d308..1d5dc213e2 100644
--- a/module/product/lang/zh-cn.php
+++ b/module/product/lang/zh-cn.php
@@ -93,6 +93,7 @@ $lang->product->closedBugs = '关闭Bug';
$lang->product->bugFixedRate = '修复率';
$lang->product->unfoldClosed = '展开已关闭';
$lang->product->storyDeliveryRate = "需求交付率";
+$lang->product->storyDeliveryRateTip = "需求交付率 = 阶段为已发布或关闭原因是已完成需求数 /(研发需求总数 - 关闭原因不是已完成的需求数)* 100%";
$lang->product->confirmDelete = " 您确定删除该{$lang->productCommon}吗?";
$lang->product->errorNoProduct = "还没有创建{$lang->productCommon}!";
diff --git a/module/product/model.php b/module/product/model.php
index 73baa2cc7c..c175e056a4 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1023,16 +1023,13 @@ class productModel extends model
$product->executions = $this->productTao->getStatCountByID('executions', $productID);
$product->progress = $this->productTao->getStatCountByID('progress', $productID);
+ $product->storyDeliveryRate = 0;
$storyDeliveryRate = $this->loadModel('metric')->getResultByCode('rate_of_delivery_story_in_product', array('product' => $productID));
if($storyDeliveryRate)
{
$storyDeliveryRate = current($storyDeliveryRate);
$product->storyDeliveryRate = $storyDeliveryRate['value'] * 100;
}
- else
- {
- $product->storyDeliveryRate = 0;
- }
return $product;
}
diff --git a/module/product/ui/view.html.php b/module/product/ui/view.html.php
index 44f5e14d7b..b0a9050ab0 100644
--- a/module/product/ui/view.html.php
+++ b/module/product/ui/view.html.php
@@ -74,7 +74,7 @@ div
icon
(
'help ml-1',
- toggle::tooltip(array('title' => $lang->product->storyDeliveryRate)),
+ toggle::tooltip(array('title' => $lang->product->storyDeliveryRateTip)),
set('data-placement', 'bottom'),
set('data-type', 'white'),
set('data-class-name', 'text-gray border border-light'),