kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-13 05:08:10 +00:00
Code Issues Projects Releases Wiki Activity

Remove various sort routines.

Browse Source
This commit is contained in:
James Cole
2019-05-04 20:58:43 +02:00
parent d5c5fa4fad
commit 8676764513
19 changed files with 261 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Account/IndexController.php
View File

@@ -77,18 +77,9 @@ class IndexController extends Controller
$types = config('firefly.accountTypesByIdentifier.' . $what);
$collection = $this->repository->getAccountsByType($types);
$total = $collection->count();
// sort collection:
$collection = $collection->sortBy(
function (Account $account) {
return ($account->active ? '0' : '1') . $account->name;
}
);
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
$accounts = $collection->slice(($page - 1) * $pageSize, $pageSize);
$page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page');
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
$accounts = $collection->slice(($page - 1) * $pageSize, $pageSize);
unset($collection);
/** @var Carbon $start */
$start = clone session('start', Carbon::now()->startOfMonth());

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

@@ -212,11 +212,6 @@ class BillController extends Controller
return $return;
}
);
$bills = $bills->sortBy(
function (array $bill) {
return (int)!$bill['active'] . strtolower($bill['name']);
}
);
// add info about rules:
$rules = $this->billRepository->getRulesForBills($paginator->getCollection());

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

@@ -114,6 +114,7 @@ class BillController extends Controller
}
$results = $collector->setAllAssetAccounts()->setBills(new Collection([$bill]))->getTransactions();
// TODO remove me
/** @var Collection $results */
$results = $results->sortBy(
function (Transaction $transaction) {

7
app/Http/Controllers/CurrencyController.php
View File

@@ -311,13 +311,6 @@ class CurrencyController extends Controller
$pageSize = (int)app('preferences')->get('listPageSize', 50)->data;
$collection = $this->repository->getAll();
$total = $collection->count();
$collection = $collection->sortBy(
function (TransactionCurrency $currency) {
$intEnabled = $currency->enabled ? 0 : 1;
return $intEnabled . $currency->name;
}
);
$collection = $collection->slice(($page - 1) * $pageSize, $pageSize);
$currencies = new LengthAwarePaginator($collection, $total, $pageSize, $page);
$currencies->setPath(route('currencies.index'));

134
app/Http/Controllers/Json/AutoCompleteController.php
View File

@@ -25,12 +25,21 @@ namespace FireflyIII\Http\Controllers\Json;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface;
use FireflyIII\Repositories\Tag\TagRepositoryInterface;
use FireflyIII\Support\CacheProperties;
use FireflyIII\Support\Http\Controllers\AutoCompleteCollector;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Log;
/**
* Class AutoCompleteController.
@@ -41,6 +50,51 @@ class AutoCompleteController extends Controller
{
use AutoCompleteCollector;
/**
* @param Request $request
*
* @return JsonResponse
*/
public function accounts(Request $request): JsonResponse
{
$accountTypes = explode(',', $request->get('types') ?? '');
$search = $request->get('query');
/** @var AccountRepositoryInterface $repository */
$repository = app(AccountRepositoryInterface::class);
// filter the account types:
$allowedAccountTypes = [AccountType::ASSET, AccountType::EXPENSE, AccountType::REVENUE, AccountType::LOAN, AccountType::DEBT, AccountType::MORTGAGE,];
$filteredAccountTypes = [];
foreach ($accountTypes as $type) {
if (in_array($type, $allowedAccountTypes, true)) {
$filteredAccountTypes[] = $type;
}
}
Log::debug('Now in accounts(). Filtering results.', $filteredAccountTypes);
$return = [];
$result = $repository->searchAccount((string)$search, $filteredAccountTypes);
$defaultCurrency = app('amount')->getDefaultCurrency();
/** @var Account $account */
foreach ($result as $account) {
$currency = $repository->getAccountCurrency($account);
$currency = $currency ?? $defaultCurrency;
$return[] = [
'id' => $account->id,
'name' => $account->name,
'type' => $account->accountType->type,
'currency_id' => $currency->id,
'currency_name' => $currency->name,
'currency_code' => $currency->code,
'currency_decimal_places' => $currency->decimal_places,
];
}
return response()->json($return);
}
/**
* List of all journals.
*
@@ -84,8 +138,8 @@ class AutoCompleteController extends Controller
* @param Request $request
* @param string $subject
*
* @throws FireflyException
* @return JsonResponse
* @throws FireflyException
*/
public function autoComplete(Request $request, string $subject): JsonResponse
{
@@ -140,6 +194,59 @@ class AutoCompleteController extends Controller
return response()->json($filtered);
}
/**
* @return JsonResponse
*/
public function budgets(): JsonResponse
{
/** @var BudgetRepositoryInterface $repository */
$repository = app(BudgetRepositoryInterface::class);
return response()->json($repository->getActiveBudgets()->toArray());
}
/**
* @param Request $request
*
* @return JsonResponse
*/
public function categories(Request $request): JsonResponse
{
$query = (string)$request->get('query');
/** @var CategoryRepositoryInterface $repository */
$repository = app(CategoryRepositoryInterface::class);
$result = $repository->searchCategory($query);
return response()->json($result->toArray());
}
/**
* @param Request $request
*
* @return JsonResponse
*/
public function currencies(Request $request): JsonResponse
{
/** @var CurrencyRepositoryInterface $repository */
$repository = app(CurrencyRepositoryInterface::class);
$return = [];
$collection = $repository->getAll();
/** @var TransactionCurrency $currency */
foreach ($collection as $currency) {
$return[] = [
'id' => $currency->id,
'name' => $currency->name,
'code' => $currency->code,
'symbol' => $currency->symbol,
'enabled' => $currency->enabled,
'decimal_places' => $currency->decimal_places,
];
}
return response()->json($return);
}
/**
* List of journals with their ID.
*
@@ -192,6 +299,31 @@ class AutoCompleteController extends Controller
return response()->json($return);
}
/**
* @return JsonResponse
*/
public function piggyBanks(): JsonResponse
{
/** @var PiggyBankRepositoryInterface $repository */
$repository = app(PiggyBankRepositoryInterface::class);
return response()->json($repository->getPiggyBanks()->toArray());
}
/**
* @return JsonResponse
*/
public function tags(Request $request): JsonResponse
{
$query = (string)$request->get('query');
/** @var TagRepositoryInterface $repository */
$repository = app(TagRepositoryInterface::class);
$result = $repository->searchTags($query);
return response()->json($result->toArray());
}
/**
* List of journals by type.
*

56
app/Http/Controllers/Transaction/CreateController.php
View File

@@ -25,11 +25,67 @@ namespace FireflyIII\Http\Controllers\Transaction;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Models\TransactionType;
use Illuminate\Http\Request;
/**
* Class CreateController
*/
class CreateController extends Controller
{
/**
* CreateController constructor.
*/
public function __construct()
{
parent::__construct();
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);
app('view')->share('uploadSize', $uploadSize);
$this->middleware(
static function ($request, $next) {
app('view')->share('title', (string)trans('firefly.transactions'));
app('view')->share('mainTitleIcon', 'fa-repeat');
return $next($request);
}
);
}
/**
* Create a new transaction group.
*
* @param Request $request
* @param string|null objectType
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function create(Request $request, string $objectType = null)
{
$objectType = strtolower($objectType ?? TransactionType::WITHDRAWAL);
$preFilled = session()->has('preFilled') ? session('preFilled') : [];
$subTitle = (string)trans('breadcrumbs.create_new_transaction');
$subTitleIcon = 'fa-plus';
$optionalFields = app('preferences')->get('transaction_journal_optional_fields', [])->data;
$source = (int)$request->get('source');
$allowedOpposingTypes = config('firefly.allowed_opposing_types');
$accountToTypes = config('firefly.account_to_transaction');
$defaultCurrency = app('amount')->getDefaultCurrency();
session()->put('preFilled', $preFilled);
// put previous url in session if not redirect from store (not "create another").
if (true !== session('transactions.create.fromStore')) {
$this->rememberPreviousUri('transactions.create.uri');
}
session()->forget('transactions.create.fromStore');
return view(
'transactions.create',
compact('subTitleIcon', 'objectType', 'subTitle', 'defaultCurrency', 'optionalFields', 'preFilled', 'allowedOpposingTypes', 'accountToTypes')
);
}
}