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

Fixed some more charts.

Browse Source
This commit is contained in:
James Cole 2016-05-06 22:53:08 +02:00
parent 27f5fe18df
commit 0460811e6c
3 changed files with 117 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Report/BudgetReportHelper.php
View File

@ -126,8 +126,7 @@ class BudgetReportHelper implements BudgetReportHelperInterface
$set = new Collection; $set = new Collection;
/** @var Budget $budget */ /** @var Budget $budget */
foreach ($budgets as $budget) { foreach ($budgets as $budget) {
$expenses = [0]; // $repository->spentPerDay($budget, $start, $end, $accounts); // TODO BUDGET spentInPeriod $total = $repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end);
$total = strval(array_sum($expenses));
if (bccomp($total, '0') === -1) { if (bccomp($total, '0') === -1) {
$set->push($budget); $set->push($budget);
} }

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

@ -59,7 +59,7 @@ class BudgetController extends Controller
$cache->addProperty('budget'); $cache->addProperty('budget');
if ($cache->has()) { if ($cache->has()) {
//return Response::json($cache->get()); return Response::json($cache->get());
} }
$final = clone $last; $final = clone $last;
@ -76,8 +76,8 @@ class BudgetController extends Controller
$currentEnd = Navigation::endOfPeriod($first, $range); $currentEnd = Navigation::endOfPeriod($first, $range);
// sub another day because reasons. // sub another day because reasons.
$currentEnd->subDay(); $currentEnd->subDay();
$spent = $repository->spentInPeriod($budgetCollection, new Collection, $currentStart, $currentEnd); $spent = $repository->spentInPeriod($budgetCollection, new Collection, $currentStart, $currentEnd);
$entry = [$first, ($spent * -1)]; $entry = [$first, ($spent * -1)];
$entries->push($entry); $entries->push($entry);
$first = Navigation::addPeriod($first, $range, 0); $first = Navigation::addPeriod($first, $range, 0);
@ -87,33 +87,6 @@ class BudgetController extends Controller
$cache->store($data); $cache->store($data);
return Response::json($data); return Response::json($data);
/**
* $final = clone $last;
* $final->addYears(2);
* $last = Navigation::endOfX($last, $range, $final);
* $entries = new Collection;
* // get all expenses:
* $spentArray = $repository->spentPerDay($budget, $first, $last, new Collection);
*
* while ($first < $last) {
*
* // periodspecific dates:
* $currentStart = Navigation::startOfPeriod($first, $range);
* $currentEnd = Navigation::endOfPeriod($first, $range);
* $spent = $this->getSumOfRange($currentStart, $currentEnd, $spentArray);
* $entry = [$first, ($spent * -1)];
*
* $entries->push($entry);
* $first = Navigation::addPeriod($first, $range, 0);
* }
*
* $data = $this->generator->budgetLimit($entries, 'month');
* $cache->store($data);
*
* return Response::json($data);
* **/
} }
/** /**
@ -231,76 +204,11 @@ class BudgetController extends Controller
$cache->store($data); $cache->store($data);
return Response::json($data); return Response::json($data);
/**
*
*
*
*
* $budgets = $repository->getBudgetsAndLimitsInRange($start, $end);
* $allEntries = new Collection;
* $accounts = $accountRepository->getAccounts(['Default account', 'Asset account', 'Cash account']);
* $format = strval(trans('config.month_and_day'));
*
*
* // @var Budget $budget
* foreach ($budgets as $budget) {
* // we already have amount, startdate and enddate.
* // if this "is" a limit repetition (as opposed to a budget without one entirely)
* // depends on whether startdate and enddate are null.
* $name = $budget->name;
* if (is_null($budget->startdate) && is_null($budget->enddate)) {
* $currentStart = clone $start;
* $currentEnd = clone $end;
* $expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
* $amount = '0';
* $left = '0';
* $spent = $expenses;
* $overspent = '0';
* } else {
*
* // update the display name if the range
* // of the limit repetition does not match
* // the session's range (for clarity).
* if (
* ($start->format('Y-m-d') != $budget->startdate->format('Y-m-d'))
* || ($end->format('Y-m-d') != $budget->enddate->format('Y-m-d'))
* ) {
* $name .= ' ' . trans(
* 'firefly.between_dates',
* [
* 'start' => $budget->startdate->formatLocalized($format),
* 'end' => $budget->startdate->formatLocalized($format),
* ]
* );
* }
* $currentStart = clone $budget->startdate;
* $currentEnd = clone $budget->enddate;
* $expenses = $repository->balanceInPeriod($budget, $currentStart, $currentEnd, $accounts);
* $amount = $budget->amount;
* // smaller than 1 means spent MORE than budget allows.
* $left = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? '0' : bcadd($budget->amount, $expenses);
* $spent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcmul($amount, '-1') : $expenses;
* $overspent = bccomp(bcadd($budget->amount, $expenses), '0') < 1 ? bcadd($budget->amount, $expenses) : '0';
* }
*
* $allEntries->push([$name, $left, $spent, $overspent, $amount, $expenses]);
* }
*
* $noBudgetExpenses = $repository->getWithoutBudgetSum($accounts, $start, $end);
* $allEntries->push([trans('firefly.no_budget'), '0', '0', $noBudgetExpenses, '0', '0']);
* $data = $this->generator->frontpage($allEntries);
* $cache->store($data);
*
* return Response::json($data);
**/
} }
/** /**
* *
* @param BudgetRepositoryInterface $repository * @param BudgetRepositoryInterface $repository
* @param $reportType
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* @param Collection $accounts * @param Collection $accounts
@ -309,141 +217,122 @@ class BudgetController extends Controller
* *
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function multiYear(BudgetRepositoryInterface $repository, string $reportType, Carbon $start, Carbon $end, Collection $accounts, Collection $budgets) public function multiYear(BudgetRepositoryInterface $repository, Carbon $start, Carbon $end, Collection $accounts, Collection $budgets)
{ {
/**
* // chart properties for cache: $cache = new CacheProperties();
* $cache = new CacheProperties(); $cache->addProperty($start);
* $cache->addProperty($reportType); $cache->addProperty($end);
* $cache->addProperty($start); $cache->addProperty($accounts);
* $cache->addProperty($end); $cache->addProperty($budgets);
* $cache->addProperty($accounts); $cache->addProperty('multiYearBudget');
* $cache->addProperty($budgets);
* $cache->addProperty('multiYearBudget'); if ($cache->has()) {
* //return Response::json($cache->get());
* if ($cache->has()) { }
* return Response::json($cache->get()); $budgetIds = $budgets->pluck('id')->toArray();
* } $repetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
* $budgeted = [];
* // Get the budgeted amounts for each budgets in each year. $entries = new Collection;
* $budgetedSet = $repository->getBudgetedPerYear($budgets, $start, $end); // filter budgets once:
* $budgetedArray = []; $repetitions = $repetitions->filter(
* // @var Budget $entry function (LimitRepetition $repetition) use ($budgetIds) {
* foreach ($budgetedSet as $entry) { if (in_array(strval($repetition->budget_id), $budgetIds)) {
* $budgetedArray[$entry->id][$entry->dateFormatted] = $entry->budgeted; return $repetition;
* } }
* }
* $set = $repository->getBudgetsAndExpensesPerYear($budgets, $accounts, $start, $end); );
* $entries = new Collection; /** @var LimitRepetition $repetition */
* // go by budget, not by year. foreach ($repetitions as $repetition) {
* // @var Budget $budget $year = $repetition->startdate->year;
* foreach ($budgets as $budget) { if (isset($budgeted[$repetition->budget_id][$year])) {
* $entry = ['name' => '', 'spent' => [], 'budgeted' => []]; $budgeted[$repetition->budget_id][$year] = bcadd($budgeted[$repetition->budget_id][$year], $repetition->amount);
* $id = $budget->id; continue;
* $currentStart = clone $start; }
* while ($currentStart < $end) { $budgeted[$repetition->budget_id][$year] = $repetition->amount;
* // fix the date: }
* $currentEnd = clone $currentStart;
* $currentEnd->endOfYear(); foreach ($budgets as $budget) {
* $currentStart = clone $start;
* // basic information: $entry = ['name' => $budget->name, 'spent' => [], 'budgeted' => []];
* $year = $currentStart->year; while ($currentStart < $end) {
* $entry['name'] = $budget->name ?? (string)trans('firefly.no_budget'); // fix the date:
* $spent = 0; $currentEnd = clone $currentStart;
* // this might be a good moment to collect no budget stuff. $year = $currentStart->year;
* if (is_null($budget->id)) { $currentEnd->endOfYear();
* // get without budget sum in range:
* $spent = $repository->getWithoutBudgetSum($accounts, $currentStart, $currentEnd) * -1; $spent = $repository->spentInPeriod(new Collection([$budget]), $accounts, $currentStart, $currentEnd);
* } else {
* if (isset($set[$id]['entries'][$year])) { // jump to next year.
* $spent = $set[$id]['entries'][$year] * -1; $currentStart = clone $currentEnd;
* } $currentStart->addDay();
* }
* $entry['spent'][$year] = round($spent * -1, 2);
* $budgeted = $budgetedArray[$id][$year] ?? '0'; $entry['budgeted'][$year] = isset($budgeted[$budget->id][$year]) ? round($budgeted[$budget->id][$year], 2) : 0;
* $entry['spent'][$year] = $spent; }
* $entry['budgeted'][$year] = round($budgeted, 2); $entries->push($entry);
* }
* $data = $this->generator->multiYear($entries);
* // jump to next year. $cache->store($data);
* $currentStart = clone $currentEnd;
* $currentStart->addDay(); return Response::json($data);
* }
* $entries->push($entry);
* }
* // generate chart with data:
* $data = $this->generator->multiYear($entries);
* $cache->store($data);
*
* return Response::json($data);
**/
} }
/** /**
* @param Budget $budget * @param BudgetRepositoryInterface $repository
* @param string $reportType * @param Budget $budget
* @param Carbon $start * @param Carbon $start
* @param Carbon $end * @param Carbon $end
* @param Collection $accounts * @param Collection $accounts
* *
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public function period(Budget $budget, string $reportType, Carbon $start, Carbon $end, Collection $accounts) public function period(BudgetRepositoryInterface $repository, Budget $budget, Carbon $start, Carbon $end, Collection $accounts)
{ {
/** // chart properties for cache:
* // chart properties for cache: $cache = new CacheProperties();
* $cache = new CacheProperties(); $cache->addProperty($start);
* $cache->addProperty($start); $cache->addProperty($end);
* $cache->addProperty($end); $cache->addProperty($accounts);
* $cache->addProperty($reportType); $cache->addProperty($budget->id);
* $cache->addProperty($accounts); $cache->addProperty('budget');
* $cache->addProperty($budget->id); $cache->addProperty('period');
* $cache->addProperty('budget'); if ($cache->has()) {
* $cache->addProperty('period'); //return Response::json($cache->get());
* if ($cache->has()) { }
* return Response::json($cache->get()); // loop over period, add by users range:
* } $current = clone $start;
* $viewRange = Preferences::get('viewRange', '1M')->data;
* // @var BudgetRepositoryInterface $repository $set = new Collection;
* $repository = app(BudgetRepositoryInterface::class); $repetitions = $repository->getAllBudgetLimitRepetitions($start, $end);
* // loop over period, add by users range:
* $current = clone $start;
* $viewRange = Preferences::get('viewRange', '1M')->data; while ($current < $end) {
* $set = new Collection; $currentStart = clone $current;
* while ($current < $end) { $currentEnd = Navigation::endOfPeriod($currentStart, $viewRange);
* $currentStart = clone $current; $reps = $repetitions->filter(
* $currentEnd = Navigation::endOfPeriod($currentStart, $viewRange); function (LimitRepetition $repetition) use ($budget, $currentStart) {
* if ($repetition->budget_id === $budget->id && $repetition->startdate == $currentStart) {
* // get all budget limits and their repetitions. return $repetition;
* $reps = $repository->getAllBudgetLimitRepetitions($currentStart, $currentEnd, $budget); }
* $budgeted = $reps->sum('amount'); }
* $perBudget = $repository->spentPerBudgetPerAccount(new Collection([$budget]), $accounts, $currentStart, $currentEnd); );
* // includes null, so filter! $budgeted = $reps->sum('amount');
* $perBudget = $perBudget->filter( $spent = $repository->spentInPeriod(new Collection([$budget]), $accounts, $currentStart, $currentEnd);
* function (TransactionJournal $journal) use ($budget) { $entry = [
* if (intval($journal->budget_id) === $budget->id) { 'date' => clone $currentStart,
* return $journal; 'budgeted' => $budgeted,
* } 'spent' => $spent,
* } ];
* ); $set->push($entry);
* $currentEnd->addDay();
* $current = clone $currentEnd;
* $spent = $perBudget->sum('spent');
* }
* $entry = [ $data = $this->generator->period($set, $viewRange);
* 'date' => clone $currentStart, $cache->store($data);
* 'budgeted' => $budgeted,
* 'spent' => $spent, return Response::json($data);
* ];
* $set->push($entry);
* $currentEnd->addDay();
* $current = clone $currentEnd;
* }
* $data = $this->generator->period($set, $viewRange);
* $cache->store($data);
*
* return Response::json($data);
*/
} }
@ -457,10 +346,9 @@ class BudgetController extends Controller
* *
* @return \Illuminate\Http\JsonResponse * @return \Illuminate\Http\JsonResponse
*/ */
public public function year(BudgetRepositoryInterface $repository, string $reportType, Carbon $start, Carbon $end, Collection $accounts)
function year( {
BudgetRepositoryInterface $repository, string $reportType, Carbon $start, Carbon $end, Collection $accounts
) {
/** /**
* // chart properties for cache: * // chart properties for cache:
* $cache = new CacheProperties(); * $cache = new CacheProperties();

4
app/Http/routes.php
View File

@ -201,8 +201,8 @@ Route::group(
Route::get('/chart/budget/frontpage', ['uses' => 'Chart\BudgetController@frontpage']); Route::get('/chart/budget/frontpage', ['uses' => 'Chart\BudgetController@frontpage']);
// this chart is used in reports: // this chart is used in reports:
Route::get('/chart/budget/multi-year/{reportType}/{start_date}/{end_date}/{accountList}/{budgetList}', ['uses' => 'Chart\BudgetController@multiYear']); Route::get('/chart/budget/multi-year/default/{start_date}/{end_date}/{accountList}/{budgetList}', ['uses' => 'Chart\BudgetController@multiYear']);
Route::get('/chart/budget/period/{budget}/{reportType}/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\BudgetController@period']); Route::get('/chart/budget/period/{budget}/default/{start_date}/{end_date}/{accountList}', ['uses' => 'Chart\BudgetController@period']);
Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'Chart\BudgetController@budgetLimit']); Route::get('/chart/budget/{budget}/{limitrepetition}', ['uses' => 'Chart\BudgetController@budgetLimit']);
Route::get('/chart/budget/{budget}', ['uses' => 'Chart\BudgetController@budget']); Route::get('/chart/budget/{budget}', ['uses' => 'Chart\BudgetController@budget']);