kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Budget report cleaned up and multi-currency.

Browse Source
This commit is contained in:
James Cole
2019-09-02 20:30:47 +02:00
parent 0fd7e4363d
commit 771cf73171
11 changed files with 487 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Generator/Chart/Basic/ChartJsGenerator.php
View File

@@ -185,6 +185,7 @@ class ChartJsGenerator implements GeneratorInterface
// make larger than 0
$chartData['datasets'][0]['data'][] = (float)app('steam')->positive((string)$value);
$chartData['datasets'][0]['backgroundColor'][] = ChartColour::getColour($index);
$chartData['labels'][] = $key;
++$index;
}

2
app/Generator/Report/Budget/MonthReportGenerator.php
View File

@@ -79,7 +79,7 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface
->render();
} catch (Throwable $e) {
Log::error(sprintf('Cannot render reports.account.report: %s', $e->getMessage()));
$result = 'Could not render report view.';
$result = sprintf('Could not render report view: %s', $e->getMessage());
}
return $result;