From 064e60e9d5593cd3247f904aaa239f1f69a7d904 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Mon, 18 May 2015 17:02:18 +0200
Subject: [PATCH] Show tag amount better [skip ci]

---
 app/Models/TransactionJournal.php | 17 +++++++++++++++++
 resources/twig/list/journals.twig |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index fc98ff41be..5dc0b73550 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -59,6 +59,22 @@ class TransactionJournal extends Model
         return $this->belongsToMany('FireflyIII\Models\Category');
     }
 
+    /**
+     * @return float
+     */
+    public function getActualAmountAttribute()
+    {
+        $amount = 0;
+        /** @var Transaction $t */
+        foreach ($this->transactions as $t) {
+            if ($t->amount > 0) {
+                $amount = floatval($t->amount);
+            }
+        }
+
+        return $amount;
+    }
+
     /**
      * @return float
      */
@@ -88,6 +104,7 @@ class TransactionJournal extends Model
             foreach ($others as $other) {
                 $amount -= $other->amount;
             }
+
             return $amount;
         }
 
diff --git a/resources/twig/list/journals.twig b/resources/twig/list/journals.twig
index 32a742aa44..c62a069636 100644
--- a/resources/twig/list/journals.twig
+++ b/resources/twig/list/journals.twig
@@ -57,7 +57,7 @@
                     {% if not hideTags %}
                         {{ relevantTags(journal)|raw }}
                     {% else %}
-                        {{ journal|formatJournal }}
+                        {{ journal.actualAmount|formatAmount }}
                     {% endif %}
                 </td>
                 <td>