Bugzilla – Attachment 165308 Details for
Bug 33703
Entering dates should be more flexible accepting different entry formats
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33703: Add time support
Bug-33703-Add-time-support.patch (text/plain), 2.70 KB, created by
Lucas Gass (lukeg)
on 2024-04-22 14:23:57 UTC
(
hide
)
Description:
Bug 33703: Add time support
Filename:
MIME Type:
Creator:
Lucas Gass (lukeg)
Created:
2024-04-22 14:23:57 UTC
Size:
2.70 KB
patch
obsolete
>From 789efdae7bc2855710524b4eeab06d131183f77d Mon Sep 17 00:00:00 2001 >From: Lucas Gass <lucas@bywatersolutions.com> >Date: Wed, 31 Jan 2024 00:51:04 +0000 >Subject: [PATCH] Bug 33703: Add time support > >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../prog/en/includes/calendar.inc | 24 +++++++++++++------ > 1 file changed, 17 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >index 4f337a6822..2edabb3d65 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc >@@ -84,7 +84,7 @@ > }, > onChange: function( selectedDates, dateText, instance) { > var thisInput = instance.input; >- let = accepts_time = $(thisInput).data('flatpickr-enable-time'); >+ let accepts_time = $(thisInput).data('flatpickr-enable-time'); > if ( accepts_time ) { > let parsedDate = flatpickr.parseDate(dateText, instance.config.dateFormat); > if ( !parsedDate.getHours() ) { >@@ -93,11 +93,21 @@ > } > }, > onOpen: function( selectedDates, dateText, instance ) { >- let element = instance.altInput; >- let options = maskitoDateOptionsGenerator({ >- mode: altinput_dateformat, >- separator: delimiter, >- }); >+ var thisInput = instance.input; >+ let accepts_time = $(thisInput).data('flatpickr-enable-time'); >+ let options = {}; >+ if ( accepts_time ) { >+ options = maskitoDateTimeOptionsGenerator({ >+ dateMode: altinput_dateformat, >+ timeMode: 'HH:MM', >+ dateSeparator: delimiter, >+ }); >+ } else { >+ options = maskitoDateOptionsGenerator({ >+ mode: altinput_dateformat, >+ separator: delimiter, >+ }); >+ } > new Maskito( instance.altInput, options ); > }, > onClose: function( selectedDates, dateText, instance) { >@@ -199,7 +209,7 @@ > if ( $(input).data('flatpickr-enable-time') === true ) { > options['enableTime'] = true; > options['dateFormat'] = "Y-m-d H:i"; >- options['altFormat'] = flatpickr_dateformat_string + " " + flatpickr_timeformat_string; >+ options['altFormat'] = flatpickr_dateformat_string + ", " + flatpickr_timeformat_string; > } > if ( $(input).data('flatpickr-disable-shortcuts') === true ) { > options['plugins'] = []; >-- >2.30.2
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 33703
:
150894
|
150895
|
155719
|
155720
|
155861
|
155862
|
156411
|
156412
|
156413
|
157132
|
157135
|
157206
|
157746
|
161619
|
161663
|
162722
|
162723
|
162724
|
162725
|
162726
|
162727
|
162728
|
162729
|
162730
|
162731
|
163078
|
163079
|
163080
|
163081
|
163082
|
163083
|
163319
|
163320
|
163321
|
163322
|
163323
|
163324
|
163978
|
163979
|
163980
|
163981
|
163982
|
163983
|
165307
| 165308 |
165309
|
165310
|
165311
|
165312
|
165399