kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Fixes for timezone [skip ci]

Browse Source
This commit is contained in:
James Cole
2014-07-31 07:37:46 +02:00
parent a41fb81446
commit 52d637e25e
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/ChartController.php
View File

@@ -34,6 +34,10 @@ class ChartController extends BaseController
$start = Session::get('start'); $start = Session::get('start');
$end = Session::get('end'); $end = Session::get('end');
\Log::debug('Draw home account chart.');
\Log::debug('From: '.$start.' ('.$start->timezone.')');
\Log::debug('Until: '.$end);
if (is_null($account)) { if (is_null($account)) {
// get, depending on preferences: // get, depending on preferences:
/** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $prefs */ /** @var \Firefly\Helper\Preferences\PreferencesHelperInterface $prefs */
@@ -59,6 +63,7 @@ class ChartController extends BaseController
]; ];
foreach ($accounts as $account) { foreach ($accounts as $account) {
\Log::debug('Now building series for ' . $account->name);
$data['series'][] = $this->_chart->account($account, $start, $end); $data['series'][] = $this->_chart->account($account, $start, $end);
} }

2
app/lib/Firefly/Helper/Controllers/Chart.php
View File

@@ -19,7 +19,9 @@ class Chart implements ChartInterface
$current = clone $start; $current = clone $start;
$today = new Carbon; $today = new Carbon;
$return = ['name' => $account->name, 'id' => $account->id, 'data' => []]; $return = ['name' => $account->name, 'id' => $account->id, 'data' => []];
while ($current <= $end) { while ($current <= $end) {
\Log::debug('Now at day: ' . $current . '('.$current->timestamp.'), ('.($current->timestamp * 1000).') ');
if ($current > $today) { if ($current > $today) {
$return['data'][] = [$current->timestamp * 1000, $account->predict(clone $current)]; $return['data'][] = [$current->timestamp * 1000, $account->predict(clone $current)];
} else { } else {