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

Reorder bill chart [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-07-01 13:18:50 +02:00
parent f28fdf8252
commit fc7d65629a
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ use App;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Bill; use FireflyIII\Models\Bill;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface;
use FireflyIII\Support\CacheProperties; use FireflyIII\Support\CacheProperties;
@@ -57,7 +58,7 @@ class BillController extends Controller
$cache->addProperty('bills'); $cache->addProperty('bills');
$cache->addProperty('frontpage'); $cache->addProperty('frontpage');
if ($cache->has()) { if ($cache->has()) {
return Response::json($cache->get()); // @codeCoverageIgnore return Response::json($cache->get()); // @codeCoverageIgnore
} }
$bills = $repository->getActiveBills(); $bills = $repository->getActiveBills();
@@ -129,6 +130,13 @@ class BillController extends Controller
// get first transaction or today for start: // get first transaction or today for start:
$results = $repository->getJournals($bill); $results = $repository->getJournals($bill);
// resort:
$results = $results->sortBy(
function (TransactionJournal $journal) {
return $journal->date->format('U');
}
);
$data = $this->generator->single($bill, $results); $data = $this->generator->single($bill, $results);
$cache->store($data); $cache->store($data);

1
database/seeds/TestDataSeeder.php
View File

@@ -289,6 +289,7 @@ class TestDataSeeder extends Seeder
'user_id' => $this->user->id, 'user_id' => $this->user->id,
'transaction_type_id' => 1, 'transaction_type_id' => 1,
'transaction_currency_id' => 1, 'transaction_currency_id' => 1,
'bill_id' => 1,
'description' => $description, 'description' => $description,
'completed' => 1, 'completed' => 1,
'date' => $date, 'date' => $date,