From 5937dcc70db5cf5b302d49753aaa73df4af164a2 Mon Sep 17 00:00:00 2001
From: Alex <program.artweb@gmail.com>
Date: Mon, 20 Feb 2017 17:51:59 +0200
Subject: [PATCH] ga output

---
 app/library/App/Controllers/GaController.php | 82 +++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 49 insertions(+), 33 deletions(-)

diff --git a/app/library/App/Controllers/GaController.php b/app/library/App/Controllers/GaController.php
index da346b6..ad5b60d 100644
--- a/app/library/App/Controllers/GaController.php
+++ b/app/library/App/Controllers/GaController.php
@@ -34,6 +34,7 @@ class GaController extends CrudResourceController {
         $get_dimensions = $this->request->get('dimension');
         $get_start_date = $this->request->get('start') ?? '30daysAgo';
         $get_end_date = $this->request->get('end') ?? 'today';
+        $chart = $this->request->get('chart') ?? false;
 
         if (empty($view_id)) {
             $result = [];
@@ -51,38 +52,6 @@ class GaController extends CrudResourceController {
 
     }
 
-    public function printResults($reports) {
-        $res = '';
-        for ( $reportIndex = 0; $reportIndex < count( $reports ); $reportIndex++ ) {
-            $report = $reports[ $reportIndex ];
-            $header = $report->getColumnHeader();
-            $dimensionHeaders = $header->getDimensions();
-            $metricHeaders = $header->getMetricHeader()->getMetricHeaderEntries();
-            $rows = $report->getData()->getRows();
-
-            for ( $rowIndex = 0; $rowIndex < count($rows); $rowIndex++) {
-                $row = $rows[ $rowIndex ];
-                $dimensions = $row->getDimensions();
-                $metrics = $row->getMetrics();
-                for ($i = 0; $i < count($dimensionHeaders) && $i < count($dimensions); $i++) {
-                    print($dimensionHeaders[$i] . ": " . $dimensions[$i] . "\n");
-                }
-
-                for ($j = 0; $j < count( $metricHeaders ) && $j < count( $metrics ); $j++) {
-                    $entry = $metricHeaders[$j];
-                    $values = $metrics[$j];
-                    //print("Metric type: " . $entry->getType() . "\n" );
-                    for ( $valueIndex = 0; $valueIndex < count( $values->getValues() ); $valueIndex++ ) {
-                        $value = $values->getValues()[ $valueIndex ];
-                        $res .= "<b>" . $entry->getName() . "</b>: " . $value . '<br/>';
-                    }
-                }
-            }
-        }
-
-        return $res;
-    }
-
     public function sendGaRequest($project_name, $view, $get_metrics, $get_dimensions, $start, $end) {
 
         putenv('GOOGLE_APPLICATION_CREDENTIALS=/var/www/phalcon/'.self::SECRET_JSON);
@@ -135,6 +104,14 @@ class GaController extends CrudResourceController {
         $response = $response->toSimpleObject();
         $response = $response->reports[0]['data']['rows'];
 
+        $result = self::responseTransform($response, $project_name);
+
+        return ($result);
+
+    }
+
+    public static function responseTransform(array $response, $project_name) {
+
         $result = [];
 
         foreach ($response as $item) {
@@ -153,7 +130,46 @@ class GaController extends CrudResourceController {
             }
         }
 
-        return ($result);
+        return $result;
 
     }
+
+
+
+
+
+
+
+    public function printResults($reports) {
+        $res = '';
+        for ( $reportIndex = 0; $reportIndex < count( $reports ); $reportIndex++ ) {
+            $report = $reports[ $reportIndex ];
+            $header = $report->getColumnHeader();
+            $dimensionHeaders = $header->getDimensions();
+            $metricHeaders = $header->getMetricHeader()->getMetricHeaderEntries();
+            $rows = $report->getData()->getRows();
+
+            for ( $rowIndex = 0; $rowIndex < count($rows); $rowIndex++) {
+                $row = $rows[ $rowIndex ];
+                $dimensions = $row->getDimensions();
+                $metrics = $row->getMetrics();
+                for ($i = 0; $i < count($dimensionHeaders) && $i < count($dimensions); $i++) {
+                    print($dimensionHeaders[$i] . ": " . $dimensions[$i] . "\n");
+                }
+
+                for ($j = 0; $j < count( $metricHeaders ) && $j < count( $metrics ); $j++) {
+                    $entry = $metricHeaders[$j];
+                    $values = $metrics[$j];
+                    //print("Metric type: " . $entry->getType() . "\n" );
+                    for ( $valueIndex = 0; $valueIndex < count( $values->getValues() ); $valueIndex++ ) {
+                        $value = $values->getValues()[ $valueIndex ];
+                        $res .= "<b>" . $entry->getName() . "</b>: " . $value . '<br/>';
+                    }
+                }
+            }
+        }
+
+        return $res;
+    }
+
 }
\ No newline at end of file
--
libgit2 0.21.4