* Fix the bug that system metric didn't count shadow products,and bug #45089
This commit is contained in:
zhouxin
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class rate_of_fixed_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status', 't1.resolution');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_activated_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_annual_closed_feedback extends baseCalc
|
||||
{
|
||||
public $dataset = 'getFeedbacks';
|
||||
public $dataset = 'getFeedbacksWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status', 't1.closedDate');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_annual_created_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.openedDate');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_annual_created_case extends baseCalc
|
||||
{
|
||||
public $dataset = 'getCases';
|
||||
public $dataset = 'getCasesWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.openedDate');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_annual_created_feedback extends baseCalc
|
||||
{
|
||||
public $dataset = 'getFeedbacks';
|
||||
public $dataset = 'getFeedbacksWithShadowProduct';
|
||||
|
||||
public $fieldList = array('openedDate');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_annual_fixed_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.closedDate', 't1.status', 't1.resolution');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.id');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_case extends baseCalc
|
||||
{
|
||||
public $dataset = 'getCases';
|
||||
public $dataset = 'getCasesWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.id');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_closed_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_closed_feedback extends baseCalc
|
||||
{
|
||||
public $dataset = 'getFeedbacks';
|
||||
public $dataset = 'getFeedbacksWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_daily_closed_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.closedDate');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_feedback extends baseCalc
|
||||
{
|
||||
public $dataset = 'getFeedbacks';
|
||||
public $dataset = 'getFeedbacksWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.id');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_fixed_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status', 't1.resolution');
|
||||
|
||||
|
||||
@@ -29,7 +29,6 @@ class count_of_invalid_story extends baseCalc
|
||||
->where('t1.deleted')->eq(0)
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->andWhere('t1.type')->eq('story')
|
||||
->andWhere('t2.shadow')->eq(0)
|
||||
->andWhere('t1.closedReason')->in('duplicate,willnotdo,bydesign')
|
||||
->andWhere("t1.vision NOT LIKE '%or%'")
|
||||
->andWhere("t1.vision NOT LIKE '%lite%'")
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_monthly_created_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.openedDate');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_monthly_fixed_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.closedDate', 't1.status', 't1.resolution');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_resolved_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_unclosed_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_valid_bug extends baseCalc
|
||||
{
|
||||
public $dataset = 'getBugs';
|
||||
public $dataset = 'getBugsWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status', 't1.resolution');
|
||||
|
||||
|
||||
@@ -28,7 +28,6 @@ class count_of_valid_story extends baseCalc
|
||||
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
|
||||
->where('t1.deleted')->eq(0)
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->andWhere('t2.shadow')->eq(0)
|
||||
->andWhere('t1.type')->eq('story')
|
||||
->andWhere('t1.closedReason')->notin('duplicate,willnotdo,bydesign,cancel')
|
||||
->andWhere("t1.vision NOT LIKE '%or%'")
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_assigned_feedback_in_user extends baseCalc
|
||||
{
|
||||
public $dataset = 'getFeedbacks';
|
||||
public $dataset = 'getFeedbacksWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.assignedTo');
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_daily_review_feedback_in_user extends baseCalc
|
||||
{
|
||||
public $dataset = 'getFeedbacks';
|
||||
public $dataset = 'getFeedbacksWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.reviewedBy', 't1.reviewedDate');
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@ class count_of_delayed_bug_in_user extends baseCalc
|
||||
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
|
||||
->where('t1.deleted')->eq(0)
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->andWhere('t2.shadow')->eq(0)
|
||||
->andWhere('t1.status')->eq('active')
|
||||
->andWhere('t1.assignedDate')->notZeroDatetime()
|
||||
->andWhere('DATEDIFF(CURDATE(), assignedDate)')->gt($longlife)
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
*/
|
||||
class count_of_reviewing_feedback_in_user extends baseCalc
|
||||
{
|
||||
public $dataset = 'getFeedbacks';
|
||||
public $dataset = 'getFeedbacksWithShadowProduct';
|
||||
|
||||
public $fieldList = array('t1.status', 't1.assignedTo');
|
||||
|
||||
|
||||
@@ -182,6 +182,14 @@ class dataset
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取bug数据。
|
||||
* Get bug list with shadow product.
|
||||
*
|
||||
* @param string $fieldList
|
||||
* @access public
|
||||
* @return PDOStatement
|
||||
*/
|
||||
public function getBugsWithShadowProduct($fieldList)
|
||||
{
|
||||
return $this->dao->select($fieldList)
|
||||
@@ -231,6 +239,23 @@ class dataset
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取反馈数据。
|
||||
* Get feedback list with shadow product.
|
||||
*
|
||||
* @param string $fieldList
|
||||
* @access public
|
||||
* @return PDOStatement
|
||||
*/
|
||||
public function getFeedbacksWithShadowProduct($fieldList)
|
||||
{
|
||||
return $this->dao->select($fieldList)->from(TABLE_FEEDBACK)->alias('t1')
|
||||
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
|
||||
->where('t1.deleted')->eq(0)
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取需求数据。
|
||||
* Get story list.
|
||||
@@ -392,6 +417,25 @@ class dataset
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用例数据。
|
||||
* Get case list with shadow product.
|
||||
*
|
||||
* @param string $fieldList
|
||||
* @access public
|
||||
* @return PDOStatement
|
||||
*/
|
||||
public function getCasesWithShadowProduct($fieldList)
|
||||
{
|
||||
return $this->dao->select($fieldList)->from(TABLE_CASE)->alias('t1')
|
||||
->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
|
||||
->where('t1.deleted')->eq(0)
|
||||
->andWhere('t2.deleted')->eq(0)
|
||||
->andWhere("t2.vision NOT LIKE '%or%'")
|
||||
->andWhere("t2.vision NOT LIKE '%lite%'")
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取产品数据。
|
||||
* Get product list.
|
||||
@@ -411,6 +455,24 @@ class dataset
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取产品数据。
|
||||
* Get product list include shadow product.
|
||||
*
|
||||
* @param string $fieldList
|
||||
* @access public
|
||||
* @return PDOStatement
|
||||
*/
|
||||
public function getProductsWithShadow($fieldList)
|
||||
{
|
||||
return $this->dao->select($fieldList)
|
||||
->from(TABLE_PRODUCT)->alias('t1')
|
||||
->where('t1.deleted')->eq(0)
|
||||
->andWhere("t1.vision NOT LIKE '%or%'")
|
||||
->andWhere("t1.vision NOT LIKE '%lite%'")
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取项目数据。
|
||||
* Get all tasks.
|
||||
@@ -618,6 +680,14 @@ class dataset
|
||||
->query();
|
||||
}
|
||||
|
||||
/**
|
||||
* 统计合并请求信息。
|
||||
* Get merge request.
|
||||
*
|
||||
* @param string $fieldList
|
||||
* @access public
|
||||
* @return PDOStatement
|
||||
*/
|
||||
public function getMRs($fieldList)
|
||||
{
|
||||
return $this->dao->select($fieldList)->from(TABLE_MR)->alias('t1')
|
||||
|
||||
Reference in New Issue
Block a user