From 8316afb176db301320c7dea39169798e0923e5a4 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 12 Dec 2015 08:21:46 +0100
Subject: [PATCH] Experimental budget lines. #129

---
 app/Helpers/Report/ReportHelper.php          | 13 ++++++-------
 resources/twig/partials/reports/budgets.twig |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/Helpers/Report/ReportHelper.php b/app/Helpers/Report/ReportHelper.php
index c86fdb0016..f961ea6387 100644
--- a/app/Helpers/Report/ReportHelper.php
+++ b/app/Helpers/Report/ReportHelper.php
@@ -343,7 +343,7 @@ class ReportHelper implements ReportHelperInterface
         $repository = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface');
         $set        = $repository->getCategories();
         foreach ($set as $category) {
-            $spent = $repository->balanceInPeriodForList($category, $start, $end, $accounts);
+            $spent           = $repository->balanceInPeriodForList($category, $start, $end, $accounts);
             $category->spent = $spent;
             $object->addCategory($category);
         }
@@ -560,10 +560,9 @@ class ReportHelper implements ReportHelperInterface
                 $budgetLine->setBudget($budget);
                 $budgetLine->setRepetition($repetition);
                 $expenses  = $repository->balanceInPeriodForList($budget, $start, $end, $accounts);
-                $expenses  = $expenses * -1;
-                $left      = $expenses < $repetition->amount ? bcsub($repetition->amount, $expenses) : 0;
-                $spent     = $expenses > $repetition->amount ? 0 : $expenses;
-                $overspent = $expenses > $repetition->amount ? bcsub($expenses, $repetition->amount) : 0;
+                $left      = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($repetition->amount, $expenses) : 0;
+                $spent     = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? 0 : $expenses;
+                $overspent = bccomp(bcadd($repetition->amount, $expenses), '0') === 1 ? bcadd($expenses, $repetition->amount) : 0;
 
                 $budgetLine->setLeft($left);
                 $budgetLine->setSpent($spent);
@@ -605,8 +604,8 @@ class ReportHelper implements ReportHelperInterface
         $balance       = new Balance;
 
         // build a balance header:
-        $header = new BalanceHeader;
-        $budgets  = $repository->getBudgets();
+        $header  = new BalanceHeader;
+        $budgets = $repository->getBudgets();
         foreach ($accounts as $account) {
             $header->addAccount($account);
         }
diff --git a/resources/twig/partials/reports/budgets.twig b/resources/twig/partials/reports/budgets.twig
index a1ba288f03..2846a12317 100644
--- a/resources/twig/partials/reports/budgets.twig
+++ b/resources/twig/partials/reports/budgets.twig
@@ -39,7 +39,7 @@
                     </td>
                     <td>
                         {% if budgetLine.getSpent != 0 %}
-                            <span class="text-danger">{{ budgetLine.getSpent|formatAmountPlain }}</span>
+                            {{ budgetLine.getSpent|formatAmount }}
                         {% endif %}
 
                         {% if budgetLine.getSpent == 0 %}