From 8de5384158ea78d1b9b643b87393eacd76f1a54f Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 12 Dec 2015 08:11:30 +0100
Subject: [PATCH] Spent amount / withdrawals are negative, #129.

---
 resources/twig/budgets/index.twig |  4 ++--
 resources/twig/budgets/show.twig  | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/twig/budgets/index.twig b/resources/twig/budgets/index.twig
index c6c50889b9..e98a252672 100644
--- a/resources/twig/budgets/index.twig
+++ b/resources/twig/budgets/index.twig
@@ -144,7 +144,7 @@
                             </tr>
                             <tr>
                                 <td style="width:50%;">{{ 'spent'|_ }}</td>
-                                <td><span class="text-danger">{{ (budget.spent*-1)|formatAmountPlain }}</a></td>
+                                <td>{{ budget.spent|formatAmount }}</a></td>
                             </tr>
                         </table>
                     </div>
@@ -179,7 +179,7 @@
 {% block scripts %}
     <script type="text/javascript">
         // actually spent bar data:
-        var spent = {{ spent * -1 }};
+        var spent = {{ spent * -1 }}; // must be positive for the calculation to work.
         var currencySymbol = "{{ getCurrencySymbol()|raw }}";
 
         // budgeted data:
diff --git a/resources/twig/budgets/show.twig b/resources/twig/budgets/show.twig
index 7e9faa3e71..e0353655a7 100644
--- a/resources/twig/budgets/show.twig
+++ b/resources/twig/budgets/show.twig
@@ -50,7 +50,7 @@
 
             {% for limit in limits %}
                 {% for rep in limit.limitRepetitions %}
-                {% set spentInRep = (spentInRepetitionCorrected(rep)*-1) %}
+                {% set spentInRep = spentInRepetitionCorrected(rep) %}
                     <div class="box">
                         <div class="box-header with-border">
                             <h3 class="box-title"><a href="{{ route('budgets.show',[budget.id,rep.id]) }}">{{ rep.startdate.formatLocalized(monthFormat) }}</a>
@@ -62,15 +62,15 @@
                                     {{ 'amount'|_ }}: {{ rep.amount|formatAmount }}
                                 </div>
                                 <div class="col-lg-6 col-md-6 col-sm-6">
-                                    {{ 'spent'|_ }}: <span class="text-danger">{{ spentInRep|formatAmountPlain }}</span>
+                                    {{ 'spent'|_ }}: {{ spentInRep|formatAmount }}
                                 </div>
                             </div>
                             <div class="row">
                                 <div class="col-lg-12 col-md-12 col-sm-12">
-                                    {% set overspent = spentInRep > rep.amount %}
+                                    {% set overspent = rep.amount + spentInRep > 0 %}
 
                                     {% if overspent %}
-                                        {% set pct = (spentInRep != 0 ? (rep.amount / spentInRep)*100 : 0) %}
+                                        {% set pct = (spentInRep != 0 ? (rep.amount / (spentInRep*-1))*100 : 0) %}
                                         <div class="progress progress-striped">
                                             <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="{{ pct|round }}" aria-valuemin="0"
                                                  aria-valuemax="100" style="width: {{ pct|round }}%;"></div>
@@ -79,7 +79,7 @@
                                         </div>
                                     {% else %}
                                         {% set amount = rep.amount %}
-                                        {% set pct = (amount != 0 ? ((spentInRep / amount)*100) : 0) %}
+                                        {% set pct = (amount != 0 ? (((spentInRep*-1) / amount)*100) : 0) %}
                                         <div class="progress progress-striped">
                                             <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="{{ pct|round }}" aria-valuemin="0"
                                                  aria-valuemax="100" style="width: {{ pct|round }}%;"></div>