Bugzilla – Attachment 143183 Details for
Bug 31261
Curbside pickups - remove slots in the past
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 31261: Introduce flatpickr-futureinclusive
Bug-31261-Introduce-flatpickr-futureinclusive.patch (text/plain), 6.42 KB, created by
Jonathan Druart
on 2022-11-04 12:38:22 UTC
(
hide
)
Description:
Bug 31261: Introduce flatpickr-futureinclusive
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-11-04 12:38:22 UTC
Size:
6.42 KB
patch
obsolete
>From 02a86abb816b2bb709b7631b8e5574a898b4425a Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 4 Nov 2022 13:03:53 +0100 >Subject: [PATCH] Bug 31261: Introduce flatpickr-futureinclusive > >That let us use future + today, and it's working perfectly for our use >case :) > >Sponsored-by: Association KohaLa - https://koha-fr.org/ >--- > .../intranet-tmpl/prog/en/includes/calendar.inc | 15 ++++++++++++--- > .../prog/en/modules/circ/curbside_pickups.tt | 2 +- > .../opac-tmpl/bootstrap/en/includes/calendar.inc | 15 ++++++++++++--- > .../bootstrap/en/modules/opac-curbside-pickups.tt | 6 +++--- > 4 files changed, 28 insertions(+), 10 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index 9cdc8b8e0cb..bdc724ac1a8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -127,7 +127,8 @@ > let refresh_max_date = 0; > let disable_buttons = []; > >- if( $(this).data("flatpickr-futuredate") === true ) { >+ if( $(this).data("flatpickr-futureinclusive") === true >+ || $(this).data("flatpickr-futuredate") === true ) { > let original_date = $(this).val(); > if ( original_date ) { > original_date = Date_from_syspref( original_date ).getTime(); >@@ -140,10 +141,18 @@ > }]; > } > else { >- options['minDate'] = new Date().fp_incr(1); >+ if( $(this).data("flatpickr-futureinclusive") === true ) { >+ options['minDate'] = new Date().setHours(00, 00, 00, 00); >+ } else { >+ options['minDate'] = new Date().fp_incr(1); >+ } > } >+ > disable_buttons.push(0); /* Yesterday */ >- disable_buttons.push(1); /* Today */ >+ >+ if ( $(this).data("flatpickr-futuredate") === true ) { >+ disable_buttons.push(1); /* Today */ >+ } > } > if( $(this).data("flatpickr-pastinclusive") === true ) { > options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */ >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >index 8a79685252b..00616359eee 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt >@@ -476,7 +476,7 @@ > > <li> > <label for="pickup_date">Pickup date: </label> >- <input id="pickup_date" name="pickup_date" required="required" class="flatpickr" data-flatpickr-futuredate="true" /> >+ <input id="pickup_date" name="pickup_date" required="required" class="flatpickr" data-flatpickr-futureinclusive="true" /> > </li> > > <li id="pickup-times" class="radio"></li> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc >index 7059ef9b667..9e7a67520d3 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc >@@ -141,7 +141,8 @@ > let refresh_max_date = 0; > let disable_buttons = []; > >- if( $(this).data("flatpickr-futuredate") === true ) { >+ if( $(this).data("flatpickr-futureinclusive") === true >+ || $(this).data("flatpickr-futuredate") === true ) { > let original_date = $(this).val(); > if ( original_date ) { > original_date = Date_from_syspref( original_date ).getTime(); >@@ -154,10 +155,18 @@ > }]; > } > else { >- options['minDate'] = new Date().fp_incr(1); >+ if( $(this).data("flatpickr-futureinclusive") === true ) { >+ options['minDate'] = new Date().setHours(00, 00, 00, 00); >+ } else { >+ options['minDate'] = new Date().fp_incr(1); >+ } > } >+ > disable_buttons.push(0); /* Yesterday */ >- disable_buttons.push(1); /* Today */ >+ >+ if ( $(this).data("flatpickr-futuredate") === true ) { >+ disable_buttons.push(1); /* Today */ >+ } > } > if( $(this).data("flatpickr-pastinclusive") === true ) { > options['maxDate'] = new Date(); /* Not today or hh:mm will be 00:00 */ >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt >index 8d3f90d01a0..14b3ffc7a95 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-curbside-pickups.tt >@@ -242,9 +242,9 @@ > <div class="required_label required">Required</div> > </li> > <li id="pickup_date_item"> >- <label for="pickup-date">Pickup date:</label> >- <input name="pickup_date" type="text" class="flatpickr" id="pickup-date" required="required" data-flatpickr-futuredate="true" /> >- <div class="required_label required">Required</div> >+ <label for="pickup_date">Pickup date:</label> >+ <input name="pickup_date" type="text" class="flatpickr" id="pickup-date" required="required" data-flatpickr-futureinclusive="true" /> >+ <span class="required">Required</span> > </li> > > <li id="pickup-times"></li> >-- >2.25.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 31261
:
138406
|
143182
|
143183
|
143201
|
143203
|
143804
|
143805