gh-mirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-21 02:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some often used long calls with shorter ones.

Browse Source
This commit is contained in:
James Cole
2014-11-21 19:33:09 +01:00
parent 43e738cb44
commit 6381408fba
8 changed files with 67 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/GoogleChartController.php
View File

@@ -29,7 +29,7 @@ class GoogleChartController extends BaseController
if ($current > Carbon::now()) {
$row[] = null;
} else {
$row[] = $account->balance($current);
$row[] = Steam::balance($account, $current);
}
$chart->addRowArray($row);
@@ -203,12 +203,7 @@ class GoogleChartController extends BaseController
$row = [clone $current];
foreach ($accounts as $account) {
//if ($current > Carbon::now()) {
// $row[] = 0;
//} else {
$row[] = $account->balance($current);
//}
$row[] = Steam::balance($account, $current);
}
$chart->addRowArray($row);
@@ -573,8 +568,7 @@ class GoogleChartController extends BaseController
/*
* Get end of period for $current:
*/
$currentEnd = clone $current;
DateKit::endOfPeriod($currentEnd, $entry->repeat_freq);
$currentEnd = DateKit::endOfPeriod($current, $entry->repeat_freq);
/*
* In the current session range?
@@ -599,7 +593,7 @@ class GoogleChartController extends BaseController
/*
* Add some time for the next loop!
*/
DateKit::addPeriod($current, $entry->repeat_freq, intval($entry->skip));
$current = DateKit::addPeriod($current, $entry->repeat_freq, intval($entry->skip));
}