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

These budget charts are the worst, I'm telling you.

Browse Source
This commit is contained in:
James Cole
2016-05-05 21:25:20 +02:00
parent 4e1ff8c4a3
commit dd8b500efd
11 changed files with 379 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/BudgetController.php
View File

@@ -264,7 +264,7 @@ class BudgetController extends Controller
$set = $budget->limitrepetitions()->orderBy('startdate', 'DESC')->get();
$subTitle = e($budget->name);
$journals->setPath('/budgets/show/' . $budget->id);
$spentArray = $repository->spentPerDay($budget, $start, $end);
$spentArray = $repository->spentPerDay($budget, $start, $end, new Collection);
$limits = new Collection();
/** @var LimitRepetition $entry */
@@ -298,7 +298,7 @@ class BudgetController extends Controller
$set = new Collection([$repetition]);
$subTitle = trans('firefly.budget_in_month', ['name' => $budget->name, 'month' => $repetition->startdate->formatLocalized($this->monthFormat)]);
$journals->setPath('/budgets/show/' . $budget->id . '/' . $repetition->id);
$spentArray = $repository->spentPerDay($budget, $start, $end);
$spentArray = $repository->spentPerDay($budget, $start, $end, new Collection);
$limits = new Collection();
/** @var LimitRepetition $entry */

2
app/Http/Controllers/Chart/AccountController.php
View File

@@ -13,7 +13,7 @@ use Illuminate\Support\Collection;
use Preferences;
use Response;
/**
/** checked
* Class AccountController
*
* @package FireflyIII\Http\Controllers\Chart

2
app/Http/Controllers/Chart/BillController.php
View File

@@ -24,7 +24,7 @@ class BillController extends Controller
protected $generator;
/**
*
* checked
*/
public function __construct()
{

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

@@ -39,6 +39,8 @@ class BudgetController extends Controller
}
/**
* checked
*
* @param BudgetRepositoryInterface $repository
* @param Budget $budget
*
@@ -59,7 +61,7 @@ class BudgetController extends Controller
$cache->addProperty('budget');
if ($cache->has()) {
return Response::json($cache->get());
//return Response::json($cache->get());
}
$final = clone $last;
@@ -67,7 +69,7 @@ class BudgetController extends Controller
$last = Navigation::endOfX($last, $range, $final);
$entries = new Collection;
// get all expenses:
$spentArray = $repository->spentPerDay($budget, $first, $last);
$spentArray = $repository->spentPerDay($budget, $first, $last, new Collection);
while ($first < $last) {
@@ -113,19 +115,14 @@ class BudgetController extends Controller
return Response::json($cache->get());
}
$set = $repository->getExpensesPerDay($budget, $start, $end);
$set = $repository->spentPerDay($budget, $start, $end, new Collection);
$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 = $set[$formatted] ?? '0';
/*
* Sum of expenses on this day:
@@ -135,7 +132,7 @@ class BudgetController extends Controller
$start->addDay();
}
$data = $this->generator->budgetLimit($entries);
$data = $this->generator->budgetLimit($entries, 'monthAndDay');
$cache->store($data);
return Response::json($data);

2
app/Http/Controllers/ReportController.php
View File

@@ -100,7 +100,7 @@ class ReportController extends Controller
// lower threshold
if ($start < session('first')) {
Log::debug('Start is ' . $start . ' but sessionfirst is ' . session('first'));
Log::debug('Start is ' . $start . ' but session first is ' . session('first'));
$start = session('first');
}