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

Sortable accounts.

Browse Source
This commit is contained in:
James Cole
2015-04-11 15:01:42 +02:00
parent 505aee22bb
commit 651a4fd3cc
6 changed files with 32 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/AccountController.php
View File

@@ -7,7 +7,6 @@ use FireflyIII\Http\Requests;
use FireflyIII\Http\Requests\AccountFormRequest;
use FireflyIII\Models\Account;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use Illuminate\Pagination\LengthAwarePaginator;
use Input;
use Redirect;
use Session;
@@ -123,18 +122,14 @@ class AccountController extends Controller
$subTitle = Config::get('firefly.subTitlesByIdentifier.' . $what);
$subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);
$types = Config::get('firefly.accountTypesByIdentifier.' . $what);
$size = 50;
$page = intval(Input::get('page')) == 0 ? 1 : intval(Input::get('page'));
$set = $repository->getAccounts($types, $page);
$total = $repository->countAccounts($types);
$accounts = $repository->getAccounts($types);
// last activity:
/**
* HERE WE ARE
*/
$start = clone Session::get('start', Carbon::now()->startOfMonth());
$start->subDay();
$set->each(
$accounts->each(
function (Account $account) use ($start, $repository) {
$account->lastActivityDate = $repository->getLastActivity($account);
$account->startBalance = Steam::balance($account, $start);
@@ -142,10 +137,6 @@ class AccountController extends Controller
}
);
$accounts = new LengthAwarePaginator($set, $total, $size, $page);
$accounts->setPath(route('accounts.index', $what));
return view('accounts.index', compact('what', 'subTitleIcon', 'subTitle', 'accounts'));
}

2
app/Http/Controllers/BillController.php
View File

@@ -45,7 +45,7 @@ class BillController extends Controller
$expense = null;
// get users expense accounts:
$accounts = $repository->getAccounts(Config::get('firefly.accountTypesByIdentifier.expense'), -1);
$accounts = $repository->getAccounts(Config::get('firefly.accountTypesByIdentifier.expense'));
foreach ($matches as $match) {
$match = strtolower($match);

16
app/Repositories/Account/AccountRepository.php
View File

@@ -53,26 +53,16 @@ class AccountRepository implements AccountRepositoryInterface
/**
* @param array $types
* @param int $page
*
* @return Collection
*/
public function getAccounts(array $types, $page)
public function getAccounts(array $types)
{
$query = Auth::user()->accounts()->with(
$result = Auth::user()->accounts()->with(
['accountmeta' => function (HasMany $query) {
$query->where('name', 'accountRole');
}]
)->accountTypeIn($types)->orderBy('accounts.name', 'ASC');
if ($page == -1) {
$result = $query->get(['accounts.*']);
} else {
$size = 50;
$offset = ($page - 1) * $size;
$result = $query->take($size)->offset($offset)->get(['accounts.*']);
}
)->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*'])->sortBy('name');
return $result;
}

3
app/Repositories/Account/AccountRepositoryInterface.php
View File

@@ -33,11 +33,10 @@ interface AccountRepositoryInterface
/**
* @param array $types
* @param int $page
*
* @return mixed
*/
public function getAccounts(array $types, $page);
public function getAccounts(array $types);
/**
* @param TransactionJournal $journal