View | Details | Raw Unified | Return to bug 36342
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (-9 / +14 lines)
Lines 89-110 Link Here
89
        onChange: function( selectedDates, dateText, instance) {
89
        onChange: function( selectedDates, dateText, instance) {
90
            var thisInput = instance.input;
90
            var thisInput = instance.input;
91
            let accepts_time = $(thisInput).data('flatpickr-enable-time');
91
            let accepts_time = $(thisInput).data('flatpickr-enable-time');
92
            let accepts_period = $(thisInput).data('flatpickr-period');
92
            let accepts_range = $(thisInput).data('flatpickr-period');
93
            if ( !accepts_period ) {
93
            if ( accepts_time ) {
94
                if ( accepts_time ) {
94
                let parsedDate = flatpickr.parseDate(dateText, instance.config.dateFormat);
95
                    let parsedDate = flatpickr.parseDate(dateText, instance.config.dateFormat);
95
                if ( !parsedDate.getHours() ) {
96
                    if ( !parsedDate.getHours() ) {
96
                    instance.setDate(selectedDates[0].setHours(23, 59, 0, 0));
97
                        instance.setDate(selectedDates[0].setHours(23, 59, 0, 0));
98
                    }
99
                }
97
                }
100
            }
98
            }
101
        },
99
        },
102
        onOpen: function( selectedDates, dateText, instance ) {
100
        onOpen: function( selectedDates, dateText, instance ) {
103
            var thisInput = instance.input;
101
            var thisInput = instance.input;
104
            let accepts_time = $(thisInput).data('flatpickr-enable-time');
102
            let accepts_time = $(thisInput).data('flatpickr-enable-time');
105
            let accepts_period = $(thisInput).data('flatpickr-period');
103
            let accepts_range = $(thisInput).data('flatpickr-range');
106
            let options = {};
104
            let options = {};
107
            if ( !accepts_period ) {
105
            if ( accepts_range ) {
106
                options = maskitoDateRangeOptionsGenerator({
107
                    mode: altinput_dateformat,
108
                    dateSeparator: delimiter,
109
                    rangeSeparator: " to ",
110
                });
111
                new Maskito( instance.altInput, options );
112
            } else {
108
                if ( accepts_time ) {
113
                if ( accepts_time ) {
109
                    options = maskitoDateTimeOptionsGenerator({
114
                    options = maskitoDateTimeOptionsGenerator({
110
                        dateMode: altinput_dateformat,
115
                        dateMode: altinput_dateformat,
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/place_booking.inc (-2 / +1 lines)
Lines 39-45 Link Here
39
                            <li>
39
                            <li>
40
                                <div id="period_fields">
40
                                <div id="period_fields">
41
                                    <label class="required" for="period">Booking dates: </label>
41
                                    <label class="required" for="period">Booking dates: </label>
42
                                    <input type="text" id="period" name="period" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-disable-shortcuts="true" required="required" disabled="true" autocomplete="off">
42
                                    <input type="text" id="period" name="period" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-disable-shortcuts="true" data-flatpickr-range="true" required="required" disabled="true" autocomplete="off">
43
                                    <span class="required">Required</span>
43
                                    <span class="required">Required</span>
44
                                </div>
44
                                </div>
45
                                <div class="hint">Select the booking start and end date</div>
45
                                <div class="hint">Select the booking start and end date</div>
46
- 

Return to bug 36342