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

First functional view of default report.

Browse Source
This commit is contained in:
James Cole
2015-12-06 13:11:43 +01:00
parent 16bfbc8a12
commit 77262f52a4
4 changed files with 213 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
app/Helpers/Report/ReportHelper.php
View File

@@ -19,6 +19,7 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Budget as BudgetModel;
use FireflyIII\Models\LimitRepetition;
use Illuminate\Support\Collection;
/**
* Class ReportHelper
@@ -59,11 +60,6 @@ class ReportHelper implements ReportHelperInterface
$accounts = $this->query->getAllAccounts($date, $end, $shared);
$start = '0';
$end = '0';
$diff = '0';
bcscale(2);
// remove cash account, if any:
$accounts = $accounts->filter(
function (Account $account) {
@@ -74,21 +70,7 @@ class ReportHelper implements ReportHelperInterface
return null;
}
);
// summarize:
foreach ($accounts as $account) {
$start = bcadd($start, $account->startBalance);
$end = bcadd($end, $account->endBalance);
$diff = bcadd($diff, bcsub($account->endBalance, $account->startBalance));
}
$object = new AccountCollection;
$object->setStart($start);
$object->setEnd($end);
$object->setDifference($diff);
$object->setAccounts($accounts);
return $object;
return $this->getAccountReportForList($date, $end, $accounts);
}
/**
@@ -418,4 +400,37 @@ class ReportHelper implements ReportHelperInterface
return $months;
}
/**
* This method generates a full report for the given period on all
* given accounts
*
* @param Carbon $date
* @param Carbon $end
* @param Collection $accounts
*
* @return AccountCollection
*/
public function getAccountReportForList(Carbon $date, Carbon $end, Collection $accounts)
{
$start = '0';
$end = '0';
$diff = '0';
bcscale(2);
// summarize:
foreach ($accounts as $account) {
$start = bcadd($start, $account->startBalance);
$end = bcadd($end, $account->endBalance);
$diff = bcadd($diff, bcsub($account->endBalance, $account->startBalance));
}
$object = new AccountCollection;
$object->setStart($start);
$object->setEnd($end);
$object->setDifference($diff);
$object->setAccounts($accounts);
return $object;
}
}

13
app/Helpers/Report/ReportHelperInterface.php
View File

@@ -10,6 +10,7 @@ use FireflyIII\Helpers\Collection\Budget as BudgetCollection;
use FireflyIII\Helpers\Collection\Category as CategoryCollection;
use FireflyIII\Helpers\Collection\Expense;
use FireflyIII\Helpers\Collection\Income;
use Illuminate\Support\Collection;
/**
* Interface ReportHelperInterface
@@ -31,6 +32,18 @@ interface ReportHelperInterface
*/
public function getAccountReport(Carbon $date, Carbon $end, $shared);
/**
* This method generates a full report for the given period on all
* given accounts
*
* @param Carbon $date
* @param Carbon $end
* @param Collection $accounts
*
* @return AccountCollection
*/
public function getAccountReportForList(Carbon $date, Carbon $end, Collection $accounts);
/**
* This method generates a full report for the given period on all
* the users bills and their payments.