Bugzilla – Attachment 138291 Details for
Bug 30650
Add a curbside pickup module
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 30650: Take dateformat into account
Bug-30650-Take-dateformat-into-account.patch (text/plain), 3.95 KB, created by
Jonathan Druart
on 2022-07-29 09:34:11 UTC
(
hide
)
Description:
Bug 30650: Take dateformat into account
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2022-07-29 09:34:11 UTC
Size:
3.95 KB
patch
obsolete
>From 513d17a19530fdd070dc9075c732b0559f03064d Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 6 Jul 2022 16:08:35 +0200 >Subject: [PATCH] Bug 30650: Take dateformat into account > >dayjs init was not passing the dateformat. >We really need to clean the date handling with the following two bugs: > Bug 30310 - Replace Moment.js with Day.js >and > Bug 30718 - Use flatpickr's altInput option everywhere > >But it's outside the scope of this bug report. > >Signed-off-by: Koha Team University Lyon 3 <koha@univ-lyon3.fr> >--- > .../prog/en/modules/circ/curbside_pickups.tt | 4 +++- > .../opac-tmpl/bootstrap/en/includes/calendar.inc | 14 ++++++++++++++ > .../bootstrap/en/modules/opac-curbside-pickups.tt | 4 +++- > 3 files changed, 20 insertions(+), 2 deletions(-) > >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 1e24390bd64..8f8ea7bd851 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 >@@ -502,7 +502,9 @@ > [% MACRO jsinclude BLOCK %] > [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %] > [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %] >+ [% Asset.js("lib/dayjs/plugin/customParseFormat.js") | $raw %] > <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> >+ <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script> > [% INCLUDE 'calendar.inc' %] > <script> > let pickups = [% To.json(curbside_pickups.unblessed) | $raw %]; >@@ -538,7 +540,7 @@ > > var currentDate = $(this).val(); > >- let selectedDate = dayjs(currentDate); >+ let selectedDate = dayjs(currentDate, get_dateformat_str(dateformat_pref).toUpperCase()); > > let pickupSlots = []; > let available_count = 0; >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc >index 8a4877f9f49..1ef4ffb6111 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc >@@ -32,6 +32,20 @@ > default: > flatpickr_dateformat_string = "Y-m-d"; > } >+ >+ function get_dateformat_str(dateformat) { >+ var dateformat_str; >+ if (dateformat == 'us') { >+ dateformat_str = 'mm/dd/yyyy'; >+ } else if (dateformat == 'metric') { >+ dateformat_str = 'dd/mm/yyyy'; >+ } else if (dateformat == 'iso') { >+ dateformat_str = 'yyyy-mm-dd'; >+ } else if (dateformat == 'dmydot') { >+ dateformat_str = 'dd.mm.yyyy'; >+ } >+ return dateformat_str; >+ } > </script> > [% Asset.js("lib/flatpickr/flatpickr.min.js") | $raw %] > <script> >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 f3472651d6f..35e3efad2dc 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 >@@ -218,7 +218,9 @@ > [% BLOCK jsinclude %] > [% Asset.js("lib/dayjs/dayjs.min.js") | $raw %] > [% Asset.js("lib/dayjs/plugin/isSameOrAfter.js") | $raw %] >+ [% Asset.js("lib/dayjs/plugin/customParseFormat.js") | $raw %] > <script>dayjs.extend(window.dayjs_plugin_isSameOrAfter)</script> >+ <script>dayjs.extend(window.dayjs_plugin_customParseFormat)</script> > [% INCLUDE 'calendar.inc' %] > <script> > [% SET pickup_exists_in = [] %] >@@ -298,7 +300,7 @@ > let branchcode = $("#pickup-branch").val(); > let policy = policies[branchcode]; > >- let selectedDate = dayjs(currentDate); >+ let selectedDate = dayjs(currentDate, get_dateformat_str(dateformat_pref).toUpperCase()); > > let pickupSlots = []; > let available_count = 0; >-- >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 30650
:
136584
|
136585
|
136586
|
136587
|
136588
|
136589
|
136590
|
136591
|
136592
|
136593
|
136594
|
136595
|
136596
|
136597
|
136598
|
136599
|
136600
|
136601
|
136602
|
136603
|
136604
|
136605
|
136606
|
136607
|
136608
|
136609
|
136610
|
137095
|
137100
|
137199
|
137211
|
137212
|
137277
|
137278
|
137279
|
137280
|
137281
|
137282
|
137283
|
137284
|
137285
|
137286
|
137287
|
137288
|
137289
|
137290
|
137291
|
137292
|
137293
|
137294
|
137295
|
137296
|
137297
|
137298
|
137299
|
137300
|
137301
|
137302
|
137303
|
137304
|
137305
|
137306
|
137307
|
138261
|
138262
|
138263
|
138264
|
138265
|
138266
|
138267
|
138268
|
138269
|
138270
|
138271
|
138272
|
138273
|
138274
|
138275
|
138276
|
138277
|
138278
|
138279
|
138280
|
138281
|
138282
|
138283
|
138284
|
138285
|
138286
|
138287
|
138288
|
138289
|
138290
|
138291
|
138292
|
138319
|
138320
|
138321
|
138322
|
138323
|
138324
|
138325
|
138330
|
138331
|
138332
|
138333
|
138334
|
138335
|
138336
|
138337
|
138338
|
138339
|
138340
|
138341
|
138342
|
138343
|
138344
|
138345
|
138346
|
138347
|
138348
|
138349
|
138350
|
138351
|
138352
|
138353
|
138354
|
138355
|
138356
|
138357
|
138358
|
138359
|
138360
|
138361
|
138362
|
138363
|
138364
|
138365
|
138366
|
138367
|
138368
|
138369
|
138375
|
138401
|
138610