IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Simplify tag cloud.

Browse Source
This commit is contained in:
James Cole 2017-11-15 15:38:39 +01:00
parent 63d93968d0
commit bf87ffb933
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Repositories/Tag/TagRepository.php
View File

@ -323,6 +323,8 @@ class TagRepository implements TagRepositoryInterface
$min = null; $min = null;
$max = '0'; $max = '0';
$return = []; $return = [];
// get all tags
$allTags = $this->user->tags();
// get tags with a certain amount (in this range): // get tags with a certain amount (in this range):
$query = $this->user->tags() $query = $this->user->tags()
->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id') ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
@ -334,11 +336,13 @@ class TagRepository implements TagRepositoryInterface
// add date range (or not): // add date range (or not):
if (null === $year) { if (null === $year) {
$query->whereNull('tags.date'); $query->whereNull('tags.date');
$allTags->whereNull('date');
} }
if (null !== $year) { if (null !== $year) {
$start = $year . '-01-01'; $start = $year . '-01-01';
$end = $year . '-12-31'; $end = $year . '-12-31';
$query->where('tags.date', '>=', $start)->where('tags.date', '<=', $end); $query->where('tags.date', '>=', $start)->where('tags.date', '<=', $end);
$allTags->where('date', '>=', $start)->where('date', '<=', $end);
} }
$set = $query->get(['tags.id', DB::raw('SUM(transactions.amount) as amount_sum')]); $set = $query->get(['tags.id', DB::raw('SUM(transactions.amount) as amount_sum')]);
$tagsWithAmounts = []; $tagsWithAmounts = [];
@ -347,16 +351,6 @@ class TagRepository implements TagRepositoryInterface
$tagsWithAmounts[$tag->id] = strval($tag->amount_sum); $tagsWithAmounts[$tag->id] = strval($tag->amount_sum);
} }
// get all tags in period:
$query = $this->user->tags();
if (null !== $year) {
$start = $year . '-01-01';
$end = $year . '-12-31';
$query->where('date', '>=', $start)->where('date', '<=', $end);
}
if (null === $year) {
$query->whereNull('date');
}
$tags = $query->orderBy('id', 'desc')->get(); $tags = $query->orderBy('id', 'desc')->get();
$temporary = []; $temporary = [];
/** @var Tag $tag */ /** @var Tag $tag */