From b1ba64db1201a3b2de54a7cb20a353fb40abbc9c Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 26 Nov 2014 17:20:43 +0100 Subject: [PATCH] New and updated views. --- app/views/reports/budgets.blade.php | 104 +++++++++++++++++++++++++ app/views/reports/index.blade.php | 30 ++++++- app/views/reports/unbalanced.blade.php | 42 ++++++++++ 3 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 app/views/reports/budgets.blade.php create mode 100644 app/views/reports/unbalanced.blade.php diff --git a/app/views/reports/budgets.blade.php b/app/views/reports/budgets.blade.php new file mode 100644 index 0000000000..35901f7209 --- /dev/null +++ b/app/views/reports/budgets.blade.php @@ -0,0 +1,104 @@ +@extends('layouts.default') +@section('content') +
+
+

Budgets

+
+
+
+ @foreach($budgets as $budget) +
+
+
+ {{{$budget->name}}} +
+
+ @foreach($budget->repInfo as $repetition) +

{{{$repetition['date']}}}

+
+ @if($repetition['overspent']) +
+ {{$repetition['pct_display']}}% +
+
+
+ @else +
+ {{$repetition['pct_display']}}% +
+ @endif +
+ + + + + + + + + + + + + + +
Budgeted{{mf($repetition['budgeted'])}}
Spent{{mf($repetition['spent'])}}
Left{{mf($repetition['left'])}}
+ @endforeach + +
+
+
+ @endforeach +
+
+
+

Accounts

+
+
+
+@foreach($accounts as $account) +
+
+
+ {{{$account->name}}} +
+
+ + List of budgets with: expenses, left in budget + Balance at start of month. + + Balance at end of month + left in all (relevant budgets) +
+ + + @foreach($account->budgetInfo as $budget) + + + + + + + + + @endforeach + @if($sum != 0) + + + + + + + @endif +
{{$budget['budget_name']}}{{mf($budget['budgeted'])}}{{mf($budget['spent'])}}{{mf($budget['left'])}}
Sum{{mf($sum)}}
+
+
+@endforeach +
+ +@stop +@section('scripts') +@stop \ No newline at end of file diff --git a/app/views/reports/index.blade.php b/app/views/reports/index.blade.php index 4511ce7b3c..965678ba5c 100644 --- a/app/views/reports/index.blade.php +++ b/app/views/reports/index.blade.php @@ -1,7 +1,7 @@ @extends('layouts.default') @section('content')
-
+
Yearly reports @@ -15,5 +15,33 @@
+
+
+
+ Budget reports +
+
+ +
+
+
+
+
+
+ Unbalanced transactions +
+
+ +
+
+
@stop \ No newline at end of file diff --git a/app/views/reports/unbalanced.blade.php b/app/views/reports/unbalanced.blade.php new file mode 100644 index 0000000000..40b3d98167 --- /dev/null +++ b/app/views/reports/unbalanced.blade.php @@ -0,0 +1,42 @@ +@extends('layouts.default') +@section('content') +
+ @foreach($journals as $journal) +
+
+
+ {{{$journal->description}}} +
+
+

Spent {{mf($journal->getAmount())}}

+ @if($journal->counters->count() > 0) +
+ + @foreach($journal->counters as $counter) + + + + + + + @endforeach +
{{$counter->description}}{{mf($counter->getAmount())}}
+ @else +

No counter transaction!

+
+ @endif +
+
+ @endforeach +
+ + +@stop +@section('scripts') +@stop \ No newline at end of file