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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc (+4 lines)
Lines 93-103 Link Here
93
                options['minDate'] = new Date().fp_incr(1);
93
                options['minDate'] = new Date().fp_incr(1);
94
                options['allowInvalidPreload'] = true;
94
                options['allowInvalidPreload'] = true;
95
            }
95
            }
96
            if( $(this).data("flatpickr-pastinclusive") === true ) {
97
                options['maxDate'] = "today";
98
            }
96
            if( $(this).data("flatpickr-pastdate") === true ) {
99
            if( $(this).data("flatpickr-pastdate") === true ) {
97
                options['maxDate'] = new Date().fp_incr(-1);
100
                options['maxDate'] = new Date().fp_incr(-1);
98
            }
101
            }
99
            if ( $(this).data('flatpickr-enable-time') === true ) {
102
            if ( $(this).data('flatpickr-enable-time') === true ) {
100
                options['enableTime'] = true;
103
                options['enableTime'] = true;
104
                options['dateFormat'] = flatpickr_dateformat_string + " " + flatpickr_timeformat_string;
101
            }
105
            }
102
106
103
            $(this).flatpickr(options);
107
            $(this).flatpickr(options);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt (-5 / +1 lines)
Lines 112-122 Link Here
112
          <fieldset class="rows">
112
          <fieldset class="rows">
113
              <legend>Due date: </legend>
113
              <legend>Due date: </legend>
114
              <label for="duedatespec">Hard due date [% INCLUDE 'date-format.inc' %]:</label>
114
              <label for="duedatespec">Hard due date [% INCLUDE 'date-format.inc' %]:</label>
115
              [% IF Koha.Preference('SpecifyDueDate') %]
115
                <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-enable-time="true" />
116
                  <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-enable-time="true" />
117
              [% ELSE %]
118
                  <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates with_hours => 1 %]" />
119
              [% END %]
120
          </fieldset>
116
          </fieldset>
121
      [% END %]
117
      [% END %]
122
      <input type="hidden" name="op" value="show" />
118
      <input type="hidden" name="op" value="show" />
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-6 / +2 lines)
Lines 171-181 Link Here
171
                            [% END %]
171
                            [% END %]
172
172
173
                                <form method="get" action="/cgi-bin/koha/circ/renew.pl">
173
                                <form method="get" action="/cgi-bin/koha/circ/renew.pl">
174
                                    [% IF Koha.Preference('SpecifyDueDate') %]
174
                                    <input type="hidden" name="hard_due_date" value="[% hard_due_date | html %]" />
175
                                        <input type="hidden" name="hard_due_date" value="[% hard_due_date | html %]" class="flatpickr flatpickr-enable-time" />
176
                                    [% ELSE %]
177
                                        <input type="hidden" name="hard_due_date" value="[% hard_due_date | html %]" />
178
                                    [% END %]
179
                                    <button type="submit" class="deny"><i class="fa fa-times"></i> Continue without renewing</button>
175
                                    <button type="submit" class="deny"><i class="fa fa-times"></i> Continue without renewing</button>
180
                                </form>
176
                                </form>
181
                    </div>
177
                    </div>
Lines 224-230 Link Here
224
                        <div class="circ-settings show">
220
                        <div class="circ-settings show">
225
                            <div class="date-select" id="renew_date_override_fields">
221
                            <div class="date-select" id="renew_date_override_fields">
226
                                <div><label for="hard_due_date" class="hint">Renewal due date [% INCLUDE 'date-format.inc' %]:</label></div>
222
                                <div><label for="hard_due_date" class="hint">Renewal due date [% INCLUDE 'date-format.inc' %]:</label></div>
227
                                <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" />
223
                                <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" class="flatpickr" data-flatpickr-futuredate="true" data-flatpickr-enable-time="true" />
228
                            </div> <!-- /.date-select -->
224
                            </div> <!-- /.date-select -->
229
                        </div>
225
                        </div>
230
                    </fieldset>
226
                    </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-2 / +1 lines)
Lines 808-814 Link Here
808
                                        <div class="date-select" id="return_date_override_fields">
808
                                        <div class="date-select" id="return_date_override_fields">
809
                                            <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
809
                                            <div class="hint">Specify return date [% INCLUDE 'date-format.inc' %]: </div>
810
810
811
                                            <input type="text" size="20" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" class="flatpickr" data-flatpickr-pastdate="true" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" />
811
                                            <input type="text" size="20" id="return_date_override" name="return_date_override" value="[% return_date_override | html %]" class="flatpickr" data-flatpickr-pastinclusive="true" data-flatpickr-enable-time="true" data-flatpickr-on-close-focus="#barcode" />
812
812
813
                                            <div class="circ-setting">
813
                                            <div class="circ-setting">
814
                                                [% IF ( return_date_override_remember ) %]
814
                                                [% IF ( return_date_override_remember ) %]
815
- 

Return to bug 29394