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

First attempt at functional category chart.

Browse Source
This commit is contained in:
James Cole
2015-12-16 13:08:26 +01:00
parent 6a8bf0aa62
commit 1b3d208540
12 changed files with 390 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
resources/lang/en/firefly.php
View File

@@ -374,16 +374,16 @@ return [
// 'reportForMonth' => 'Montly report for :month',
// 'reportForMonthShared' => 'Montly report for :month (including shared accounts)',
'report_default' => 'Default financial report for :start until :end',
'quick_link_reports' => 'Quick links',
'quick_link_default_report' => 'Default financial report',
'report_this_month_shared' => 'Current month, all shared accounts',
'report_this_month_non_shared' => 'Current month, all not-shared accounts',
'report_this_year_shared' => 'Current year, all shared accounts',
'report_this_year_non_shared' => 'Current year, all not-shared accounts',
'report_all_time_shared' => 'All-time, all shared accounts',
'report_all_time_non_shared' => 'All-time, all not-shared accounts',
'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
'report_default' => 'Default financial report for :start until :end',
'quick_link_reports' => 'Quick links',
'quick_link_default_report' => 'Default financial report',
'report_this_month_shared' => 'Current month, all shared accounts',
'report_this_month_non_shared' => 'Current month, all not-shared accounts',
'report_this_year_shared' => 'Current year, all shared accounts',
'report_this_year_non_shared' => 'Current year, all not-shared accounts',
'report_all_time_shared' => 'All-time, all shared accounts',
'report_all_time_non_shared' => 'All-time, all not-shared accounts',
'reports_can_bookmark' => 'Remember that reports can be bookmarked.',
'incomeVsExpenses' => 'Income vs. expenses',
'accountBalances' => 'Account balances',
'balanceStartOfYear' => 'Balance at start of year',
@@ -402,6 +402,7 @@ return [
'outsideOfBudgets' => 'Outside of budgets',
'leftInBudget' => 'Left in budget',
'sumOfSums' => 'Sum of sums',
'noCategory' => '(no category)',
'notCharged' => 'Not charged (yet)',
'inactive' => 'Inactive',
'difference' => 'Difference',

1
resources/lang/nl/firefly.php
View File

@@ -417,6 +417,7 @@ return [
'outsideOfBudgets' => 'Buiten budgetten',
'leftInBudget' => 'Over van budget',
'sumOfSums' => 'Alles bij elkaar',
'noCategory' => '(zonder categorie)',
'notCharged' => '(Nog) niet betaald',
'inactive' => 'Niet actief',
'difference' => 'Verschil',

8
resources/twig/reports/default/multi-year.twig
View File

@@ -85,14 +85,20 @@
<div class="box-body">
<div class="row">
<div class="col-lg-12">
<p class="well" id="categories-chart-message" style="display:none;">
Select one or more categories to generate this chart. Insofar possible, your selection will be saved.
</p>
<canvas id="categories-chart" class="categories-chart" style="width:100%;height:400px;"></canvas>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<label class="checkbox-inline">
<input type="checkbox" class="category-checkbox" name="categories[]" value="0"> {{ 'noCategory'|_ }}
</label>
{% for category in categories %}
<label class="checkbox-inline">
<input type="checkbox" name="categories[]" value="{{ category.id }}"> {{ category.name }}
<input type="checkbox" name="categories[]" class="category-checkbox" value="{{ category.id }}"> {{ category.name }}
</label>
{% endfor %}
</div>