kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 23:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up date-time navigation, added some stuff to accounts, expanded JSON response for transactions.

Browse Source
This commit is contained in:
Sander Dorigo
2014-10-09 07:24:47 +02:00
parent 3cba673a9c
commit a687140056
8 changed files with 154 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
app/views/accounts/show.blade.php
View File

@@ -1,88 +1,105 @@
@extends('layouts.default')
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div id="chart"></div>
<div class="col-lg-8 col-md-6 col-sm-12">
<div class="panel panel-default">
<div class="panel-heading">
<i class="fa {{$subTitleIcon}} fa-fw"></i> {{{$account->name}}}
</div>
<div class="panel-body">
<div id="chart"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h4>Summary <small>For selected account and period</small></h4>
<div class="col-lg-4 col-md-6 col-sm-12">
<!-- time based navigation -->
@include('partials.date_nav')
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<table class="table table-striped table-condensed">
<tr>
<th></th>
<th>Expense / income</th>
<th>Transfers</th>
</tr>
<tr>
<td>Out</td>
<td>
{{mf($show['statistics']['period']['out'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transactions&amp;show=expenses"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
<td>
{{mf($show['statistics']['period']['t_out'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transfers&amp;show=out"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
</tr>
<tr>
<td>In</td>
<td>
{{mf($show['statistics']['period']['in'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transactions&amp;show=income"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
<td>
{{mf($show['statistics']['period']['t_in'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transfers&amp;show=in"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
</tr>
<tr>
<td>Difference</td>
<td>{{mf($show['statistics']['period']['diff'])}}</td>
<td>{{mf($show['statistics']['period']['t_diff'])}}</td>
</tr>
</table>
<div class="panel panel-default">
<div class="panel-heading">
Summary
</div>
<div class="panel-body">
<table class="table table-striped table-condensed">
<tr>
<th></th>
<th>Expense / income</th>
<th>Transfers</th>
</tr>
<tr>
<td>Out</td>
<td>
{{mf($show['statistics']['period']['out'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transactions&amp;show=expenses"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
<td>
{{mf($show['statistics']['period']['t_out'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transfers&amp;show=out"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
</tr>
<tr>
<td>In</td>
<td>
{{mf($show['statistics']['period']['in'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transactions&amp;show=income"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
<td>
{{mf($show['statistics']['period']['t_in'])}}
<a href="{{route('accounts.show',$account->id)}}?type=transfers&amp;show=in"><span class="glyphicon glyphicon-circle-arrow-right"></span></a>
</td>
</tr>
<tr>
<td>Difference</td>
<td>{{mf($show['statistics']['period']['diff'])}}</td>
<td>{{mf($show['statistics']['period']['t_diff'])}}</td>
</tr>
</table>
</div>
</div>
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<table class="table table-striped table-condensed">
@if(count($show['statistics']['accounts']) > 0)
<tr>
<td style="width:30%;">Related accounts</td>
<td>
@foreach($show['statistics']['accounts'] as $acct)
<a href="{{route('accounts.show',$acct->id)}}" class="btn btn-default btn-xs">{{{$acct->name}}}</a>
@endforeach
</td>
</tr>
@endif
@if(isset($show['statistics']['Category']) && count($show['statistics']['Category']) > 0)
<tr>
<td>Related categories</td>
<td>
@foreach($show['statistics']['Category'] as $cat)
<a href="{{route('categories.show',$cat->id)}}" class="btn btn-default btn-xs">{{{$cat->name}}}</a>
@endforeach
</td>
</tr>
@endif
@if(isset($show['statistics']['Budget']) && count($show['statistics']['Budget']) > 0)
<tr>
<td>Related budgets</td>
<td>
@foreach($show['statistics']['Budget'] as $bud)
<a href="{{route('budgets.show',$bud->id)}}?useSession=true" class="btn btn-default btn-xs">{{{$bud->name}}}</a>
@endforeach
</td>
</tr>
@endif
</table>
<div class="panel panel-default">
<div class="panel-heading">
Related
</div>
<div class="panel-body">
<table class="table table-striped table-condensed">
@if(count($show['statistics']['accounts']) > 0)
<tr>
<td style="width:30%;">Related accounts</td>
<td>
@foreach($show['statistics']['accounts'] as $acct)
<a href="{{route('accounts.show',$acct->id)}}" class="btn btn-default btn-xs">{{{$acct->name}}}</a>
@endforeach
</td>
</tr>
@endif
@if(isset($show['statistics']['Category']) && count($show['statistics']['Category']) > 0)
<tr>
<td>Related categories</td>
<td>
@foreach($show['statistics']['Category'] as $cat)
<a href="{{route('categories.show',$cat->id)}}" class="btn btn-default btn-xs">{{{$cat->name}}}</a>
@endforeach
</td>
</tr>
@endif
@if(isset($show['statistics']['Budget']) && count($show['statistics']['Budget']) > 0)
<tr>
<td>Related budgets</td>
<td>
@foreach($show['statistics']['Budget'] as $bud)
<a href="{{route('budgets.show',$bud->id)}}?useSession=true" class="btn btn-default btn-xs">{{{$bud->name}}}</a>
@endforeach
</td>
</tr>
@endif
</table>
</div>
</div>
</div>
</div>