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

Extend report capability for issue #396 and related report issues.

Browse Source
This commit is contained in:
James Cole
2016-11-09 21:36:54 +01:00
parent fe57648349
commit 3600e1b5e7
14 changed files with 866 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@
{% block content %}
<div class="row">
<form class="form-horizontal" id="report-form" action="{{ route('reports.index') }}" method="post">
<form class="form-horizontal" id="report-form" action="{{ route('reports.index.post') }}" method="post">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box">
<div class="box-header with-border">
@@ -116,16 +116,16 @@
<h4>{{ 'quick_link_default_report'|_ }}</h4>
<ul>
<li>
<a href="{{ route('reports.report',
['default',
<a href="{{ route('reports.report.default',
[
'currentMonthStart',
'currentMonthEnd',
accountList
]) }}">{{ 'report_this_month_quick'|_ }}</a>
</li>
<li>
<a href="{{ route('reports.report',
['default',
<a href="{{ route('reports.report.default',
[
'currentYearStart',
'currentYearEnd',
accountList
@@ -133,7 +133,7 @@
</li>
{% if customFiscalYear == 1 %}
<li>
<a href="{{ route('reports.report',
<a href="{{ route('reports.report.default',
['default',
'currentFiscalYearStart',
'currentFiscalYearEnd',
@@ -142,8 +142,8 @@
</li>
{% endif %}
<li>
<a href="{{ route('reports.report',
['default',
<a href="{{ route('reports.report.default',
[
start.format('Ymd'),
'currentMonthEnd',
accountList
@@ -154,16 +154,16 @@
<h4>{{ 'quick_link_audit_report'|_ }}</h4>
<ul>
<li>
<a href="{{ route('reports.report',
['audit',
<a href="{{ route('reports.report.audit',
[
'currentMonthStart',
'currentMonthEnd',
accountList
]) }}">{{ 'report_this_month_quick'|_ }}</a>
</li>
<li>
<a href="{{ route('reports.report',
['audit',
<a href="{{ route('reports.report.audit',
[
'currentYearStart',
'currentYearEnd',
accountList
@@ -171,8 +171,8 @@
</li>
{% if customFiscalYear == 1 %}
<li>
<a href="{{ route('reports.report',
['audit',
<a href="{{ route('reports.report.audit',
[
'currentFiscalYearStart',
'currentFiscalYearEnd',
accountList
@@ -180,15 +180,14 @@
</li>
{% endif %}
<li>
<a href="{{ route('reports.report',
['audit',
<a href="{{ route('reports.report.audit',
[
start.format('Ymd'),
'currentMonthEnd',
accountList
]) }}">{{ 'report_all_time_quick'|_ }}</a>
</li>
</ul>
<p>
<em>{{ 'reports_can_bookmark'|_ }}</em>
</p>
@@ -202,8 +201,6 @@
{% block scripts %}
<script type="text/javascript">
var reportURL = "{{ route('reports.report', ['','','','']) }}";
var minDate = "{{ start.format('m/d/Y') }}";
var picker;
</script>

8
resources/views/reports/options/category.twig Normal file
View File

@@ -0,0 +1,8 @@
<p>
{{ 'select_category'|_ }}
</p>
{% for category in categories %}
<label class="checkbox-inline">
<input type="checkbox" name="category[]" value="{{ category.id }}"> {{ category.name }}
</label>
{% endfor %}