kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-30 02:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Optimised chart.

Browse Source
This commit is contained in:
James Cole
2015-12-29 08:27:13 +01:00
parent 77056dcf8d
commit 38fe9e7e1c
3 changed files with 81 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Chart/BudgetController.php
View File

@@ -190,15 +190,24 @@ class BudgetController extends Controller
return Response::json($cache->get()); // @codeCoverageIgnore
}
$set = $repository->getExpensesPerDay($budget, $start, $end);
$entries = new Collection;
$amount = $repetition->amount;
// get sum (har har)!
while ($start <= $end) {
$formatted = $start->format('Y-m-d');
$filtered = $set->filter(
function (Budget $obj) use ($formatted) {
return $obj->date == $formatted;
}
);
$sum = is_null($filtered->first()) ? '0' : $filtered->first()->dailyAmount;
/*
* Sum of expenses on this day:
*/
$sum = $repository->expensesOnDay($budget, $start);
$amount = bcadd($amount, $sum);
$amount = round(bcadd($amount, $sum), 2);
$entries->push([clone $start, $amount]);
$start->addDay();
}

44
app/Repositories/Budget/BudgetRepository.php
View File

@@ -37,6 +37,49 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
}
/**
* Returns the expenses for this budget grouped per day, with the date
* in "date" (a string, not a Carbon) and the amount in "dailyAmount".
*
* @param Budget $budget
* @param Carbon $start
* @param Carbon $end
*
* @return Collection
*/
public function getExpensesPerDay(Budget $budget, Carbon $start, Carbon $end)
{
/*
* select transaction_journals.date, SUM(transactions.amount) as dailyAmount from budgets
left join budget_transaction_journal ON budget_transaction_journal.budget_id = budgets.id
left join transaction_journals ON budget_transaction_journal.transaction_journal_id = transaction_journals.id
left join transactions ON transaction_journals.id = transactions.transaction_journal_id
where
transaction_journals.date >= "2015-12-01"
and transaction_journals.date <= "2015-12-31"
and budgets.id = 1
and transactions.amount < 0
group by transaction_journals.date
order by transaction_journals.date
*/
$set = Auth::user()->budgets()
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.budget_id', '=', 'budgets.id')
->leftJoin('transaction_journals', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('transactions', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
->where('budgets.id', $budget->id)
->where('transactions.amount', '<', 0)
->groupBy('transaction_journals.date')
->orderBy('transaction_journals.date')
->get(['transaction_journals.date', DB::Raw('SUM(`transactions`.`amount`) as `dailyAmount`')]);
return $set;
}
/**
* @param Budget $budget
*
@@ -548,6 +591,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
DB::Raw('SUM(`limit_repetitions`.`amount`) as `budgeted`')
]
);
return $set;
}

12
app/Repositories/Budget/BudgetRepositoryInterface.php
View File

@@ -20,6 +20,18 @@ interface BudgetRepositoryInterface
*/
public function cleanupBudgets();
/**
* Returns the expenses for this budget grouped per day, with the date
* in "date" (a string, not a Carbon) and the amount in "dailyAmount".
*
* @param Budget $budget
* @param Carbon $start
* @param Carbon $end
*
* @return Collection
*/
public function getExpensesPerDay(Budget $budget, Carbon $start, Carbon $end);
/**
* @param Budget $budget
*