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

This will be the first release!

Browse Source
This commit is contained in:
James Cole
2014-08-28 07:53:54 +02:00
parent c7f070a2d1
commit c4f42a604f
75 changed files with 1043 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/Firefly/Helper/Controllers/Budget.php
View File

@@ -110,8 +110,8 @@ class Budget implements BudgetInterface
// get the limits:
if ($useSessionDates) {
$limits = $budget->limits()->where('startdate', '>=', $sessionStart->format('Y-m-d'))->where(
'startdate', '<=', $sessionEnd->format('Y-m-d')
)->get();
'startdate', '<=', $sessionEnd->format('Y-m-d')
)->get();
} else {
$limits = $budget->limits;
}

3
app/lib/Firefly/Helper/Controllers/BudgetInterface.php
View File

@@ -28,7 +28,8 @@ interface BudgetInterface
/**
* @param \Budget $budget
* @param bool $useSessionDates
* @param bool $useSessionDates
*
* @return mixed
*/
public function organizeRepetitions(\Budget $budget, $useSessionDates = false);

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

@@ -169,8 +169,8 @@ class Chart implements ChartInterface
$amount = floatval($rep->amount);
$spent = $rep->spent;
$color = $spent > $amount ? '#FF0000' : null;
$data['series'][0]['data'][] = ['y' => $amount, 'id' => 'def'];
$data['series'][1]['data'][] = ['y' => $rep->spent, 'color' => $color, 'id' => 'abc'];
$data['series'][0]['data'][] = ['y' => $amount, 'id' => 'amount-' . $rep->id];
$data['series'][1]['data'][] = ['y' => $rep->spent, 'color' => $color, 'id' => 'spent-' . $rep->id];
}
}