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

Fix #1909

Browse Source
This commit is contained in:
James Cole
2018-12-21 10:55:34 +01:00
parent 35c8b2fce8
commit 75c6da7730
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/v1/js/ff/reports/index.js vendored
View File

@@ -43,12 +43,12 @@ $(function () {
format: 'YYYY-MM-DD', format: 'YYYY-MM-DD',
firstDay: 1 firstDay: 1
}, },
format: 'YYYY-MM-DD',
minDate: minDate, minDate: minDate,
drops: 'up' drops: 'up'
} }
); );
// set report type from cookie, 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'));
@@ -173,8 +173,11 @@ function preSelectDate(e) {
"use strict"; "use strict";
var link = $(e.target); var link = $(e.target);
var picker = $('#inputDateRange').data('daterangepicker'); var picker = $('#inputDateRange').data('daterangepicker');
picker.setStartDate(moment(link.data('start'), "YYYY-MM-DD")); var startMoment= moment(link.data('start'), "Y-MM-DD");
picker.setEndDate(moment(link.data('end'), "YYYY-MM-DD")); var endMoment= moment(link.data('end'), "Y-MM-DD");
picker.setStartDate(startMoment);
picker.setEndDate(endMoment);
return false; return false;
} }

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

@@ -172,7 +172,7 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript"> <script type="text/javascript">
var minDate = "{{ start.format('m/d/Y') }}"; var minDate = "{{ start.format('Y-m-d') }}";
var picker; var picker;
var selectAllText = "{{ trans('firefly.multi_select_select_all')|escape('js') }}"; var selectAllText = "{{ trans('firefly.multi_select_select_all')|escape('js') }}";
var nonSelectedText = "{{ trans('firefly.multi_select_no_selection')|escape('js') }}"; var nonSelectedText = "{{ trans('firefly.multi_select_no_selection')|escape('js') }}";