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

Some bug fixes and cleanup.

Browse Source
This commit is contained in:
James Cole
2015-06-05 16:49:16 +02:00
parent 834b1afb38
commit 40e49ffc37
5 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,6 +63,7 @@ class AccountController extends Controller
}
}
//
$index = 1;
/** @var Account $account */

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

@@ -55,17 +55,25 @@ class BudgetController extends Controller
while ($first < $last) {
$end = Navigation::addPeriod($first, $range, 0);
$end->subDay();
// start date for chart.
$chartDate = clone $end;
$chartDate->startOfMonth();
$spent = $repository->spentInPeriodCorrected($budget, $first, $end);
$chart->addRow($end, $spent);
$chart->addRow($chartDate, $spent);
$first = Navigation::addPeriod($first, $range, 0);
}
$chart->generate();
$data = $chart->getData();
$cache->store($data);
return Response::json($data);
@@ -242,7 +250,7 @@ class BudgetController extends Controller
}
$chart->addRowArray($row);
$start->addMonth();
$start->endOfMonth()->addDay();
}
$chart->generate();

11
app/Repositories/Shared/ComponentRepository.php
View File

@@ -4,7 +4,6 @@ namespace FireflyIII\Repositories\Shared;
use Carbon\Carbon;
use Illuminate\Database\Query\JoinClause;
use stdClass;
/**
* Class ComponentRepository
@@ -16,15 +15,15 @@ class ComponentRepository
/**
* @param stdClass $object
* @param Carbon $start
* @param Carbon $end
* @param $object
* @param Carbon $start
* @param Carbon $end
*
* @param bool $shared
* @param bool $shared
*
* @return string
*/
protected function spentInPeriod(stdClass $object, Carbon $start, Carbon $end, $shared = false)
protected function spentInPeriod($object, Carbon $start, Carbon $end, $shared = false)
{
if ($shared === true) {
// shared is true.

5
app/Support/Navigation.php
View File

@@ -41,6 +41,7 @@ class Navigation
'6M' => 6,
'half-year' => 6,
];
$specialMap = ['1M', 'month', 'monthly'];
if (!isset($functionMap[$repeatFreq])) {
throw new FireflyException('Cannot do addPeriod for $repeat_freq "' . $repeatFreq . '"');
}
@@ -118,7 +119,7 @@ class Navigation
'year' => 'endOfYear',
'yearly' => 'endOfYear',
];
$specials = ['mont', 'monthly'];
$specials = ['mont', 'monthly'];
$currentEnd = clone $theCurrentEnd;
@@ -270,7 +271,7 @@ class Navigation
'3M' => 'lastOfQuarter',
'1Y' => 'endOfYear',
];
$end = clone $start;
$end = clone $start;
if (isset($functionMap[$range])) {
$function = $functionMap[$range];