From ac6f98fc47a0bd929429669120911d310619bc68 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 1 Jan 2015 21:35:05 +0100 Subject: [PATCH] First attempt to make the year charts and month reports report the same thing [skip ci] --- app/views/reports/year.blade.php | 41 +++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/app/views/reports/year.blade.php b/app/views/reports/year.blade.php index db918e2718..e7fc7c5d7a 100644 --- a/app/views/reports/year.blade.php +++ b/app/views/reports/year.blade.php @@ -30,7 +30,7 @@
Account balance
- +
+ +
+
+ Income vs. expense +
+ sum); + } + foreach($groupedExpenses as $exp) { + $expenseSum += floatval($exp['amount']); + } + $incomeSum = floatval($incomeSum*-1); + + ?> + + + + + + + + + + + + + + +
In{{mf($incomeSum)}}
Out{{mf($expenseSum*-1)}}
Difference{{mf($incomeSum - $expenseSum)}}
+
@@ -69,12 +102,18 @@ Income
+ @foreach($groupedIncomes as $income) + sum)*-1;?> @endforeach + + + +
{{{$income->name}}} {{mf(floatval($income->sum)*-1)}}
Sum{{mf($sum)}}