kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-19 10:53:31 +00:00
Code Issues Projects Releases Wiki Activity

Moved to high charts.

Browse Source
This commit is contained in:
James Cole
2014-07-15 06:58:08 +02:00
parent 6e7ea89c70
commit 0e09e52e45
26 changed files with 2055 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
app/lib/Firefly/Helper/Toolkit/Toolkit.php
View File

@@ -17,25 +17,68 @@ class Toolkit implements ToolkitInterface
public static function getDateRange()
{
$preferences = \App::make('Firefly\Helper\Preferences\PreferencesHelperInterface');
$viewRange = $preferences->get('viewRange', 'week');
$viewRange = $preferences->get('viewRange', '1M');
// as you can see, this method now only supports "right now":
$now = new \Carbon\Carbon;
$start = clone $now;
$end = clone $now;
// default range:
$range = $viewRange->data;
// update range if session has something:
if (!is_null(\Session::get('range'))) {
$range = \Session::get('range');
}
switch ($viewRange->data) {
case 'week':
// update view range if the input has something:
if (!is_null(\Input::get('range'))) {
$range = \Input::get('range');
}
// switch $range, update range or something:
$today = new \Carbon\Carbon;
$start = clone $today;
$end = clone $today;
switch ($range) {
case 'custom':
// when range is custom AND input, we ignore $today
if (\Input::get('start') && \Input::get('end')) {
$start = new \Carbon\Carbon(\Input::get('start'));
$end = new \Carbon\Carbon(\Input::get('end'));
} else {
$start = \Session::get('start');
$end = \Session::get('end');
}
break;
case '1D':
$start->startOfDay();
$end->endOfDay();
break;
case '1W':
$start->startOfWeek();
$end->endOfWeek();
break;
default:
case 'month':
case '1M':
$start->startOfMonth();
$end->endOfMonth();
break;
case '3M':
$start->firstOfQuarter();
$end->lastOfQuarter();
break;
case '6M':
if (intval($today->format('m')) >= 7) {
$start->startOfYear()->addMonths(6);
$end->endOfYear();
} else {
$start->startOfYear();
$end->startOfYear()->addMonths(6);
}
break;
}
// save in session:
\Session::put('start', $start);
\Session::put('end', $end);
\Session::put('range', $range);
// and return:
return [$start, $end];