diff --git a/public/js/ff/charts.js b/public/js/ff/charts.js index 07ea8ca68c..6478a8bf5e 100644 --- a/public/js/ff/charts.js +++ b/public/js/ff/charts.js @@ -91,7 +91,9 @@ var defaultPieOptions = { return data.labels[tooltipItem.index] + ': ' + accounting.formatMoney(value); } } - } + }, + maintainAspectRatio: true, + responsive: true }; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 2cc9fae536..058a239131 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -624,6 +624,7 @@ return [ // reports: 'report_default' => 'Default financial report for :start until :end', 'report_audit' => 'Transaction history overview for :start until :end', + 'report_category' => 'Category report for :start until :end', 'quick_link_reports' => 'Quick links', 'quick_link_default_report' => 'Default financial report', 'quick_link_audit_report' => 'Transaction history overview', @@ -689,6 +690,12 @@ return [ 'reports_submit' => 'View report', 'end_after_start_date' => 'End date of report must be after start date.', 'select_category' => 'Select one or more categories.', + 'income_per_category' => 'Income per category', + 'expense_per_category' => 'Expense per category', + 'income_per_account' => 'Income per account', + 'expense_per_account' => 'Expense per account', + 'include_not_in_category' => 'Include transactions not selected for this report', + 'everything_else' => 'Everything else', // charts: 'chart' => 'Chart', diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig index 9308f9f440..4a7ca59700 100644 --- a/resources/views/reports/category/month.twig +++ b/resources/views/reports/category/month.twig @@ -7,7 +7,7 @@ {% block content %}
-
+

{{ 'accounts'|_ }}

@@ -89,66 +89,67 @@
{% if categories.count > 1 %} -
+

{{ 'income_per_category'|_ }}

- -
-
+

{{ 'expense_per_category'|_ }}

- -
{% endif %} {% if accounts.count > 1 %} -
+

{{ 'income_per_account'|_ }}

- -
-
+

{{ 'expense_per_account'|_ }}

- -
{% endif %} - {#Pie chart with income (aka all deposits in category). Optional checkbox to include all other transactions (for comparison).#}
+ + big chart here Show income / expenses per period. Differs per report: month = per day, year = per month, multi-year = per year.