kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Updated view for new reports.

Browse Source
This commit is contained in:
James Cole
2015-12-04 06:57:08 +01:00
parent 0b5c5b2ae9
commit 46131ad39d
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
resources/twig/reports/index.twig
View File

@@ -12,11 +12,10 @@
<h3 class="box-title">{{ 'reportsOwnAccounts'|_ }}</h3> <h3 class="box-title">{{ 'reportsOwnAccounts'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{% for year, data in months %}
{% for year, entries in months %}
<h4><a href="{{ route('reports.year',year) }}">{{ year }}</a></h4> <h4><a href="{{ route('reports.year',year) }}">{{ year }}</a></h4>
<ul class="list-inline"> <ul class="list-inline">
{% for month in entries %} {% for month in data.months %}
<li> <li>
<a href="{{ route('reports.month',[month.year, month.month]) }}">{{ month.formatted }}</a> <a href="{{ route('reports.month',[month.year, month.month]) }}">{{ month.formatted }}</a>
</li> </li>
@@ -32,11 +31,10 @@
<h3 class="box-title">{{ 'reportsOwnAccountsAndShared'|_ }}</h3> <h3 class="box-title">{{ 'reportsOwnAccountsAndShared'|_ }}</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{% for year, data in months %}
{% for year, entries in months %}
<h4><a href="{{ route('reports.year',[year, 'shared']) }}">{{ year }}</a></h4> <h4><a href="{{ route('reports.year',[year, 'shared']) }}">{{ year }}</a></h4>
<ul class="list-inline"> <ul class="list-inline">
{% for month in entries %} {% for month in data.months %}
<li> <li>
<a href="{{ route('reports.month',[month.year, month.month,'shared']) }}">{{ month.formatted }}</a> <a href="{{ route('reports.month',[month.year, month.month,'shared']) }}">{{ month.formatted }}</a>
</li> </li>
@@ -57,7 +55,8 @@
</div> </div>
<div class="box-body"> <div class="box-body">
<form class="form-horizontal"> <form class="form-horizontal" action="{{ route('reports.select') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
<div class="form-group"> <div class="form-group">
<label for="inputReportType" class="col-sm-3 control-label">Report type</label> <label for="inputReportType" class="col-sm-3 control-label">Report type</label>
@@ -93,11 +92,29 @@
<div class="form-group"> <div class="form-group">
<label for="inputDateRange" class="col-sm-3 control-label">Report date range</label> <label for="inputDateRange" class="col-sm-3 control-label">Report date range</label>
<div class="col-sm-9"> <div class="col-sm-9">
<input type="text" class="form-control" id="inputDateRange" name="daterange" <input type="text" class="form-control" id="inputDateRange" name="daterange"
value="{{ Session.get('start').format('m/d/Y') }} - {{ Session.get('end').format('m/d/Y') }}"> value="{{ Session.get('start').format('Y-m-d') }} - {{ Session.get('end').format('Y-m-d') }}">
</div> </div>
</div> </div>
<div class="form-group">
<label for="__none__" class="col-sm-3 control-label">Pre-set ranges</label>
<div class="col-sm-9">
{% for year, data in months %}
<a href="#" class="date-select" data-start="{{ data.start }}" data-end="{{ data.end }}">{{ year }}</a>
<ul class="list-inline">
{% for month in data.months %}
<li>
<a data-start="{{ month.start }}" data-end="{{ month.end }}" class="date-select" href="#">{{ month.formatted }}</a>
</li>
{% endfor %}
</ul>
{% endfor %}
</div>
</div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-3 col-sm-9"> <div class="col-sm-offset-3 col-sm-9">
<button type="submit" class="btn btn-default">Submit</button> <button type="submit" class="btn btn-default">Submit</button>
@@ -115,6 +132,7 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var minDate = "{{ start.format('m/d/Y') }}"; var minDate = "{{ start.format('m/d/Y') }}";
var picker;
</script> </script>
<script type="text/javascript" src="js/reports.js"></script> <script type="text/javascript" src="js/reports.js"></script>