IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-11-28 03:34:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix redraw bug in category report.

Browse Source
This commit is contained in:
James Cole 2016-11-12 12:23:55 +01:00
parent c5d2fabfec
commit 85b3c4683b
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/js/ff/charts.js
View File

@ -91,7 +91,9 @@ var defaultPieOptions = {
return data.labels[tooltipItem.index] + ': ' + accounting.formatMoney(value); return data.labels[tooltipItem.index] + ': ' + accounting.formatMoney(value);
} }
} }
} },
maintainAspectRatio: true,
responsive: true
}; };

7
resources/lang/en_US/firefly.php
View File

@ -624,6 +624,7 @@ return [
// reports: // reports:
'report_default' => 'Default financial report for :start until :end', 'report_default' => 'Default financial report for :start until :end',
'report_audit' => 'Transaction history overview 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_reports' => 'Quick links',
'quick_link_default_report' => 'Default financial report', 'quick_link_default_report' => 'Default financial report',
'quick_link_audit_report' => 'Transaction history overview', 'quick_link_audit_report' => 'Transaction history overview',
@ -689,6 +690,12 @@ return [
'reports_submit' => 'View report', 'reports_submit' => 'View report',
'end_after_start_date' => 'End date of report must be after start date.', 'end_after_start_date' => 'End date of report must be after start date.',
'select_category' => 'Select one or more categories.', '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: // charts:
'chart' => 'Chart', 'chart' => 'Chart',

37
resources/views/reports/category/month.twig
View File

@ -7,7 +7,7 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4 col-md-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'accounts'|_ }}</h3> <h3 class="box-title">{{ 'accounts'|_ }}</h3>
@ -89,66 +89,67 @@
</div> </div>
</div> </div>
{% if categories.count > 1 %} {% if categories.count > 1 %}
<div class="col-lg-2"> <div class="col-lg-2 col-md-3">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'income_per_category'|_ }}</h3> <h3 class="box-title">{{ 'income_per_category'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<canvas id="categories-in-pie-chart" style="width:100px;height:100px;" height="100"></canvas> <canvas id="categories-in-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
<label> <label style="font-weight:normal;">
<input type="checkbox" id="categories-in-pie-chart-checked"> Include transactions not in these categories <input type="checkbox" id="categories-in-pie-chart-checked"> <small>{{ 'include_not_in_category'|_ }}</small>
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2 col-md-3">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'expense_per_category'|_ }}</h3> <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<canvas id="categories-out-pie-chart" style="width:100px;height:100px;" height="100"></canvas> <canvas id="categories-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
<label> <label style="font-weight:normal;">
<input type="checkbox" id="categories-out-pie-chart-checked"> Include transactions not in these categories <input type="checkbox" id="categories-out-pie-chart-checked"> <small>{{ 'include_not_in_category'|_ }}</small>
</label> </label>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if accounts.count > 1 %} {% if accounts.count > 1 %}
<div class="col-lg-2"> <div class="col-lg-2 col-md-3">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'income_per_account'|_ }}</h3> <h3 class="box-title">{{ 'income_per_account'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<canvas id="accounts-in-pie-chart" style="width:100px;height:100px;" height="100"></canvas> <canvas id="accounts-in-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
<label> <label style="font-weight:normal;">
<input type="checkbox" id="accounts-in-pie-chart-checked"> Include transactions not in these categories <input type="checkbox" id="accounts-in-pie-chart-checked"> <small>{{ 'include_not_in_category'|_ }}</small>
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<div class="col-lg-2"> <div class="col-lg-2 col-md-3">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title">{{ 'expense_per_account'|_ }}</h3> <h3 class="box-title">{{ 'expense_per_account'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
<canvas id="accounts-out-pie-chart" style="width:100px;height:100px;" height="100"></canvas> <canvas id="accounts-out-pie-chart" style="margin:0 auto;" height="150" width="150"></canvas>
<label> <label style="font-weight:normal;">
<input type="checkbox" id="accounts-out-pie-chart-checked"> Include transactions not in these categories <input type="checkbox" id="accounts-out-pie-chart-checked"> <small>{{ 'include_not_in_category'|_ }}</small>
</label> </label>
</div> </div>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{#Pie chart with income (aka all deposits in category). Optional checkbox to include all other transactions (for comparison).#}
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
big chart here big chart here
Show income / expenses per period. Differs per report: month = per day, year = per month, multi-year = per year. Show income / expenses per period. Differs per report: month = per day, year = per month, multi-year = per year.