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

Final code for #384

Browse Source
This commit is contained in:
James Cole
2017-12-12 18:22:29 +01:00
parent cacd889193
commit 1b4edae4d9
26 changed files with 526 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/reports/account/report.twig
View File

@@ -127,7 +127,7 @@
</script>
<script type="text/javascript" src="js/ff/reports/account/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/account/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

1
resources/views/reports/audit/report.twig
View File

@@ -86,5 +86,6 @@
<script type="text/javascript">
var hideable = {{ hideable|json_encode|raw }};
</script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/audit/all.js?v={{ FF_VERSION }}"></script>
{% endblock %}

2
resources/views/reports/budget/month.twig
View File

@@ -260,7 +260,7 @@
</script>
<script type="text/javascript" src="js/ff/reports/budget/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/budget/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

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

@@ -397,7 +397,7 @@
</script>
<script type="text/javascript" src="js/ff/reports/category/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/category/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

1
resources/views/reports/default/month.twig
View File

@@ -171,6 +171,7 @@
var accountChartUri = '{{ route('chart.account.report', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
</script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

1
resources/views/reports/default/multi-year.twig
View File

@@ -222,6 +222,7 @@
var categoryIncomeUri = '{{ route('report-data.category.income', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
</script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/multi-year.js?v={{ FF_VERSION }}"></script>
{% endblock %}

2
resources/views/reports/default/year.twig
View File

@@ -217,7 +217,7 @@
</script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/year.js?v={{ FF_VERSION }}"></script>

1
resources/views/reports/index.twig
View File

@@ -179,5 +179,6 @@
var filterPlaceholder = "{{ trans('firefly.multi_select_filter_placeholder')|escape('js') }}";
</script>
<script type="text/javascript" src="js/lib/bootstrap-multiselect.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

4
resources/views/reports/partials/exp-budgets.twig
View File

@@ -1,8 +1,8 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th style="width:66%;" data-defaultsign="az">{{ 'category'|_ }}</th>
<th style="width:34%;" data-defaultsort="_19">{{ 'spent'|_ }}</th>
<th style="width:66%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
<th style="width:34%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>
</tr>
</thead>
<tbody>

6
resources/views/reports/partials/exp-categories.twig
View File

@@ -1,9 +1,9 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th style="width:50%;" data-defaultsign="az">{{ 'category'|_ }}</th>
<th style="width:25%;" data-defaultsort="_19">{{ 'spent'|_ }}</th>
<th style="width:25%;" data-defaultsort="_19">{{ 'earned'|_ }}</th>
<th style="width:50%;" data-defaultsign="az" data-defaultsort="asc">{{ 'category'|_ }}</th>
<th style="width:25%;" data-defaultsign="_19">{{ 'spent'|_ }}</th>
<th style="width:25%;" data-defaultsign="_19">{{ 'earned'|_ }}</th>
</tr>
</thead>
<tbody>

4
resources/views/reports/partials/exp-not-grouped.twig
View File

@@ -3,8 +3,8 @@
<thead>
<tr>
<th style="width:50%;" data-defaultsign="az">{{ 'name'|_ }}</th>
<th style="width:25%;" class="hidden-xs" data-defaultsort="_19">{{ 'spent'|_ }}</th>
<th style="width:25%;" class="hidden-xs" data-defaultsort="_19">{{ 'earned'|_ }}</th>
<th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'spent'|_ }}</th>
<th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'earned'|_ }}</th>
</tr>
</thead>
<tbody>

24
resources/views/reports/partials/top-transactions.twig Normal file
View File

@@ -0,0 +1,24 @@
<table class="table table-hover sortable">
<thead>
<tr>
<th data-defaultsign="az">{{ 'account'|_ }}</th>
<th data-defaultsign="az">{{ 'description'|_ }}</th>
<th data-defaultsign="month">{{ 'date'|_ }}</th>
<th style="width:25%;" class="hidden-xs" data-defaultsign="_19">{{ 'amount'|_ }}</th>
</tr>
</thead>
<tbody>
{% for transaction in sorted %}
<tr>
<td data-value="{{ transaction.opposing_account_name }}">
<a href="{{ route('accounts.show',transaction.opposing_account_id) }}">{{ transaction.opposing_account_name }}</a>
</td>
<td data-value="{{ transaction.description }}">{{ transaction.description }}</td>
<td data-value="{{ transaction.date.format('Y-m-d') }}">
{{ transaction.date.formatLocalized(monthAndDayFormat) }}
</td>
<td style="text-align: right;" data-value="{{ transaction.transaction_amount }}"><span style="margin-right:5px;">{{ transaction|transactionAmount }}</span></td>
</tr>
{% endfor %}
</tbody>
</table>

3
resources/views/reports/tag/month.twig
View File

@@ -422,8 +422,7 @@
var mainUri = '{{ route('chart.tag.main', [accountIds, tagTags, start.format('Ymd'), end.format('Ymd')]) }}';
</script>
<script type="text/javascript" src="js/ff/reports/tag/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/tag/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}