IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-15 09:53:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

Expand the multi-select to various other fields.

Browse Source
This commit is contained in:
James Cole 2017-01-24 15:07:01 +01:00
parent 76b32df622
commit e8303bd059
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
5 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/js/ff/reports/index.js
View File

@ -8,12 +8,16 @@
* See the LICENSE file for details. * See the LICENSE file for details.
*/ */
/** global: minDate, nonSelectedText, allSelectedText */ /** global: minDate, nonSelectedText, allSelectedText, filterPlaceholder */
var defaultMultiSelect = { var defaultMultiSelect = {
disableIfEmpty: true, disableIfEmpty: true,
nonSelectedText: nonSelectedText, nonSelectedText: nonSelectedText,
allSelectedText: allSelectedText allSelectedText: allSelectedText,
includeSelectAllOption: true,
enableFiltering: true,
enableCaseInsensitiveFiltering: true,
filterPlaceholder: filterPlaceholder
}; };
$(function () { $(function () {
@ -33,11 +37,12 @@ $(function () {
); );
// set values from cookies, if any: // set report type from cookie, if any:
if (!(readCookie('report-type') === null)) { if (!(readCookie('report-type') === null)) {
$('select[name="report_type"]').val(readCookie('report-type')); $('select[name="report_type"]').val(readCookie('report-type'));
} }
// set accounts from cookie
if ((readCookie('report-accounts') !== null)) { if ((readCookie('report-accounts') !== null)) {
var arr = readCookie('report-accounts').split(','); var arr = readCookie('report-accounts').split(',');
arr.forEach(function (val) { arr.forEach(function (val) {
@ -48,7 +53,7 @@ $(function () {
// make account select a hip new bootstrap multi-select thing. // make account select a hip new bootstrap multi-select thing.
$('#inputAccounts').multiselect(defaultMultiSelect); $('#inputAccounts').multiselect(defaultMultiSelect);
// set date: // set date from cookie
var startStr = readCookie('report-start'); var startStr = readCookie('report-start');
var endStr = readCookie('report-end'); var endStr = readCookie('report-end');
if (startStr !== null && endStr !== null && startStr.length == 8 && endStr.length == 8) { if (startStr !== null && endStr !== null && startStr.length == 8 && endStr.length == 8) {
@ -91,16 +96,18 @@ function setOptionalFromCookies() {
if ((readCookie('report-categories') !== null)) { if ((readCookie('report-categories') !== null)) {
arr = readCookie('report-categories').split(','); arr = readCookie('report-categories').split(',');
arr.forEach(function (val) { arr.forEach(function (val) {
$('input[class="category-checkbox"][type="checkbox"][value="' + val + '"]').prop('checked', true); $('#inputCategories').find('option[value="' + val + '"]').prop('selected', true);
}); });
$('#inputCategories').multiselect(defaultMultiSelect);
} }
// and budgets! // and budgets!
if ((readCookie('report-budgets') !== null)) { if ((readCookie('report-budgets') !== null)) {
arr = readCookie('report-budgets').split(','); arr = readCookie('report-budgets').split(',');
arr.forEach(function (val) { arr.forEach(function (val) {
$('input[class="budget-checkbox"][type="checkbox"][value="' + val + '"]').prop('checked', true); $('#inputBudgets').find('option[value="' + val + '"]').prop('selected', true);
}); });
$('#inputBudgets').multiselect(defaultMultiSelect);
} }
} }

1
resources/lang/en_US/firefly.php
View File

@ -112,6 +112,7 @@ return [
'transaction_journal_other_options' => 'Other options', 'transaction_journal_other_options' => 'Other options',
'multi_select_no_selection' => 'None selected', 'multi_select_no_selection' => 'None selected',
'multi_select_all_selected' => 'All selected', 'multi_select_all_selected' => 'All selected',
'multi_select_filter_placeholder' => 'Find..',
// repeat frequencies: // repeat frequencies:

2
resources/views/reports/index.twig
View File

@ -215,8 +215,8 @@
var picker; var picker;
var nonSelectedText = "{{ 'multi_select_no_selection'|_ }}"; var nonSelectedText = "{{ 'multi_select_no_selection'|_ }}";
var allSelectedText = "{{ 'multi_select_all_selected'|_ }}"; var allSelectedText = "{{ 'multi_select_all_selected'|_ }}";
var filterPlaceholder = "{{ 'multi_select_filter_placeholder'|_ }}";
</script> </script>
<script type="text/javascript" src="js/lib/bootstrap-multiselect.js"></script> <script type="text/javascript" src="js/lib/bootstrap-multiselect.js"></script>
<script type="text/javascript" src="js/ff/reports/index.js"></script> <script type="text/javascript" src="js/ff/reports/index.js"></script>
{% endblock %} {% endblock %}

6
resources/views/reports/options/budget.twig
View File

@ -1,8 +1,8 @@
<p> <p>
{{ 'select_budget'|_ }} {{ 'select_budget'|_ }}
</p> </p>
<select id="inputBudgets" name="budget[]" multiple="multiple" class="form-control">
{% for budget in budgets %} {% for budget in budgets %}
<label class="checkbox-inline"> <option value="{{ budget.id }}" label="{{ budget.name }}">{{ budget.name }}</option>
<input type="checkbox" class="budget-checkbox" name="budget[]" value="{{ budget.id }}"> {{ budget.name }}
</label>
{% endfor %} {% endfor %}
</select>

6
resources/views/reports/options/category.twig
View File

@ -1,8 +1,8 @@
<p> <p>
{{ 'select_category'|_ }} {{ 'select_category'|_ }}
</p> </p>
<select id="inputCategories" name="category[]" multiple="multiple" class="form-control">
{% for category in categories %} {% for category in categories %}
<label class="checkbox-inline"> <option value="{{ category.id }}" label="{{ category.name }}">{{ category.name }}</option>
<input type="checkbox" class="category-checkbox" name="category[]" value="{{ category.id }}"> {{ category.name }}
</label>
{% endfor %} {% endfor %}
</select>