gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 29212: (follow-up) Incorporate linked date field code from Bug 29240 

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Owen Leonard 2021-10-14 15:57:20 +00:00 committed by Fridolin Somers
parent 5f4e4708a2
commit 1ca4cd6bec
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
View File

@ -80,7 +80,12 @@
});
},
onClose: function( selectedDates, dateText, instance) {
validate_date( selectedDates, instance );
validate_date( dateText, instance );
var thisInput = instance.input;
if ( thisInput.hasAttribute('data-start_for') ) {
var endPicker = document.querySelector("#"+thisInput.dataset.start_for)._flatpickr;
endPicker.set('minDate', selectedDates[0]);
}
},
});
@ -120,20 +125,7 @@
}
$(document).ready(function(){
$(".flatpickr").flatpickr();
var startPicker = $(".flatpickrfrom").flatpickr({
onClose: function( selectedDates, dateText, instance) {
validate_date( selectedDates, instance );
endPicker.set('minDate', selectedDates[0]);
}
});
var endPicker = $(".flatpickrto").flatpickr({
onClose: function( selectedDates, dateText, instance) {
validate_date( selectedDates, instance );
},
});
});
</script>

22
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
View File

@ -281,14 +281,14 @@
[% IF ( reserve_in_future ) %]
<li>
<label for="from[% bibitemloo.biblionumber | html %]">Hold starts on date:</label>
<input type="text" name="reserve_date_[% bibitemloo.biblionumber | html %]" id="from[% bibitemloo.biblionumber | html %]" size="10" />
<input type="text" name="reserve_date_[% bibitemloo.biblionumber | html %]" id="from[% bibitemloo.biblionumber | html %]" data-start_for="to[% bibitemloo.biblionumber | html %]" size="10" class="flatpickr" />
<span class="date-format from" data-biblionumber="[% bibitemloo.biblionumber | html %]">[% INCLUDE 'date-format.inc' %]</span>
</li>
[% END %]
<li>
<label for="to[% bibitemloo.biblionumber | html %]">Hold not needed after:</label>
<input type="text" name="expiration_date_[% bibitemloo.biblionumber | html %]" id="to[% bibitemloo.biblionumber | html %]" size="10" />
<input type="text" name="expiration_date_[% bibitemloo.biblionumber | html %]" id="to[% bibitemloo.biblionumber | html %]" size="10" class="flatpickr" />
<span class="date-format to" data-biblionumber="[% bibitemloo.biblionumber | html %]">[% INCLUDE 'date-format.inc' %]</span>
</li>
@ -673,24 +673,6 @@
return true;
});
[% FOREACH bibitemloo IN bibitemloop %]
[% IF ( bibitemloo.holdable ) %]
var startPicker[% bibitemloo.biblionumber | html %] = $("#from[% bibitemloo.biblionumber | html %]").flatpickr({
onClose: function( selectedDates, dateText, instance) {
validate_date( selectedDates, instance );
endPicker[% bibitemloo.biblionumber | html %].set('minDate', selectedDates[0]);
}
});
var endPicker[% bibitemloo.biblionumber | html %] = $("#to[% bibitemloo.biblionumber | html %]").flatpickr({
onClose: function( selectedDates, dateText, instance) {
validate_date( selectedDates, instance );
},
});
[% END %]
[% END %]
});
</script>
[% END %]