From 6cc041cd39c2a44eccbfb6bda1640b5ac6419989 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 27 Jun 2015 08:38:27 +0200
Subject: [PATCH] Fixed the chart generator.

---
 .../Chart/Account/AccountChartGenerator.php   | 19 ++++++
 .../Account/GoogleAccountChartGenerator.php   | 66 +++++++++++++++++++
 .../Controllers/Chart/AccountController.php   | 52 ++-------------
 3 files changed, 91 insertions(+), 46 deletions(-)

diff --git a/app/Generator/Chart/Account/AccountChartGenerator.php b/app/Generator/Chart/Account/AccountChartGenerator.php
index 6d72af2407..79b36e4bab 100644
--- a/app/Generator/Chart/Account/AccountChartGenerator.php
+++ b/app/Generator/Chart/Account/AccountChartGenerator.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace FireflyIII\Generator\Chart\Account;
+use FireflyIII\Models\Account;
 use Illuminate\Support\Collection;
 use Carbon\Carbon;
 
@@ -20,4 +21,22 @@ interface AccountChartGenerator
      * @return array
      */
     public function all(Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function frontpage(Collection $accounts, Carbon $start, Carbon $end);
+
+    /**
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return array
+     */
+    public function single(Account $account, Carbon $start, Carbon $end);
 }
\ No newline at end of file
diff --git a/app/Generator/Chart/Account/GoogleAccountChartGenerator.php b/app/Generator/Chart/Account/GoogleAccountChartGenerator.php
index c9561fbef1..02e238a964 100644
--- a/app/Generator/Chart/Account/GoogleAccountChartGenerator.php
+++ b/app/Generator/Chart/Account/GoogleAccountChartGenerator.php
@@ -3,6 +3,7 @@
 namespace FireflyIII\Generator\Chart\Account;
 
 use Carbon\Carbon;
+use FireflyIII\Models\Account;
 use Grumpydictator\Gchart\GChart;
 use Illuminate\Support\Collection;
 use Steam;
@@ -53,4 +54,69 @@ class GoogleAccountChartGenerator implements AccountChartGenerator
 
         return $chart->getData();
     }
+
+    /**
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return array
+     */
+    public function frontpage(Collection $accounts, Carbon $start, Carbon $end)
+    {
+        $chart = new GChart;
+        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+
+        $index = 1;
+        /** @var Account $account */
+        foreach ($accounts as $account) {
+            $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
+            $chart->addCertainty($index);
+            $index++;
+        }
+        $current = clone $start;
+        $current->subDay();
+        $today = Carbon::now();
+        while ($end >= $current) {
+            $row     = [clone $current];
+            $certain = $current < $today;
+            foreach ($accounts as $account) {
+                $row[] = Steam::balance($account, $current);
+                $row[] = $certain;
+            }
+            $chart->addRowArray($row);
+            $current->addDay();
+        }
+        $chart->generate();
+
+        return $chart->getData();
+    }
+
+    /**
+     * @param Account $account
+     * @param Carbon  $start
+     * @param Carbon  $end
+     *
+     * @return array
+     */
+    public function single(Account $account, Carbon $start, Carbon $end)
+    {
+        $current = clone $start;
+        $today   = new Carbon;
+        $chart   = new GChart;
+        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
+        $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
+        $chart->addCertainty(1);
+
+        while ($end >= $current) {
+            $certain = $current < $today;
+            $chart->addRow(clone $current, Steam::balance($account, $current), $certain);
+            $current->addDay();
+        }
+
+
+        $chart->generate();
+
+        return $chart->getData();
+    }
 }
\ No newline at end of file
diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 2fec3f2619..1ade8c629b 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -33,7 +33,7 @@ class AccountController extends Controller
     {
         parent::__construct();
         // create chart generator:
-        $generator = App::make('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
+        $this->generator = App::make('FireflyIII\Generator\Chart\Account\AccountChartGenerator');
     }
 
 
@@ -85,15 +85,12 @@ class AccountController extends Controller
     /**
      * Shows the balances for all the user's frontpage accounts.
      *
-     * @param GChart                     $chart
      * @param AccountRepositoryInterface $repository
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function frontpage(GChart $chart, AccountRepositoryInterface $repository)
+    public function frontpage(AccountRepositoryInterface $repository)
     {
-        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
-
         $frontPage = Preferences::get('frontPageAccounts', []);
         $start     = Session::get('start', Carbon::now()->startOfMonth());
         $end       = Session::get('end', Carbon::now()->endOfMonth());
@@ -109,30 +106,7 @@ class AccountController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-
-        $index = 1;
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
-            $chart->addCertainty($index);
-            $index++;
-        }
-        $current = clone $start;
-        $current->subDay();
-        $today = Carbon::now();
-        while ($end >= $current) {
-            $row     = [clone $current];
-            $certain = $current < $today;
-            foreach ($accounts as $account) {
-                $row[] = Steam::balance($account, $current);
-                $row[] = $certain;
-            }
-            $chart->addRowArray($row);
-            $current->addDay();
-        }
-        $chart->generate();
-
-        $data = $chart->getData();
+        $data = $this->generator->frontpage($accounts, $start, $end);
         $cache->store($data);
 
         return Response::json($data);
@@ -142,21 +116,16 @@ class AccountController extends Controller
     /**
      * Shows an account's balance for a single month.
      *
-     * @param GChart  $chart
      * @param Account $account
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function single(GChart $chart, Account $account)
+    public function single(Account $account)
     {
-        $chart->addColumn(trans('firefly.dayOfMonth'), 'date');
-        $chart->addColumn(trans('firefly.balanceFor', ['name' => $account->name]), 'number');
-        $chart->addCertainty(1);
+
 
         $start   = Session::get('start', Carbon::now()->startOfMonth());
         $end     = Session::get('end', Carbon::now()->endOfMonth());
-        $current = clone $start;
-        $today   = new Carbon;
 
         // chart properties for cache:
         $cache = new CacheProperties();
@@ -169,16 +138,7 @@ class AccountController extends Controller
             return Response::json($cache->get()); // @codeCoverageIgnore
         }
 
-        while ($end >= $current) {
-            $certain = $current < $today;
-            $chart->addRow(clone $current, Steam::balance($account, $current), $certain);
-            $current->addDay();
-        }
-
-
-        $chart->generate();
-
-        $data = $chart->getData();
+        $data = $this->generator->single($account, $start, $end);
         $cache->store($data);
 
         return Response::json($data);