From 1b1dc99bf7bdec0b7b2a8e29c39b9ac9f7e6a389 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 22 Aug 2014 10:46:33 +0200 Subject: [PATCH] Last fixes for budget before work on charts. --- app/lib/Firefly/Helper/Controllers/Budget.php | 1 + app/views/budgets/indexByDate.blade.php | 2 +- app/views/budgets/show.blade.php | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/lib/Firefly/Helper/Controllers/Budget.php b/app/lib/Firefly/Helper/Controllers/Budget.php index 06dc6e5a1b..83a2e94c9c 100644 --- a/app/lib/Firefly/Helper/Controllers/Budget.php +++ b/app/lib/Firefly/Helper/Controllers/Budget.php @@ -30,6 +30,7 @@ class Budget implements BudgetInterface $return[$periodOrder] = isset($return[$periodOrder]) ? $return[$periodOrder] : ['date' => $period, + 'dateObject' => $rep->startdate, 'budget_id' => $limit->budget_id]; } diff --git a/app/views/budgets/indexByDate.blade.php b/app/views/budgets/indexByDate.blade.php index ab27d67bc1..68fdf0e205 100644 --- a/app/views/budgets/indexByDate.blade.php +++ b/app/views/budgets/indexByDate.blade.php @@ -35,7 +35,7 @@

{{$entry['date']}} - Create a new envelope for {{$entry['date']}} + Create a new envelope for {{$entry['date']}}

diff --git a/app/views/budgets/show.blade.php b/app/views/budgets/show.blade.php index 892bae9ff5..ab99bf0709 100644 --- a/app/views/budgets/show.blade.php +++ b/app/views/budgets/show.blade.php @@ -61,7 +61,8 @@ same as the first but bigger range (potentially).

@else -

(Some sort of chart here)

+

(For each visible repetition, a sum of the expense as a bar. A line shows + the percentage spent for each rep.)

@endif