AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CFD chart (stack wrongly ordered)

Browse Source
This commit is contained in:
Frederic Guillot
2017-02-11 19:42:17 -05:00
parent 2c45096411
commit c5caff7ef7
9 changed files with 53 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Controller/AnalyticController.php
View File

@@ -143,17 +143,18 @@ class AnalyticController extends BaseController
$project = $this->getProject();
list($from, $to) = $this->getDates();
$display_graph = $this->projectDailyColumnStatsModel->countDays($project['id'], $from, $to) >= 2;
$displayGraph = $this->projectDailyColumnStatsModel->countDays($project['id'], $from, $to) >= 2;
$metrics = $displayGraph ? $this->projectDailyColumnStatsModel->getAggregatedMetrics($project['id'], $from, $to, $column) : array();
$this->response->html($this->helper->layout->analytic($template, array(
'values' => array(
'values' => array(
'from' => $from,
'to' => $to,
'to' => $to,
),
'display_graph' => $display_graph,
'metrics' => $display_graph ? $this->projectDailyColumnStatsModel->getAggregatedMetrics($project['id'], $from, $to, $column) : array(),
'project' => $project,
'title' => $title,
'display_graph' => $displayGraph,
'metrics' => $metrics,
'project' => $project,
'title' => $title,
)));
}