IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-03 12:47:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Catch the latest exceptions for #170.

Browse Source
This commit is contained in:
James Cole 2016-02-05 07:16:55 +01:00
parent bb8ce30552
commit 6f9675b6d6
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Support/Navigation.php
View File

@ -82,6 +82,20 @@ class Navigation
$subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'year', 'yearly']; $subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'year', 'yearly'];
// if the range is custom, the end of the period
// is another X days (x is the difference between start)
// and end added to $theCurrentEnd
if ($repeatFreq == 'custom') {
/** @var Carbon $tStart */
$tStart = session('start', Carbon::now()->startOfMonth());
/** @var Carbon $tEnd */
$tEnd = session('end', Carbon::now()->endOfMonth());
$diffInDays = $tStart->diffInDays($tEnd);
$currentEnd->addDays($diffInDays);
return $currentEnd;
}
if (!isset($functionMap[$repeatFreq])) { if (!isset($functionMap[$repeatFreq])) {
throw new FireflyException('Cannot do endOfPeriod for $repeat_freq "' . $repeatFreq . '"'); throw new FireflyException('Cannot do endOfPeriod for $repeat_freq "' . $repeatFreq . '"');
} }
@ -152,6 +166,7 @@ class Navigation
$formatMap = [ $formatMap = [
'1D' => '%e %B %Y', '1D' => '%e %B %Y',
'daily' => '%e %B %Y', 'daily' => '%e %B %Y',
'custom' => '%e %B %Y',
'1W' => 'Week %W, %Y', '1W' => 'Week %W, %Y',
'week' => 'Week %W, %Y', 'week' => 'Week %W, %Y',
'weekly' => 'Week %W, %Y', 'weekly' => 'Week %W, %Y',