diff --git a/module/report/config.php b/module/report/config.php index ef44d7a72f..2078f1261f 100644 --- a/module/report/config.php +++ b/module/report/config.php @@ -50,6 +50,11 @@ $config->report->annualData['radar']['case']['run'] = array('qa'); $config->report->annualData['radar']['testtask']['create'] = array('qa'); $config->report->annualData['radar']['testtask']['edit'] = array('qa'); +$config->report->annualData['monthAction']['story'] = array('opened', 'activated', 'closed', 'changed', 'fromfeedback', 'fromticket'); +$config->report->annualData['monthAction']['task'] = array('opened', 'started', 'finished', 'paused', 'activated', 'canceled', 'closed', 'fromfeedback'); +$config->report->annualData['monthAction']['bug'] = array('opened', 'bugconfirmed', 'activated', 'resolved', 'closed', 'fromfeedback', 'fromticket'); +$config->report->annualData['monthAction']['case'] = array('opened', 'run', 'createBug'); + $config->report->annualData['month']['story'] = array('opened' => 'create', 'activated' => 'activate', 'closed' => 'close', 'changed' => 'change'); $config->report->annualData['month']['task'] = array('opened' => 'create', 'started' => 'start', 'finished' => 'finish', 'paused' => 'pause', 'activated' => 'activate', 'canceled' => 'cancel', 'closed' => 'close'); $config->report->annualData['month']['bug'] = array('opened' => 'create', 'bugconfirmed' => 'confirm', 'activated' => 'activate', 'resolved' => 'resolve', 'closed' => 'close'); diff --git a/module/report/model.php b/module/report/model.php index d9e93fd9b7..a8a87792c1 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -946,7 +946,7 @@ class reportModel extends model ->where('t1.objectType')->eq($objectType) ->andWhere('t2.deleted')->eq(0) ->andWhere('LEFT(t1.date, 4)')->eq($year) - ->andWhere('t1.action')->in(array_keys($this->config->report->annualData['month'][$objectType])) + ->andWhere('t1.action')->in($this->config->report->annualData['monthAction'][$objectType]) ->beginIF($accounts)->andWhere('t1.actor')->in($accounts)->fi() ->query(); @@ -958,6 +958,8 @@ class reportModel extends model $statuses[$action->objectID] = $action->status; $lowerAction = strtolower($action->action); + /* Story,bug can from feedback and ticket, task can from feedback, boil this action down to opened. */ + if(in_array($lowerAction, array('fromfeedback', 'fromticket'))) $lowerAction = 'opened'; if(!isset($actionStat[$lowerAction])) { foreach($months as $month) $actionStat[$lowerAction][$month] = 0; diff --git a/module/report/view/annualdata.html.php b/module/report/view/annualdata.html.php index 68c95a9617..4f25586c36 100644 --- a/module/report/view/annualdata.html.php +++ b/module/report/view/annualdata.html.php @@ -322,7 +322,7 @@ $(function() controlStyle: { itemSize: 18, }, - + }, tooltip: {}, series: [{