IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Updated chart.

Browse Source
This commit is contained in:
James Cole 2014-07-31 10:11:02 +02:00
parent 52d637e25e
commit e0ed0cbeb2
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,7 +180,13 @@ class Chart implements ChartInterface
case '6M': case '6M':
$beginning->subYears(6); $beginning->subYears(6);
break; break;
case 'custom':
$diff = $start->diff($end);
$days = $diff->days;
$beginning->subDays(12 * $days);
break;
} }
// loop over the periods: // loop over the periods:
while ($beginning <= $start) { while ($beginning <= $start) {
// increment currentEnd to fit beginning: // increment currentEnd to fit beginning:
@ -203,9 +209,17 @@ class Chart implements ChartInterface
break; break;
case '6M': case '6M':
$currentEnd->addMonths(6)->subDay(); $currentEnd->addMonths(6)->subDay();
break;
case 'custom':
$diff = $start->diff($end);
$days = $diff->days;
$days = $days == 1 ? 2 : $days;
$currentEnd->addDays($days)->subDay();
break;
} }
// now format the current range: // now format the current range:
$title = ''; $title = '';
switch ($range) { switch ($range) {
@ -225,11 +239,15 @@ class Chart implements ChartInterface
case '6M': case '6M':
$title = $beginning->format('M Y') . ' - ' . $currentEnd->format('M Y'); $title = $beginning->format('M Y') . ' - ' . $currentEnd->format('M Y');
break; break;
case 'custom':
$title = $beginning->format('d-m-Y').' - '.$currentEnd->format('d-m-Y');
break;
case 'yearly': case 'yearly':
// return $this->startdate->format('Y'); // return $this->startdate->format('Y');
break; break;
} }
// get sum for current range: // get sum for current range:
$journals = \TransactionJournal:: $journals = \TransactionJournal::
with( with(
@ -279,6 +297,13 @@ class Chart implements ChartInterface
case '6M': case '6M':
$beginning->addMonths(6); $beginning->addMonths(6);
break; break;
case 'custom':
$diff = $start->diff($end);
$days = $diff->days;
$beginning->addDays($days);
break;
} }
} }
return $data; return $data;