From 52d637e25e458557d057769e84e930edeb59c1af Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 31 Jul 2014 07:37:46 +0200 Subject: [PATCH] Fixes for timezone [skip ci] --- app/controllers/ChartController.php | 5 +++++ app/lib/Firefly/Helper/Controllers/Chart.php | 2 ++ 2 files changed, 7 insertions(+) diff --git a/app/controllers/ChartController.php b/app/controllers/ChartController.php index 6e8388241c..0c776e55ab 100644 --- a/app/controllers/ChartController.php +++ b/app/controllers/ChartController.php @@ -34,6 +34,10 @@ class ChartController extends BaseController $start = Session::get('start'); $end = Session::get('end'); + \Log::debug('Draw home account chart.'); + \Log::debug('From: '.$start.' ('.$start->timezone.')'); + \Log::debug('Until: '.$end); + if (is_null($account)) { // get, depending on preferences: /** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $prefs */ @@ -59,6 +63,7 @@ class ChartController extends BaseController ]; foreach ($accounts as $account) { + \Log::debug('Now building series for ' . $account->name); $data['series'][] = $this->_chart->account($account, $start, $end); } diff --git a/app/lib/Firefly/Helper/Controllers/Chart.php b/app/lib/Firefly/Helper/Controllers/Chart.php index 0d6c7e3ea6..614847912a 100644 --- a/app/lib/Firefly/Helper/Controllers/Chart.php +++ b/app/lib/Firefly/Helper/Controllers/Chart.php @@ -19,7 +19,9 @@ class Chart implements ChartInterface $current = clone $start; $today = new Carbon; $return = ['name' => $account->name, 'id' => $account->id, 'data' => []]; + while ($current <= $end) { + \Log::debug('Now at day: ' . $current . '('.$current->timestamp.'), ('.($current->timestamp * 1000).') '); if ($current > $today) { $return['data'][] = [$current->timestamp * 1000, $account->predict(clone $current)]; } else {