IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use new expanded for method.

Browse Source
This commit is contained in:
James Cole 2018-04-29 07:45:54 +02:00
parent bc4e06568d
commit a3d0355ddd
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/ExportController.php
View File

@ -23,12 +23,10 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers; namespace FireflyIII\Http\Controllers;
use Carbon\Carbon; use Carbon\Carbon;
use ExpandedForm;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Export\ProcessorInterface; use FireflyIII\Export\ProcessorInterface;
use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Requests\ExportFormRequest; use FireflyIII\Http\Requests\ExportFormRequest;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\ExportJob; use FireflyIII\Models\ExportJob;
use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface;
@ -107,12 +105,11 @@ class ExportController extends Controller
} }
/** /**
* @param AccountRepositoryInterface $repository
* @param ExportJobRepositoryInterface $jobs * @param ExportJobRepositoryInterface $jobs
* *
* @return View * @return View
*/ */
public function index(AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs) public function index(ExportJobRepositoryInterface $jobs)
{ {
// create new export job. // create new export job.
$job = $jobs->create(); $job = $jobs->create();
@ -120,15 +117,12 @@ class ExportController extends Controller
$jobs->cleanup(); $jobs->cleanup();
// does the user have shared accounts? // does the user have shared accounts?
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$accountList = ExpandedForm::makeSelectList($accounts);
$checked = array_keys($accountList);
$formats = array_keys(config('firefly.export_formats')); $formats = array_keys(config('firefly.export_formats'));
$defaultFormat = Preferences::get('export_format', config('firefly.default_export_format'))->data; $defaultFormat = Preferences::get('export_format', config('firefly.default_export_format'))->data;
$first = session('first')->format('Y-m-d'); $first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d');
return view('export.index', compact('job', 'checked', 'accountList', 'formats', 'defaultFormat', 'first', 'today')); return view('export.index', compact('job', 'formats', 'defaultFormat', 'first', 'today'));
} }
/** /**

11
app/Http/Controllers/RuleController.php
View File

@ -102,7 +102,6 @@ class RuleController extends Controller
$preFilled = [ $preFilled = [
'strict' => true, 'strict' => true,
]; ];
$groups = ExpandedForm::makeSelectList($this->ruleGroupRepos->get());
$oldTriggers = []; $oldTriggers = [];
$oldActions = []; $oldActions = [];
$returnToBill = false; $returnToBill = false;
@ -150,7 +149,7 @@ class RuleController extends Controller
return view( return view(
'rules.rule.create', 'rules.rule.create',
compact( compact(
'subTitleIcon', 'oldTriggers', 'returnToBill', 'groups', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitleIcon', 'oldTriggers', 'returnToBill', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup',
'subTitle' 'subTitle'
) )
); );
@ -212,7 +211,6 @@ class RuleController extends Controller
*/ */
public function edit(Request $request, Rule $rule) public function edit(Request $request, Rule $rule)
{ {
$ruleGroups = ExpandedForm::makeSelectList($this->ruleGroupRepos->get());
$triggerCount = 0; $triggerCount = 0;
$actionCount = 0; $actionCount = 0;
$oldActions = []; $oldActions = [];
@ -243,7 +241,7 @@ class RuleController extends Controller
} }
session()->forget('rules.edit.fromUpdate'); session()->forget('rules.edit.fromUpdate');
return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups')); return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount'));
} }
/** /**
@ -333,14 +331,11 @@ class RuleController extends Controller
public function selectTransactions(Rule $rule) public function selectTransactions(Rule $rule)
{ {
// does the user have shared accounts? // does the user have shared accounts?
$accounts = $this->accountRepos->getAccountsByType([AccountType::ASSET]);
$accountList = ExpandedForm::makeSelectList($accounts);
$checkedAccounts = array_keys($accountList);
$first = session('first')->format('Y-m-d'); $first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]); $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]);
return view('rules.rule.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'rule', 'subTitle')); return view('rules.rule.select-transactions', compact( 'first', 'today', 'rule', 'subTitle'));
} }
/** /**

9
app/Http/Controllers/RuleGroupController.php
View File

@ -179,22 +179,17 @@ class RuleGroupController extends Controller
} }
/** /**
* @param AccountRepositoryInterface $repository
* @param RuleGroup $ruleGroup * @param RuleGroup $ruleGroup
* *
* @return View * @return View
*/ */
public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup) public function selectTransactions(RuleGroup $ruleGroup)
{ {
// does the user have shared accounts?
$accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]);
$accountList = ExpandedForm::makeSelectList($accounts);
$checkedAccounts = array_keys($accountList);
$first = session('first')->format('Y-m-d'); $first = session('first')->format('Y-m-d');
$today = Carbon::create()->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d');
$subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]); $subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]);
return view('rules.rule-group.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'ruleGroup', 'subTitle')); return view('rules.rule-group.select-transactions', compact( 'first', 'today', 'ruleGroup', 'subTitle'));
} }
/** /**