kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 19:01:58 +00:00
Code Issues Projects Releases Wiki Activity

Some minor code cleanup.

Browse Source
This commit is contained in:
James Cole
2016-01-27 21:52:21 +01:00
parent 57a3f20c13
commit 3d69dc786d
8 changed files with 59 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Helpers/Report/BalanceReportHelper.php
View File

@@ -14,8 +14,8 @@ use FireflyIII\Helpers\Collection\Balance;
use FireflyIII\Helpers\Collection\BalanceEntry; use FireflyIII\Helpers\Collection\BalanceEntry;
use FireflyIII\Helpers\Collection\BalanceHeader; use FireflyIII\Helpers\Collection\BalanceHeader;
use FireflyIII\Helpers\Collection\BalanceLine; use FireflyIII\Helpers\Collection\BalanceLine;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Budget as BudgetModel; use FireflyIII\Models\Budget as BudgetModel;
use FireflyIII\Models\Budget;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
@@ -41,11 +41,10 @@ class BalanceReportHelper implements BalanceReportHelperInterface
* *
* @codeCoverageIgnore * @codeCoverageIgnore
* *
* @param ReportQueryInterface $query
* @param BudgetRepositoryInterface $budgetRepository * @param BudgetRepositoryInterface $budgetRepository
* @param TagRepositoryInterface $tagRepository * @param TagRepositoryInterface $tagRepository
*/ */
public function __construct(ReportQueryInterface $query, BudgetRepositoryInterface $budgetRepository, TagRepositoryInterface $tagRepository) public function __construct(BudgetRepositoryInterface $budgetRepository, TagRepositoryInterface $tagRepository)
{ {
$this->budgetRepository = $budgetRepository; $this->budgetRepository = $budgetRepository;
$this->tagRepository = $tagRepository; $this->tagRepository = $tagRepository;

4
app/Http/Controllers/Chart/CategoryController.php
View File

@@ -344,7 +344,7 @@ class CategoryController extends Controller
$row = [clone $start]; $row = [clone $start];
$currentSet = $set->filter( // get possibly relevant entries from the big $set $currentSet = $set->filter( // get possibly relevant entries from the big $set
function (Category $category) use ($start) { function (Category $category) use ($start) {
return $category->dateFormatted == $start->format("Y-m"); return $category->dateFormatted == $start->format('Y-m');
} }
); );
/** @var Category $category */ /** @var Category $category */
@@ -410,7 +410,7 @@ class CategoryController extends Controller
$row = [clone $start]; $row = [clone $start];
$currentSet = $set->filter(// get possibly relevant entries from the big $set $currentSet = $set->filter(// get possibly relevant entries from the big $set
function (Category $category) use ($start) { function (Category $category) use ($start) {
return $category->dateFormatted == $start->format("Y-m"); return $category->dateFormatted == $start->format('Y-m');
} }
); );
/** @var Category $category */ /** @var Category $category */

27
app/Http/Controllers/PreferencesController.php
View File

@@ -32,20 +32,23 @@ class PreferencesController extends Controller
*/ */
public function index(ARI $repository) public function index(ARI $repository)
{ {
$accounts = $repository->getAccounts(['Default account', 'Asset account']); $accounts = $repository->getAccounts(['Default account', 'Asset account']);
$viewRangePref = Preferences::get('viewRange', '1M'); $viewRangePref = Preferences::get('viewRange', '1M');
$viewRange = $viewRangePref->data; $viewRange = $viewRangePref->data;
$frontPageAccounts = Preferences::get('frontPageAccounts', []); $frontPageAccounts = Preferences::get('frontPageAccounts', []);
$budgetMax = Preferences::get('budgetMaximum', 1000); $budgetMax = Preferences::get('budgetMaximum', 1000);
$language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data; $language = Preferences::get('language', env('DEFAULT_LANGUAGE', 'en_US'))->data;
$budgetMaximum = $budgetMax->data; $budgetMaximum = $budgetMax->data;
$customFiscalYear = Preferences::get('customFiscalYear', 0)->data; $customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
$fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data; $fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data;
$fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr; $fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr;
$showIncomplete = env('SHOW_INCOMPLETE_TRANSLATIONS', 'false') == 'true'; $showIncomplete = env('SHOW_INCOMPLETE_TRANSLATIONS', 'false') == 'true';
return view('preferences.index', compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange', 'customFiscalYear', 'fiscalYearStart', 'showIncomplete')); return view(
'preferences.index',
compact('budgetMaximum', 'language', 'accounts', 'frontPageAccounts', 'viewRange', 'customFiscalYear', 'fiscalYearStart', 'showIncomplete')
);
} }
/** /**
@@ -74,7 +77,7 @@ class PreferencesController extends Controller
Preferences::set('budgetMaximum', $budgetMaximum); Preferences::set('budgetMaximum', $budgetMaximum);
// custom fiscal year // custom fiscal year
$customFiscalYear = (int) Input::get('customFiscalYear'); $customFiscalYear = (int)Input::get('customFiscalYear');
Preferences::set('customFiscalYear', $customFiscalYear); Preferences::set('customFiscalYear', $customFiscalYear);
$fiscalYearStart = date('m-d', strtotime(Input::get('fiscalYearStart'))); $fiscalYearStart = date('m-d', strtotime(Input::get('fiscalYearStart')));
Preferences::set('fiscalYearStart', $fiscalYearStart); Preferences::set('fiscalYearStart', $fiscalYearStart);

18
app/Http/Controllers/ReportController.php
View File

@@ -56,12 +56,12 @@ class ReportController extends Controller
$expenseTopLength = 8; $expenseTopLength = 8;
// get report stuff! // get report stuff!
$accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts); // done (+2) $accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts);
$incomes = $this->helper->getIncomeReport($start, $end, $accounts); // done (+3) $incomes = $this->helper->getIncomeReport($start, $end, $accounts);
$expenses = $this->helper->getExpenseReport($start, $end, $accounts); // done (+1) $expenses = $this->helper->getExpenseReport($start, $end, $accounts);
$budgets = $this->budgetHelper->getBudgetReport($start, $end, $accounts); // done (+5) $budgets = $this->budgetHelper->getBudgetReport($start, $end, $accounts);
$categories = $this->helper->getCategoryReport($start, $end, $accounts); // done (+1) (20) $categories = $this->helper->getCategoryReport($start, $end, $accounts);
$balance = $this->balanceHelper->getBalanceReport($start, $end, $accounts); // +566 $balance = $this->balanceHelper->getBalanceReport($start, $end, $accounts);
$bills = $this->helper->getBillReport($start, $end, $accounts); $bills = $this->helper->getBillReport($start, $end, $accounts);
// and some id's, joined: // and some id's, joined:
@@ -99,9 +99,9 @@ class ReportController extends Controller
// list of users stuff: // list of users stuff:
$budgets = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface')->getActiveBudgets(); $budgets = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface')->getActiveBudgets();
$categories = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface')->listCategories(); $categories = app('FireflyIII\Repositories\Category\CategoryRepositoryInterface')->listCategories();
$accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts); // done (+2) $accountReport = $this->accountHelper->getAccountReport($start, $end, $accounts);
$incomes = $this->helper->getIncomeReport($start, $end, $accounts); // done (+3) $incomes = $this->helper->getIncomeReport($start, $end, $accounts);
$expenses = $this->helper->getExpenseReport($start, $end, $accounts); // done (+1) $expenses = $this->helper->getExpenseReport($start, $end, $accounts);
// and some id's, joined: // and some id's, joined:
$accountIds = []; $accountIds = [];

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

@@ -446,19 +446,21 @@ class RuleController extends Controller
{ {
$newIndex = 0; $newIndex = 0;
$actions = []; $actions = [];
foreach (Input::old('rule-action') as $index => $entry) { if (is_array(Input::old('rule-action'))) {
$count = ($newIndex + 1); foreach (Input::old('rule-action') as $index => $entry) {
$checked = isset(Input::old('rule-action-stop')[$index]) ? true : false; $count = ($newIndex + 1);
$actions[] = view( $checked = isset(Input::old('rule-action-stop')[$index]) ? true : false;
'rules.partials.action', $actions[] = view(
[ 'rules.partials.action',
'oldTrigger' => $entry, [
'oldValue' => Input::old('rule-action-value')[$index], 'oldTrigger' => $entry,
'oldChecked' => $checked, 'oldValue' => Input::old('rule-action-value')[$index],
'count' => $count, 'oldChecked' => $checked,
] 'count' => $count,
)->render(); ]
$newIndex++; )->render();
$newIndex++;
}
} }
return $actions; return $actions;
@@ -471,19 +473,21 @@ class RuleController extends Controller
{ {
$newIndex = 0; $newIndex = 0;
$triggers = []; $triggers = [];
foreach (Input::old('rule-trigger') as $index => $entry) { if (is_array(Input::old('rule-trigger'))) {
$count = ($newIndex + 1); foreach (Input::old('rule-trigger') as $index => $entry) {
$oldChecked = isset(Input::old('rule-trigger-stop')[$index]) ? true : false; $count = ($newIndex + 1);
$triggers[] = view( $oldChecked = isset(Input::old('rule-trigger-stop')[$index]) ? true : false;
'rules.partials.trigger', $triggers[] = view(
[ 'rules.partials.trigger',
'oldTrigger' => $entry, [
'oldValue' => Input::old('rule-trigger-value')[$index], 'oldTrigger' => $entry,
'oldChecked' => $oldChecked, 'oldValue' => Input::old('rule-trigger-value')[$index],
'count' => $count, 'oldChecked' => $oldChecked,
] 'count' => $count,
)->render(); ]
$newIndex++; )->render();
$newIndex++;
}
} }
return $triggers; return $triggers;

2
app/Http/Middleware/Binder.php
View File

@@ -40,8 +40,6 @@ class Binder
} }
return $next($request); return $next($request);
//return $next($request);
} }
/** /**

1
app/Http/routes.php
View File

@@ -21,7 +21,6 @@ Route::group(
Route::post('/password/reset', 'Auth\PasswordController@reset'); Route::post('/password/reset', 'Auth\PasswordController@reset');
//Route::get('/home', 'HomeController@index');
} }
); );

2
app/Support/Amount.php
View File

@@ -77,7 +77,7 @@ class Amount
} }
if ($journal->isTransfer() && $coloured) { if ($journal->isTransfer() && $coloured) {
$txt = '<span class="text-info">' . $this->formatAnything($journal->transactionCurrency, $journal->amount_positive, false) . '</span>';; $txt = '<span class="text-info">' . $this->formatAnything($journal->transactionCurrency, $journal->amount_positive, false) . '</span>';
$cache->store($txt); $cache->store($txt);
return $txt; return $txt;