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

Fix #10702

Browse Source
This commit is contained in:
Sander Dorigo
2025-08-05 11:02:26 +02:00
parent 9804cffff3
commit ccfc75852a
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Chart/CategoryReportController.php
View File

@@ -210,7 +210,6 @@ class CategoryReportController extends Controller
$spent = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection([$category])); $spent = $this->opsRepository->listExpenses($start, $end, $accounts, new Collection([$category]));
$earned = $this->opsRepository->listIncome($start, $end, $accounts, new Collection([$category])); $earned = $this->opsRepository->listIncome($start, $end, $accounts, new Collection([$category]));
$format = app('navigation')->preferredCarbonLocalizedFormat($start, $end); $format = app('navigation')->preferredCarbonLocalizedFormat($start, $end);
// loop expenses. // loop expenses.
foreach ($spent as $currency) { foreach ($spent as $currency) {
// add things to chart Data for each currency: // add things to chart Data for each currency:
@@ -286,7 +285,6 @@ class CategoryReportController extends Controller
$currentStart = clone $currentEnd; $currentStart = clone $currentEnd;
$currentStart->addDay()->startOfDay(); $currentStart->addDay()->startOfDay();
} }
return $return; return $return;
} }

20
app/Support/Navigation.php
View File

@@ -565,11 +565,12 @@ class Navigation
public function preferredCarbonLocalizedFormat(Carbon $start, Carbon $end): string public function preferredCarbonLocalizedFormat(Carbon $start, Carbon $end): string
{ {
$locale = app('steam')->getLocale(); $locale = app('steam')->getLocale();
if ($start->diffInMonths($end, true) > 1) { $diff = $start->diffInMonths($end, true);
if ($diff >= 1.001) {
return (string) trans('config.month_js', [], $locale); return (string) trans('config.month_js', [], $locale);
} }
if ($start->diffInMonths($end, true) > 12) { if ($diff >= 12.001) {
return (string) trans('config.year_js', [], $locale); return (string) trans('config.year_js', [], $locale);
} }
@@ -582,11 +583,12 @@ class Navigation
*/ */
public function preferredEndOfPeriod(Carbon $start, Carbon $end): string public function preferredEndOfPeriod(Carbon $start, Carbon $end): string
{ {
if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) { $diff = $start->diffInMonths($end, true);
if ($diff >= 1.001) {
return 'endOfMonth'; return 'endOfMonth';
} }
if ((int) $start->diffInMonths($end, true) > 12) { if ($diff >= 12.001) {
return 'endOfYear'; return 'endOfYear';
} }
@@ -599,11 +601,12 @@ class Navigation
*/ */
public function preferredRangeFormat(Carbon $start, Carbon $end): string public function preferredRangeFormat(Carbon $start, Carbon $end): string
{ {
if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) { $diff = $start->diffInMonths($end, true);
if ($diff >= 1.001) {
return '1M'; return '1M';
} }
if ((int) $start->diffInMonths($end, true) > 12) { if ($diff >= 12.001) {
return '1Y'; return '1Y';
} }
@@ -616,11 +619,12 @@ class Navigation
*/ */
public function preferredSqlFormat(Carbon $start, Carbon $end): string public function preferredSqlFormat(Carbon $start, Carbon $end): string
{ {
if ((int) $start->diffInMonths($end, true) > 1 && (int) $start->diffInMonths($end, true) <= 12) { $diff = $start->diffInMonths($end, true);
if ($diff >= 1.001) {
return '%Y-%m'; return '%Y-%m';
} }
if ((int) $start->diffInMonths($end, true) > 12) { if ($diff >= 12.001) {
return '%Y'; return '%Y';
} }