kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Hip new multi select.

Browse Source
This commit is contained in:
James Cole
2017-01-24 07:37:29 +01:00
parent 6c14e9d083
commit 872e8f2de6
4 changed files with 1760 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/css/bootstrap-multiselect.css vendored Executable file
View File

@@ -0,0 +1 @@
span.multiselect-native-select{position:relative}span.multiselect-native-select select{border:0!important;clip:rect(0 0 0 0)!important;height:1px!important;margin:-1px -1px -1px -3px!important;overflow:hidden!important;padding:0!important;position:absolute!important;width:1px!important;left:50%;top:30px}.multiselect-container{position:absolute;list-style-type:none;margin:0;padding:0}.multiselect-container .input-group{margin:5px}.multiselect-container>li{padding:0}.multiselect-container>li>a.multiselect-all label{font-weight:700}.multiselect-container>li.multiselect-group label{margin:0;padding:3px 20px 3px 20px;height:100%;font-weight:700}.multiselect-container>li.multiselect-group-clickable label{cursor:pointer}.multiselect-container>li>a{padding:0}.multiselect-container>li>a>label{margin:0;height:100%;cursor:pointer;font-weight:400;padding:3px 20px 3px 40px}.multiselect-container>li>a>label.radio,.multiselect-container>li>a>label.checkbox{margin:0}.multiselect-container>li>a>label>input[type=checkbox]{margin-bottom:5px}.btn-group>.btn-group:nth-child(2)>.multiselect.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.form-inline .multiselect-container label.checkbox,.form-inline .multiselect-container label.radio{padding:3px 20px 3px 40px}.form-inline .multiselect-container li a label.checkbox input[type=checkbox],.form-inline .multiselect-container li a label.radio input[type=radio]{margin-left:-20px;margin-right:0}

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

@@ -26,6 +26,7 @@ $(function () {
} }
); );
// set values from cookies, if any: // set values from cookies, 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'));
@@ -34,10 +35,13 @@ $(function () {
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) {
$('input[class="account-checkbox"][type="checkbox"][value="' + val + '"]').prop('checked', true); $('#inputAccounts').find('option[value="' + val + '"]').prop('selected', true);
}); });
} }
// make account select a hip new bootstrap multi-select thing.
$('#inputAccounts').multiselect();
// set date: // set date:
var startStr = readCookie('report-start'); var startStr = readCookie('report-start');
var endStr = readCookie('report-end'); var endStr = readCookie('report-end');

1716
public/js/lib/bootstrap-multiselect.js vendored Executable file
View File

File diff suppressed because it is too large Load Diff

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

@@ -35,17 +35,15 @@
<label for="inputAccounts" class="col-sm-3 control-label">{{ 'report_included_accounts'|_ }}</label> <label for="inputAccounts" class="col-sm-3 control-label">{{ 'report_included_accounts'|_ }}</label>
<div class="col-sm-9"> <div class="col-sm-9">
<select id="inputAccounts" name="accounts[]" multiple="multiple" class="form-control">
{% for account in accounts %} {% for account in accounts %}
<div class="checkbox"> <option
<label> value="{{ account.id }}"
<input type="checkbox" class="account-checkbox" name="accounts[]" value="{{ account.id }}"> label="{{ account.name }}{% if account.getMeta('accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}">
{{ account.name }} {{ account.name }}{% if account.getMeta('accountRole') == 'sharedAsset' %} ({{ 'shared'|_|lower }}){% endif %}
{% if account.getMeta('accountRole') == 'sharedAsset' %} </option>
({{ 'shared'|_|lower }})
{% endif %}
</label>
</div>
{% endfor %} {% endfor %}
</select>
</div> </div>
</div> </div>
@@ -121,22 +119,38 @@
<h4>{{ ('quick_link_default_report')|_ }}</h4> <h4>{{ ('quick_link_default_report')|_ }}</h4>
<ul> <ul>
<li><a href="{{ route('reports.report.default',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a></li> <li>
<li><a href="{{ route('reports.report.default',[accountList, 'currentYearStart','currentYearEnd']) }}">{{ 'report_this_year_quick'|_ }}</a></li> <a href="{{ route('reports.report.default',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a>
</li>
<li>
<a href="{{ route('reports.report.default',[accountList, 'currentYearStart','currentYearEnd']) }}">{{ 'report_this_year_quick'|_ }}</a>
</li>
{% if customFiscalYear == 1 %} {% if customFiscalYear == 1 %}
<li><a href="{{ route('reports.report.default',[accountList, 'currentFiscalYearStart','currentFiscalYearEnd']) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a></li> <li>
<a href="{{ route('reports.report.default',[accountList, 'currentFiscalYearStart','currentFiscalYearEnd']) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a>
</li>
{% endif %} {% endif %}
<li><a href="{{ route('reports.report.default',[accountList, start.format('Ymd'),'currentMonthEnd']) }}">{{ 'report_all_time_quick'|_ }}</a></li> <li>
<a href="{{ route('reports.report.default',[accountList, start.format('Ymd'),'currentMonthEnd']) }}">{{ 'report_all_time_quick'|_ }}</a>
</li>
</ul> </ul>
<h4>{{ ('quick_link_audit_report')|_ }}</h4> <h4>{{ ('quick_link_audit_report')|_ }}</h4>
<ul> <ul>
<li><a href="{{ route('reports.report.audit',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a></li> <li>
<li><a href="{{ route('reports.report.audit',[accountList, 'currentYearStart','currentYearEnd']) }}">{{ 'report_this_year_quick'|_ }}</a></li> <a href="{{ route('reports.report.audit',[accountList, 'currentMonthStart','currentMonthEnd']) }}">{{ 'report_this_month_quick'|_ }}</a>
</li>
<li>
<a href="{{ route('reports.report.audit',[accountList, 'currentYearStart','currentYearEnd']) }}">{{ 'report_this_year_quick'|_ }}</a>
</li>
{% if customFiscalYear == 1 %} {% if customFiscalYear == 1 %}
<li><a href="{{ route('reports.report.audit',[accountList, 'currentFiscalYearStart','currentFiscalYearEnd']) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a></li> <li>
<a href="{{ route('reports.report.audit',[accountList, 'currentFiscalYearStart','currentFiscalYearEnd']) }}">{{ 'report_this_fiscal_year_quick'|_ }}</a>
</li>
{% endif %} {% endif %}
<li><a href="{{ route('reports.report.audit',[accountList, start.format('Ymd'),'currentMonthEnd']) }}">{{ 'report_all_time_quick'|_ }}</a></li> <li>
<a href="{{ route('reports.report.audit',[accountList, start.format('Ymd'),'currentMonthEnd']) }}">{{ 'report_all_time_quick'|_ }}</a>
</li>
</ul> </ul>
{#<h4>{{ ('quick_link_category_report')|_ }}</h4>#} {#<h4>{{ ('quick_link_category_report')|_ }}</h4>#}
@@ -191,11 +205,16 @@
{% endblock %} {% endblock %}
{% block styles %}
<link href="css/bootstrap-multiselect.css" rel="stylesheet" type="text/css"/>
{% endblock %}
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var minDate = "{{ start.format('m/d/Y') }}"; var minDate = "{{ start.format('m/d/Y') }}";
var picker; var picker;
</script> </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 %}