Option to show deposit accounts on the front page.

This commit is contained in:
James Cole 2016-10-14 19:52:30 +02:00
parent ec8cf2c459
commit 2acde5c72a
3 changed files with 520 additions and 494 deletions

View File

@ -83,6 +83,7 @@ class PreferencesController extends Controller
$language = Preferences::get('language', config('firefly.default_language', 'en_US'))->data;
$transactionPageSize = Preferences::get('transactionPageSize', 50)->data;
$customFiscalYear = Preferences::get('customFiscalYear', 0)->data;
$showDepositsFrontpage = Preferences::get('showDepositsFrontpage', false)->data;
$fiscalYearStartStr = Preferences::get('fiscalYearStart', '01-01')->data;
$fiscalYearStart = date('Y') . '-' . $fiscalYearStartStr;
$tjOptionalFields = Preferences::get('transaction_journal_optional_fields', [])->data;
@ -95,7 +96,7 @@ class PreferencesController extends Controller
compact(
'language', 'accounts', 'frontPageAccounts', 'tjOptionalFields',
'viewRange', 'customFiscalYear', 'transactionPageSize', 'fiscalYearStart', 'is2faEnabled',
'has2faSecret', 'showIncomplete'
'has2faSecret', 'showIncomplete', 'showDepositsFrontpage'
)
);
}
@ -145,6 +146,10 @@ class PreferencesController extends Controller
Preferences::set('customFiscalYear', $customFiscalYear);
Preferences::set('fiscalYearStart', $fiscalYearStart);
// show deposits frontpage:
$showDepositsFrontpage = intval($request->get('showDepositsFrontpage')) === 1;
Preferences::set('showDepositsFrontpage', $showDepositsFrontpage);
// save page size:
$transactionPageSize = intval($request->get('transactionPageSize'));
if ($transactionPageSize > 0 && $transactionPageSize < 1337) {

View File

@ -274,9 +274,13 @@ return [
'pref_save_settings' => 'Save settings',
'saved_preferences' => 'Preferences saved!',
'preferences_general' => 'General',
'preferences_frontpage' => 'Frontpage',
'preferences_frontpage' => 'Home screen',
'preferences_security' => 'Security',
'preferences_layout' => 'Layout',
'pref_home_show_deposits' => 'Show deposits on the home screen',
'pref_home_show_deposits_info' => 'The home screen already shows your expense accounts. Should it also show your revenue accounts?',
'pref_home_do_show_deposits' => 'Yes, show them',
'transaction_page_size_title' => 'Page size',
'transaction_page_size_help' => 'Any list of transactions shows at most this many transactions',
'transaction_page_size_label' => 'Page size',

View File

@ -115,7 +115,24 @@
</div>
<!-- frontpage settings column b -->
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<!-- show deposit chart -->
<div class="preferences-box">
<h3>{{ 'pref_home_show_deposits'|_ }}</h3>
<p class="text-info">{{ 'pref_home_show_deposits_info'|_ }}</p>
<div class="form-group">
<div class="col-sm-10">
<div class="checkbox">
<label>
<input type="checkbox" name="showDepositsFrontpage[]" value="{{ showDepositsFrontpage }}"
{% if showDepositsFrontpage %}
checked
{% endif %}
> {{ 'pref_home_do_show_deposits'|_ }}
</label>
</div>
</div>
</div>
</div>
</div>
</div>
</div>