kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-18 07:38:29 +00:00
Code Issues Projects Releases Wiki Activity

Code cleanup [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-06-03 21:25:11 +02:00
parent 409ec2e086
commit cc7c2e952c
69 changed files with 695 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,8 +2,6 @@
namespace FireflyIII\Http\Controllers\Chart;
use Auth;
use Cache;
use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
@@ -11,7 +9,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use Grumpydictator\Gchart\GChart;
use Illuminate\Support\Collection;
use Log;
use Preferences;
use Response;
use Session;
@@ -43,15 +40,14 @@ class AccountController extends Controller
$end->endOfMonth();
// chart properties for cache:
$chartProperties = new CacheProperties();
$chartProperties->addProperty($start);
$chartProperties->addProperty($end);
$chartProperties->addProperty('all');
$chartProperties->addProperty('accounts');
if ($chartProperties->has()) {
return Response::json($chartProperties->get());
$cache = new CacheProperties();
$cache->addProperty($start);
$cache->addProperty($end);
$cache->addProperty('all');
$cache->addProperty('accounts');
if ($cache->has()) {
return Response::json($cache->get());
}
$md5 = $chartProperties->getMd5();
$chart->addColumn(trans('firefly.dayOfMonth'), 'date');
@@ -91,7 +87,7 @@ class AccountController extends Controller
$chart->generate();
$data = $chart->getData();
Cache::forever($md5, $data);
$cache->store($data);
return Response::json($data);
}
@@ -114,15 +110,14 @@ class AccountController extends Controller
$accounts = $repository->getFrontpageAccounts($frontPage);
// chart properties for cache:
$chartProperties = new CacheProperties();
$chartProperties->addProperty($start);
$chartProperties->addProperty($end);
$chartProperties->addProperty('frontpage');
$chartProperties->addProperty('accounts');
if ($chartProperties->has()) {
return Response::json($chartProperties->get());
$cache = new CacheProperties();
$cache->addProperty($start);
$cache->addProperty($end);
$cache->addProperty('frontpage');
$cache->addProperty('accounts');
if ($cache->has()) {
return Response::json($cache->get());
}
$md5 = $chartProperties->getMd5();
$index = 1;
@@ -148,7 +143,7 @@ class AccountController extends Controller
$chart->generate();
$data = $chart->getData();
Cache::forever($md5, $data);
$cache->store($data);
return Response::json($data);
@@ -174,18 +169,15 @@ class AccountController extends Controller
$today = new Carbon;
// chart properties for cache:
$chartProperties = new CacheProperties();
$chartProperties->addProperty($start);
$chartProperties->addProperty($end);
$chartProperties->addProperty('frontpage');
$chartProperties->addProperty('single');
$chartProperties->addProperty($account->id);
if ($chartProperties->has()) {
return Response::json($chartProperties->get());
$cache = new CacheProperties();
$cache->addProperty($start);
$cache->addProperty($end);
$cache->addProperty('frontpage');
$cache->addProperty('single');
$cache->addProperty($account->id);
if ($cache->has()) {
return Response::json($cache->get());
}
$md5 = $chartProperties->getMd5();
while ($end >= $current) {
$certain = $current < $today;
@@ -197,7 +189,7 @@ class AccountController extends Controller
$chart->generate();
$data = $chart->getData();
Cache::forever($md5, $data);
$cache->store($data);
return Response::json($data);
}