kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-24 22:48:18 +00:00
Code Issues Projects Releases Wiki Activity

Implement tag count and fix a count thing.

Browse Source
This commit is contained in:
James Cole
2015-06-14 21:27:04 +02:00
parent 1e86794416
commit 620848272e
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/HomeController.php
View File

@@ -2,6 +2,7 @@
use Carbon\Carbon; use Carbon\Carbon;
use Config; use Config;
use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Input; use Input;
use Preferences; use Preferences;
@@ -37,6 +38,20 @@ class HomeController extends Controller
*/ */
public function flush() public function flush()
{ {
// get all tags.
// update all counts:
$tags = Tag::get();
/** @var Tag $tag */
foreach ($tags as $tag) {
foreach ($tag->transactionjournals()->get() as $journal) {
$count = $journal->tags()->count();
$journal->tag_count = $count;
$journal->save();
}
}
Session::clear(); Session::clear();
return Redirect::route('index'); return Redirect::route('index');
@@ -49,8 +64,6 @@ class HomeController extends Controller
*/ */
public function index(AccountRepositoryInterface $repository) public function index(AccountRepositoryInterface $repository)
{ {
$types = Config::get('firefly.accountTypesByIdentifier.asset'); $types = Config::get('firefly.accountTypesByIdentifier.asset');
$count = $repository->countAccounts($types); $count = $repository->countAccounts($types);

5
app/Models/TransactionJournal.php
View File

@@ -158,14 +158,13 @@ class TransactionJournal extends Model
$amount = $t->amount; $amount = $t->amount;
} }
} }
$count = $this->tags()->count();
if ($count === 1) { if ($this->tag_count === 1) {
// get amount for single tag: // get amount for single tag:
$amount = $this->amountByTag($this->tags()->first(), $amount); $amount = $this->amountByTag($this->tags()->first(), $amount);
} }
if ($count > 1) { if ($this->tag_count > 1) {
// get amount for either tag. // get amount for either tag.
$amount = $this->amountByTags($amount); $amount = $this->amountByTags($amount);