IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-31 19:27:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Better mostly report lists.

Browse Source
This commit is contained in:
James Cole 2015-03-02 11:54:20 +01:00
parent d98d366eea
commit fd57086ffd
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Report/ReportHelper.php
View File

@ -99,7 +99,8 @@ class ReportHelper implements ReportHelperInterface
$end = Carbon::now(); $end = Carbon::now();
$months = []; $months = [];
while ($start <= $end) { while ($start <= $end) {
$months[] = [ $year = $start->format('Y');
$months[$year][] = [
'formatted' => $start->format('F Y'), 'formatted' => $start->format('F Y'),
'month' => intval($start->format('m')), 'month' => intval($start->format('m')),
'year' => intval($start->format('Y')), 'year' => intval($start->format('Y')),

13
resources/views/reports/index.blade.php
View File

@ -23,11 +23,16 @@
Monthly reports Monthly reports
</div> </div>
<div class="panel-body"> <div class="panel-body">
@foreach($months as $year => $entries)
<h5>{{$year}}</h5>
<ul> <ul>
@foreach($months as $month) @foreach($entries as $month)
<li><a href="{{route('reports.month',[$month['year'],$month['month']])}}">{{$month['formatted']}}</a></li> <li><a href="{{route('reports.month',[$month['year'],$month['month']])}}">{{$month['formatted']}}</a></li>
@endforeach @endforeach
</ul> </ul>
@endforeach
</div> </div>
</div> </div>
</div> </div>
@ -38,11 +43,15 @@
Budget reports Budget reports
</div> </div>
<div class="panel-body"> <div class="panel-body">
@foreach($months as $year => $entries)
<h5>{{$year}}</h5>
<ul> <ul>
@foreach($months as $month) @foreach($entries as $month)
<li><a href="{{route('reports.budget',[$month['year'],$month['month']])}}">{{$month['formatted']}}</a></li> <li><a href="{{route('reports.budget',[$month['year'],$month['month']])}}">{{$month['formatted']}}</a></li>
@endforeach @endforeach
</ul> </ul>
@endforeach
</ul>
</div> </div>
</div> </div>
</div> </div>