From ddf9f52737517ec351ded2b2f55f878209f69ab6 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 22 Nov 2014 08:21:10 +0100
Subject: [PATCH] Mar cleanup.

---
 app/controllers/AccountController.php | 12 ++++++++++
 app/models/Account.php                | 32 +++------------------------
 app/views/list/accounts.blade.php     |  5 ++---
 3 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 427a40e561..ed6eb51257 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -196,6 +196,18 @@ class AccountController extends BaseController
                 break;
         }
 
+        $accounts->each(
+            function (Account $account) {
+                $transaction = $account->transactions()->orderBy('updated_at', 'DESC')->first();
+
+                if (is_null($transaction)) {
+                    $account->lastActionDate = null;
+                }
+
+                $account->lastActionDate = $transaction->updated_at;
+            }
+        );
+
         return View::make('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
     }
 
diff --git a/app/models/Account.php b/app/models/Account.php
index 03645bbb13..46324baab0 100644
--- a/app/models/Account.php
+++ b/app/models/Account.php
@@ -64,20 +64,6 @@ class Account extends Ardent
     {
         return $this->hasMany('Transaction');
     }
-    /**
-     * TODO remove this method in favour of something in the FireflyIII libraries.
-     *
-     * @return Carbon
-     */
-    public function lastActionDate()
-    {
-        $transaction = $this->transactions()->orderBy('updated_at', 'DESC')->first();
-        if (is_null($transaction)) {
-            return null;
-        }
-
-        return $transaction->updated_at;
-    }
 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
@@ -88,21 +74,6 @@ class Account extends Ardent
     }
 
     /**
-     * TODO remove this method in favour of something in the FireflyIII libraries.
-     *
-     * @param \Carbon\Carbon $date
-     *
-     * @return null
-     */
-    public function predict(
-        /** @noinspection PhpUnusedParameterInspection */
-        \Carbon\Carbon $date
-    ) {
-        return null;
-    }
-
-    /**
-     * TODO see if this scope is still used.
      *
      * @param Builder $query
      * @param array   $types
@@ -116,6 +87,9 @@ class Account extends Ardent
         $query->whereIn('account_types.type', $types);
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
+     */
     public function transactionjournals()
     {
         return $this->hasManyThrough('TransactionJournal', 'Transaction');
diff --git a/app/views/list/accounts.blade.php b/app/views/list/accounts.blade.php
index a803498da6..ff48d1fabf 100644
--- a/app/views/list/accounts.blade.php
+++ b/app/views/list/accounts.blade.php
@@ -24,9 +24,8 @@
             @endif
         </td>
         <td>
-            <?php $active = $account->lastActionDate(); ?>
-            @if($active)
-                {{{$active->format('j F Y')}}}
+            @if($account->lastActionDate)
+                {{{$account->lastActionDate->format('j F Y')}}}
             @else
                 <em>Never</em>
             @endif