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

First render of new budget charts.

Browse Source
This commit is contained in:
James Cole
2016-04-24 20:23:17 +02:00
parent 2cfbfd8649
commit 32c8ddbe1b
6 changed files with 105 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Navigation.php
View File

@@ -56,18 +56,18 @@ class Navigation
}
/**
* @param \Carbon\Carbon $theCurrentEnd
* @param \Carbon\Carbon $end
* @param $repeatFreq
*
* @return \Carbon\Carbon
* @throws FireflyException
*/
public function endOfPeriod(Carbon $theCurrentEnd, string $repeatFreq): Carbon
public function endOfPeriod(Carbon $end, string $repeatFreq): Carbon
{
$currentEnd = clone $theCurrentEnd;
$currentEnd = clone $end;
$functionMap = [
'1D' => 'addDay', 'daily' => 'addDay',
'1D' => 'endOfDay', 'daily' => 'endOfDay',
'1W' => 'addWeek', 'week' => 'addWeek', 'weekly' => 'addWeek',
'1M' => 'addMonth', 'month' => 'addMonth', 'monthly' => 'addMonth',
'3M' => 'addMonths', 'quarter' => 'addMonths', 'quarterly' => 'addMonths', '6M' => 'addMonths', 'half-year' => 'addMonths',