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

Return to bug 36342