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

Expand new charts.

Browse Source
This commit is contained in:
James Cole
2016-04-26 22:30:53 +02:00
parent 66f2df9677
commit 1591b61b77
4 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,25 +76,32 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
* Where yyyy-mm-dd is the date and <amount> is the money earned using DEPOSITS in the $category
* from all the users $accounts.
*
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return array
*/
public function earnedPerDay(Category $category, Carbon $start, Carbon $end): array
public function earnedPerDay(Category $category, Carbon $start, Carbon $end, Collection $accounts): array
{
/** @var Collection $query */
$query = $category->transactionjournals()
->expanded()
->transactionTypes([TransactionType::DEPOSIT])
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '>', 0)
->before($end)
->after($start)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::raw('SUM(`transactions`.`amount`) AS `sum`')]);
->groupBy('transaction_journals.date');
if ($accounts->count() > 0) {
$ids = $accounts->pluck('id')->toArray();
$query->whereIn('destination_account.id', $ids);
}
$result = $query->get(['transaction_journals.date as dateFormatted', DB::raw('SUM(`destination`.`amount`) AS `sum`')]);
$return = [];
foreach ($query->toArray() as $entry) {
foreach ($result->toArray() as $entry) {
$return[$entry['dateFormatted']] = $entry['sum'];
}
@@ -226,25 +233,33 @@ class SingleCategoryRepository extends ComponentRepository implements SingleCate
* Where yyyy-mm-dd is the date and <amount> is the money spent using DEPOSITS in the $category
* from all the users accounts.
*
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return array
*/
public function spentPerDay(Category $category, Carbon $start, Carbon $end): array
public function spentPerDay(Category $category, Carbon $start, Carbon $end, Collection $accounts): array
{
/** @var Collection $query */
$query = $category->transactionjournals()
->expanded()
->transactionTypes([TransactionType::WITHDRAWAL])
->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.amount', '<', 0)
->before($end)
->after($start)
->groupBy('date')->get(['transaction_journals.date as dateFormatted', DB::raw('SUM(`transactions`.`amount`) AS `sum`')]);
->groupBy('transaction_journals.date');
if ($accounts->count() > 0) {
$ids = $accounts->pluck('id')->toArray();
$query->whereIn('source_account.id', $ids);
}
$result = $query->get(['transaction_journals.date as dateFormatted', DB::raw('SUM(`transactions`.`amount`) AS `sum`')]);
$return = [];
foreach ($query->toArray() as $entry) {
foreach ($result->toArray() as $entry) {
$return[$entry['dateFormatted']] = $entry['sum'];
}

18
app/Repositories/Category/SingleCategoryRepositoryInterface.php
View File

@@ -47,13 +47,14 @@ interface SingleCategoryRepositoryInterface
* Where yyyy-mm-dd is the date and <amount> is the money earned using DEPOSITS in the $category
* from all the users accounts.
*
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return array
*/
public function earnedPerDay(Category $category, Carbon $start, Carbon $end): array;
public function earnedPerDay(Category $category, Carbon $start, Carbon $end, Collection $accounts): array;
/**
* Find a category
@@ -118,13 +119,14 @@ interface SingleCategoryRepositoryInterface
* Where yyyy-mm-dd is the date and <amount> is the money spent using WITHDRAWALS in the $category
* from all the users accounts.
*
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Category $category
* @param Carbon $start
* @param Carbon $end
* @param Collection $accounts
*
* @return array
*/
public function spentPerDay(Category $category, Carbon $start, Carbon $end): array;
public function spentPerDay(Category $category, Carbon $start, Carbon $end, Collection $accounts): array;
/**