From c5caff7ef79f1440ff26c84eed2dbc8254122f36 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 11 Feb 2017 19:42:17 -0500
Subject: Fix CFD chart (stack wrongly ordered)

---
 app/Controller/AnalyticController.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/Controller/AnalyticController.php b/app/Controller/AnalyticController.php
index 38169fd7..a30041b2 100644
--- a/app/Controller/AnalyticController.php
+++ b/app/Controller/AnalyticController.php
@@ -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,
         )));
     }
 
-- 
cgit v1.2.3