Mar cleanup.

This commit is contained in:
James Cole 2014-11-22 08:21:10 +01:00
parent 10b969a074
commit ddf9f52737
3 changed files with 17 additions and 32 deletions

View File

@ -196,6 +196,18 @@ class AccountController extends BaseController
break; 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')); return View::make('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
} }

View File

@ -64,20 +64,6 @@ class Account extends Ardent
{ {
return $this->hasMany('Transaction'); 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 * @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 Builder $query
* @param array $types * @param array $types
@ -116,6 +87,9 @@ class Account extends Ardent
$query->whereIn('account_types.type', $types); $query->whereIn('account_types.type', $types);
} }
/**
* @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
*/
public function transactionjournals() public function transactionjournals()
{ {
return $this->hasManyThrough('TransactionJournal', 'Transaction'); return $this->hasManyThrough('TransactionJournal', 'Transaction');

View File

@ -24,9 +24,8 @@
@endif @endif
</td> </td>
<td> <td>
<?php $active = $account->lastActionDate(); ?> @if($account->lastActionDate)
@if($active) {{{$account->lastActionDate->format('j F Y')}}}
{{{$active->format('j F Y')}}}
@else @else
<em>Never</em> <em>Never</em>
@endif @endif