From a663ddb0d96fd74f8db14e43935a0e0aff6194e6 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 27 Mar 2015 13:39:12 +0100 Subject: [PATCH] Hide accounts with no activity. --- resources/views/reports/budget.blade.php | 82 +++++++++++++----------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/resources/views/reports/budget.blade.php b/resources/views/reports/budget.blade.php index 617fcd02a7..bc41bba2fe 100644 --- a/resources/views/reports/budget.blade.php +++ b/resources/views/reports/budget.blade.php @@ -60,15 +60,13 @@ $accountSums = []; ?> @foreach($accounts as $account) - {{{$account->name}}} - - @if($account->hide === true) - (hidden) + @if($account->hide === false) + {{{$account->name}}} @endif - - id] = 0; ?> + @endforeach Left in budget @@ -80,22 +78,24 @@ {!! Amount::format($budget['amount']) !!} @foreach($accounts as $account) - @if(isset($account->budgetInformation[$id])) - - @if($id == 0) - - {!! Amount::format($account->budgetInformation[$id]['amount']) !!} - - @else - {!! Amount::format($account->budgetInformation[$id]['amount']) !!} - @endif - - budgetInformation[$id]['amount']); - $accountSums[$account->id] += floatval($account->budgetInformation[$id]['amount']); - ?> - @else - {!! Amount::format(0) !!} + @if($account->hide === false) + @if(isset($account->budgetInformation[$id])) + + @if($id == 0) + + {!! Amount::format($account->budgetInformation[$id]['amount']) !!} + + @else + {!! Amount::format($account->budgetInformation[$id]['amount']) !!} + @endif + + budgetInformation[$id]['amount']); + $accountSums[$account->id] += floatval($account->budgetInformation[$id]['amount']); + ?> + @else + {!! Amount::format(0) !!} + @endif @endif @endforeach {!! Amount::format($budget['amount'] + $budget['spent']) !!} @@ -105,9 +105,11 @@ Balanced by transfers @foreach($accounts as $account) - - {!! Amount::format($account->balancedAmount) !!} - + @if($account->hide === false) + + {!! Amount::format($account->balancedAmount) !!} + + @endif @endforeach   @@ -117,16 +119,18 @@ id] += $account->balancedAmount; ?> - @if(isset($account->budgetInformation[0])) - - @if($account->budgetInformation[0]['amount'] + $account->balancedAmount != 0.0) - {!! Amount::format($account->budgetInformation[0]['amount'] + $account->balancedAmount) !!} - @else - {!! Amount::format($account->budgetInformation[0]['amount'] + $account->balancedAmount) !!} - @endif - - @else - {!! Amount::format(0) !!} + @if($account->hide === false) + @if(isset($account->budgetInformation[0])) + + @if($account->budgetInformation[0]['amount'] + $account->balancedAmount != 0.0) + {!! Amount::format($account->budgetInformation[0]['amount'] + $account->balancedAmount) !!} + @else + {!! Amount::format($account->budgetInformation[0]['amount'] + $account->balancedAmount) !!} + @endif + + @else + {!! Amount::format(0) !!} + @endif @endif @endforeach   @@ -134,14 +138,18 @@ Sum @foreach($accounts as $account) - {!! Amount::format($accountSums[$account->id]) !!} + @if($account->hide === false) + {!! Amount::format($accountSums[$account->id]) !!} + @endif @endforeach   Expected balance @foreach($accounts as $account) - {!! Amount::format($account->startBalance + $accountSums[$account->id]) !!} + @if($account->hide === false) + {!! Amount::format($account->startBalance + $accountSums[$account->id]) !!} + @endif @endforeach