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

A fix for #971

Browse Source
This commit is contained in:
James Cole
2017-11-01 15:34:08 +01:00
parent d20b750722
commit 80897be6c9
2 changed files with 13 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Http/Controllers/JavascriptController.php
View File

@@ -142,26 +142,23 @@ class JavascriptController extends Controller
]; ];
Log::debug(sprintf('viewRange is %s', $viewRange)); Log::debug(sprintf('viewRange is %s', $viewRange));
// get the format for the ranges:
$format = $this->getFormatByRange($viewRange);
// when current range is a custom range, add the current period as the next range. // when current range is a custom range, add the current period as the next range.
if ($isCustom) { if ($isCustom) {
Log::debug('Custom is true.'); Log::debug('Custom is true.');
$index = $start->formatLocalized($format); $index = Navigation::periodShow($start, $viewRange);
$customPeriodStart = Navigation::startOfPeriod($start, $viewRange); $customPeriodStart = Navigation::startOfPeriod($start, $viewRange);
$customPeriodEnd = Navigation::endOfPeriod($customPeriodStart, $viewRange); $customPeriodEnd = Navigation::endOfPeriod($customPeriodStart, $viewRange);
$ranges[$index] = [$customPeriodStart, $customPeriodEnd]; $ranges[$index] = [$customPeriodStart, $customPeriodEnd];
} }
// then add previous range and next range // then add previous range and next range
$previousDate = Navigation::subtractPeriod($start, $viewRange); $previousDate = Navigation::subtractPeriod($start, $viewRange);
$index = $previousDate->formatLocalized($format); $index = Navigation::periodShow($previousDate, $viewRange);
$previousStart = Navigation::startOfPeriod($previousDate, $viewRange); $previousStart = Navigation::startOfPeriod($previousDate, $viewRange);
$previousEnd = Navigation::endOfPeriod($previousStart, $viewRange); $previousEnd = Navigation::endOfPeriod($previousStart, $viewRange);
$ranges[$index] = [$previousStart, $previousEnd]; $ranges[$index] = [$previousStart, $previousEnd];
$nextDate = Navigation::addPeriod($start, $viewRange, 0); $nextDate = Navigation::addPeriod($start, $viewRange, 0);
$index = $nextDate->formatLocalized($format); $index = Navigation::periodShow($nextDate, $viewRange);
$nextStart = Navigation::startOfPeriod($nextDate, $viewRange); $nextStart = Navigation::startOfPeriod($nextDate, $viewRange);
$nextEnd = Navigation::endOfPeriod($nextStart, $viewRange); $nextEnd = Navigation::endOfPeriod($nextStart, $viewRange);
$ranges[$index] = [$nextStart, $nextEnd]; $ranges[$index] = [$nextStart, $nextEnd];
@@ -188,33 +185,4 @@ class JavascriptController extends Controller
return $return; return $return;
} }
private function getFormatByRange(string $viewRange): string
{
switch ($viewRange) {
default:
throw new FireflyException(sprintf('The date picker does not yet support "%s".', $viewRange)); // @codeCoverageIgnore
case '1D':
case 'custom':
$format = (string)trans('config.month_and_day');
break;
case '3M':
$format = (string)trans('config.quarter_of_year');
break;
case '6M':
$format = (string)trans('config.half_year');
break;
case '1Y':
$format = (string)trans('config.year');
break;
case '1M':
$format = (string)trans('config.month');
break;
case '1W':
$format = (string)trans('config.week_in_year');
break;
}
return $format;
}
} }

12
app/Support/Navigation.php
View File

@@ -241,8 +241,8 @@ class Navigation
'1W' => trans('config.week_in_year'), '1W' => trans('config.week_in_year'),
'week' => trans('config.week_in_year'), 'week' => trans('config.week_in_year'),
'weekly' => trans('config.week_in_year'), 'weekly' => trans('config.week_in_year'),
'3M' => trans('config.quarter_of_year'), //'3M' => trans('config.quarter_of_year'),
'quarter' => trans('config.quarter_of_year'), //'quarter' => trans('config.quarter_of_year'),
'1M' => trans('config.month'), '1M' => trans('config.month'),
'month' => trans('config.month'), 'month' => trans('config.month'),
'monthly' => trans('config.month'), 'monthly' => trans('config.month'),
@@ -253,10 +253,16 @@ class Navigation
]; ];
if (isset($formatMap[$repeatFrequency])) { if (isset($formatMap[$repeatFrequency])) {
return $date->formatLocalized(strval($formatMap[$repeatFrequency])); return $date->formatLocalized(strval($formatMap[$repeatFrequency]));
} }
if ($repeatFrequency === '3M' || $repeatFrequency === 'quarter') {
$quarter = ceil($theDate->month / 3);
return sprintf('Q%d %d', $quarter, $theDate->year);
}
// special formatter for quarter of year
throw new FireflyException(sprintf('No date formats for frequency "%s"!', $repeatFrequency)); throw new FireflyException(sprintf('No date formats for frequency "%s"!', $repeatFrequency));
} }