kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Optimise chart.

Browse Source
This commit is contained in:
James Cole
2015-12-31 07:49:19 +01:00
parent d75614e9a7
commit 1b3592d959
2 changed files with 41 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/Category/SingleCategoryRepository.php
View File

@@ -107,14 +107,12 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
public function earnedPerDay(Category $category, Carbon $start, Carbon $end)
{
/** @var Collection $query */
$query = Auth::user()->transactionJournals()
$query = $category->transactionJournals()
->transactionTypes([TransactionType::DEPOSIT])
->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '>', 0)
->before($end)
->after($start)
->where('category_transaction_journal.category_id', $category->id)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
$return = [];
@@ -245,14 +243,12 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
public function spentPerDay(Category $category, Carbon $start, Carbon $end)
{
/** @var Collection $query */
$query = Auth::user()->transactionJournals()
$query = $category->transactionJournals()
->transactionTypes([TransactionType::WITHDRAWAL])
->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '<', 0)
->before($end)
->after($start)
->where('category_transaction_journal.category_id', $category->id)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::Raw('SUM(`transactions`.`amount`) AS `sum`')]);
$return = [];