Martin Renvoize
03ea4bd0cc
This patch prevents a timezone from being assigned to the js moment if
the input string is only at the full-date and not date-time resolution
To test:
1. Do not apply this patch
2. Set your system time zone to CET
3. Apply previous patch (It's just for test)
4. In your browser go to koha main page, open a console and type $date('2020-03-25', {tz:
'UTC'})
CHECK => you sould get '03/24/2020' (notice day is 24 instead of 25)
5. Apply this patch and reload the browser
6. repeat step 4
SUCCESS => now you get '03/25/2020' (day is correct)
7. Sing off
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Agustin Moyano <agustinmoyano@theke.io>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
70 lines
2.8 KiB
PHP
70 lines
2.8 KiB
PHP
[% USE Koha %]
|
|
[% USE raw %]
|
|
[% USE Asset %]
|
|
[% USE KohaDates %]
|
|
[% Asset.js("lib/moment/moment.min.js") | $raw %]
|
|
[% Asset.js("lib/moment/moment-timezone-with-data-10-year-range.min.js") | $raw %]
|
|
<!-- js-date-format.inc -->
|
|
<script>
|
|
(function() {
|
|
var def_date_format = '[% Koha.Preference('dateformat') | html %]';
|
|
var def_time_format = '[% Koha.Preference('TimeFormat') | html %]';
|
|
var def_tz = '[% KohaDates.tz | html %]';
|
|
|
|
var get_date_pattern = function(format) {
|
|
var date_pattern = 'YYYY-MM-DD';
|
|
if(format == 'us') date_pattern = 'MM/DD/YYYY';
|
|
if(format == 'metric') date_pattern = 'DD/MM/YYYY';
|
|
if(format == 'dmydot') date_pattern = 'DD.MM.YYYY';
|
|
return date_pattern;
|
|
};
|
|
|
|
var get_time_pattern = function(format) {
|
|
var time_pattern = 'HH:mm';
|
|
if(format == '12hr') time_pattern = 'hh:mm a';
|
|
return time_pattern;
|
|
};
|
|
|
|
/*
|
|
* A JS equivilent of the KohaDates TT Plugin. Passed an rfc3339 formatted date string,
|
|
* or JS Date, the function will return a date string formatted as per the koha instance config.
|
|
* Optionally accepts a dateformat parameter to allow override of the configured output format
|
|
* as well as a 'withtime' boolean denoting whether to include time or not in the output string.
|
|
*/
|
|
window.$date = function(value, options) {
|
|
var tz = (options&&options.tz)||def_tz;
|
|
var m = moment(value);
|
|
if((m.creationData().format !== 'YYYY-MM-DD')&&tz) m.tz(tz);
|
|
|
|
var dateformat = (options&&options.dateformat)||def_date_format;
|
|
var withtime = (options&&options.withtime)||false;
|
|
|
|
if(dateformat=='rfc3339' && withtime) return m.format();
|
|
|
|
var timeformat = (options&&options.timeformat)||def_time_format;
|
|
var date_pattern = get_date_pattern(dateformat);
|
|
var time_pattern = !withtime?'':' '+get_time_pattern(timeformat);
|
|
|
|
return m.format(date_pattern+time_pattern);
|
|
}
|
|
|
|
window.$datetime = function(value, options) {
|
|
options = options||{};
|
|
options.withtime = true;
|
|
return $date(value, options);
|
|
};
|
|
|
|
window.$time = function(value, options) {
|
|
var tz = (opitons&&options.tz)||def_tz;
|
|
var m = moment(value);
|
|
if(tz) m.tz(tz);
|
|
|
|
var dateformat = (options&&options.dateformat);
|
|
var timeformat = (dateformat=='rfc3339'&&'24hr')||(options&&options.timeformat)||def_time_format;
|
|
|
|
return m.format(get_time_pattern(timeformat)+(dateformat=='rfc3339'?':ss'+(!m.isUTC()?'Z':''):''))+(dateformat=='rfc3339' && m.isUTC()?'Z':'');
|
|
}
|
|
|
|
})();
|
|
</script>
|
|
<!-- / js-date-format.inc -->
|