kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix chart, uses new filter.

Browse Source
This commit is contained in:
James Cole
2024-05-20 06:55:36 +02:00
parent 79b91e25c2
commit bcb672920c
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Http/Api/ParsesQueryFilters.php
View File

@@ -34,8 +34,14 @@ trait ParsesQueryFilters
{ {
$date = today(); $date = today();
$value = $parameters->filter()?->value($field, date('Y-m-d'));
if(is_array($value)) {
Log::error(sprintf('Multiple values for date field "%s". Using first value.', $field));
$value = $value[0];
}
try { try {
$date = Carbon::createFromFormat('Y-m-d', $parameters->filter()?->value($field, date('Y-m-d')), config('app.timezone')); $date = Carbon::createFromFormat('Y-m-d', $value, config('app.timezone'));
} catch (InvalidFormatException $e) { } catch (InvalidFormatException $e) {
Log::debug(sprintf('Invalid date format in request. Using today: %s', $e->getMessage())); Log::debug(sprintf('Invalid date format in request. Using today: %s', $e->getMessage()));
} }

2
resources/assets/v2/src/api/v2/chart/account/dashboard.js
View File

@@ -25,7 +25,7 @@ export default class Dashboard {
dashboard(start, end) { dashboard(start, end) {
let startStr = format(start, 'y-MM-dd'); let startStr = format(start, 'y-MM-dd');
let endStr = format(end, 'y-MM-dd'); let endStr = format(end, 'y-MM-dd');
return api.get('/api/v2/chart/account/dashboard', {params: {start: startStr, end: endStr}}); return api.get('/api/v2/chart/account/dashboard', {params: {filter: {start: startStr, end: endStr}}});
} }
expense(start, end) { expense(start, end) {