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

Lighter chart.

Browse Source
This commit is contained in:
James Cole
2014-09-11 15:19:18 +02:00
parent 2359542d72
commit 710d6dfb74
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/lib/Firefly/Helper/Controllers/Chart.php
View File

@@ -25,13 +25,20 @@ class Chart implements ChartInterface
{ {
$current = clone $start; $current = clone $start;
$today = new Carbon; $today = new Carbon;
$return = ['name' => $account->name, 'id' => $account->id, 'data' => []]; $return = [
'name' => $account->name,
'id' => $account->id,
'type' => 'spline',
'pointStart' => $start->timestamp * 1000,
'pointInterval' => 24 * 3600 * 1000, // one day
'data' => []
];
while ($current <= $end) { while ($current <= $end) {
if ($current > $today) { if ($current > $today) {
$return['data'][] = [$current->timestamp * 1000, $account->predict(clone $current)]; $return['data'][] = $account->predict(clone $current);
} else { } else {
$return['data'][] = [$current->timestamp * 1000, $account->balance(clone $current)]; $return['data'][] = $account->balance(clone $current);
} }
$current->addDay(); $current->addDay();
@@ -561,19 +568,21 @@ class Chart implements ChartInterface
* *
* @return mixed * @return mixed
*/ */
public function spentOnLimitRepetitionBetweenDates(\LimitRepetition $repetition, Carbon $start, Carbon $end) { public function spentOnLimitRepetitionBetweenDates(\LimitRepetition $repetition, Carbon $start, Carbon $end)
{
return floatval( return floatval(
\Transaction:: \Transaction::
leftJoin('transaction_journals', 'transaction_journals.id', '=','transactions.transaction_journal_id') leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id')
->leftJoin('component_transaction_journal', 'component_transaction_journal.transaction_journal_id','=', ->leftJoin(
'transaction_journals.id' 'component_transaction_journal', 'component_transaction_journal.transaction_journal_id', '=',
)->where('component_transaction_journal.component_id', '=', $repetition->limit->budget->id)->where( 'transaction_journals.id'
'transaction_journals.date', '>=', $start->format('Y-m-d') )->where('component_transaction_journal.component_id', '=', $repetition->limit->budget->id)->where(
)->where('transaction_journals.date', '<=', $end->format('Y-m-d'))->where( 'transaction_journals.date', '>=', $start->format('Y-m-d')
'amount', '>', 0 )->where('transaction_journals.date', '<=', $end->format('Y-m-d'))->where(
)->sum('amount')) ; 'amount', '>', 0
)->sum('amount')
);
} }
} }