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

New stuff!

Browse Source
This commit is contained in:
James Cole
2014-12-07 15:37:53 +01:00
parent 742479bb01
commit 6aecd77b77
31 changed files with 678 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/accounts/edit.blade.php
View File

@@ -26,8 +26,8 @@
<div class="panel-body">
{{Form::ffCheckbox('active','1')}}
@if($account->accounttype->type == 'Default account' || $account->accounttype->type == 'Asset account')
{{Form::ffBalance('openingbalance')}}
{{Form::ffDate('openingbalancedate')}}
{{Form::ffBalance('openingBalance')}}
{{Form::ffDate('openingBalanceDate')}}
{{Form::ffSelect('account_role',Config::get('firefly.accountRoles'))}}
@endif
</div>

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

@@ -21,7 +21,7 @@
</div>
<div class="panel-body">
<p>
@if($view == 'all')
@if($range == 'all')
<a href="{{route('accounts.show',$account->id)}}/session" class="btn btn-default">Stick to date-range</a>
@else
<a href="{{route('accounts.show',$account->id)}}/all" class="btn btn-default">Show all transactions</a>
@@ -74,7 +74,7 @@
@section('scripts')
<script type="text/javascript">
var accountID = {{{$account->id}}};
var view = '{{{$view}}}';
var view = '{{{$range}}}';
</script>
<!-- load the libraries and scripts necessary for Google Charts: -->
<script type="text/javascript" src="https://www.google.com/jsapi"></script>

4
app/views/list/accounts.blade.php
View File

@@ -26,8 +26,8 @@
@endif
</td>
<td>
@if($account->lastActionDate)
{{{$account->lastActionDate->format('j F Y')}}}
@if($account->lastActivityDate)
{{{$account->lastActivityDate->format('j F Y')}}}
@else
<em>Never</em>
@endif

4
app/views/piggybanks/edit.blade.php
View File

@@ -30,8 +30,8 @@
</div>
<div class="panel-body">
{{Form::ffDate('targetdate')}}
{{Form::ffCheckbox('remind_me','1',$prefilled['remind_me'],['label' => 'Remind me'])}}
{{Form::ffSelect('reminder',$periods,$prefilled['reminder'],['label' => 'Remind every'])}}
{{Form::ffCheckbox('remind_me','1',$preFilled['remind_me'],['label' => 'Remind me'])}}
{{Form::ffSelect('reminder',$periods,$preFilled['reminder'],['label' => 'Remind every'])}}
</div>
</div>

131
app/views/reports/year.blade.php
View File

@@ -25,85 +25,72 @@
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">
Summary (without shared accounts)
Account balance
</div>
<table class="table table-striped">
<tr>
<td></td>
@foreach($summary as $entry)
<th>{{$entry['month']}}</th>
@endforeach
<th>Sum</th>
</tr>
<tr>
<th>In</th>
<?php $inSum = 0;?>
@foreach($summary as $entry)
<td>{{mf($entry['income'])}}</td>
<?php $inSum+=$entry['income'];?>
@endforeach
<td>{{mf($inSum)}}</td>
</tr>
<th>Out</th>
<?php $outSum = 0;?>
@foreach($summary as $entry)
<td>{{mf($entry['expense']*-1)}}</td>
<?php $outSum+=$entry['expense']*-1;?>
@endforeach
<td>{{mf($outSum)}}</td>
<tr>
<th>Difference</th>
@foreach($summary as $entry)
<td>{{mf($entry['income']- $entry['expense'])}}</td>
@endforeach
<td>{{mf($inSum + $outSum)}}</td>
</tr>
</table>
<table class="table">
<?php
$start = 0;
$end = 0;
$diff = 0;
?>
@foreach($balances as $balance)
<?php
$start += $balance['start'];
$end += $balance['end'];
$diff += ($balance['end']-$balance['start']);
?>
<tr>
<td>
<a href="{{route('accounts.show',$balance['account']->id)}}">{{{$balance['account']->name}}}</a>
@if($balance['shared'])
<small><em>shared</em></small>
@endif
</td>
<td>{{mf($balance['start'])}}</td>
<td>{{mf($balance['end'])}}</td>
<td>{{mf($balance['end']-$balance['start'])}}</td>
</tr>
@endforeach
<tr>
<td><em>Sum of sums</em></td>
<td>{{mf($start)}}</td>
<td>{{mf($end)}}</td>
<td>{{mf($diff)}}</td>
</tr>
</table>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="col-lg-3 col-md-3 col-sm-3">
<div class="panel panel-default">
<div class="panel-heading">
Summary (shared accounts only)
Income
</div>
<table class="table table-striped">
<tr>
<td></td>
@foreach($summary as $entry)
<th>{{$entry['month']}}</th>
@endforeach
<th>Sum</th>
</tr>
<tr>
<th>In</th>
<?php $inSum = 0;?>
@foreach($summary as $entry)
<td>{{mf($entry['incomeShared'])}}</td>
<?php $inSum+=$entry['incomeShared'];?>
@endforeach
<td>{{mf($inSum)}}</td>
</tr>
<th>Out</th>
<?php $outSum = 0;?>
@foreach($summary as $entry)
<td>{{mf($entry['expenseShared']*-1)}}</td>
<?php $outSum+=$entry['expenseShared']*-1;?>
@endforeach
<td>{{mf($outSum)}}</td>
<tr>
<th>Difference</th>
@foreach($summary as $entry)
<td>{{mf($entry['incomeShared']- $entry['expenseShared'])}}</td>
@endforeach
<td>{{mf($inSum + $outSum)}}</td>
</tr>
</table>
<table class="table">
@foreach($groupedIncomes as $income)
<tr>
<td><a href="{{route('accounts.show',$income->account_id)}}">{{{$income->name}}}</a></td>
<td>{{mf(floatval($income->sum)*-1)}}</td>
</tr>
@endforeach
</table>
</div>
</div>
<div class="col-lg-3 col-md-3 col-sm-3">
<div class="panel panel-default">
<div class="panel-heading">
Expenses
</div>
<table class="table">
@foreach($groupedExpenses as $expense)
<tr>
<td><a href="{{route('accounts.show',$expense->account_id)}}">{{{$expense->name}}}</a></td>
<td>{{mf(floatval($expense->sum)*-1)}}</td>
</tr>
@endforeach
</table>
</div>
</div>
</div>
@@ -115,7 +102,7 @@
Budgets
</div>
<div class="panel-body">
<div id="budgets"></div>
<!-- <div id="budgets"></div> -->
</div>
</div>
</div>

2
app/views/user/login.blade.php
View File

@@ -10,7 +10,7 @@
{{Form::open()}}
{{Form::open(['id' => 'login'])}}
<div class="form-group">
<input type="email" class="form-control" id="inputEmail" name="email" placeholder="E-mail">
</div>