From 52f60be731141261372b1572e7a79273c43bd62c Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Wed, 9 Jun 2021 21:27:01 +0200 Subject: [PATCH] =?UTF-8?q?On=20s'adapte=20aux=20formats=20de=20django=20p?= =?UTF-8?q?our=20r=C3=A9cup=C3=A9rer=20les=20valeurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shared/static/vendor/datetimepicker/picker.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/shared/static/vendor/datetimepicker/picker.js b/shared/static/vendor/datetimepicker/picker.js index 3c64815..f61bab3 100644 --- a/shared/static/vendor/datetimepicker/picker.js +++ b/shared/static/vendor/datetimepicker/picker.js @@ -8,6 +8,9 @@ const _months = { 'en': ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'], } +const formatDT_1 = /(?\d{2})\/(?\d{2})\/(?\d{4}) (?\d{2}):(?\d{2})(:\d\d)?/; +const formatDT_2 = /(?\d{4})-(?\d{2})-(?\d{2}) (?\d{2}):(?\d{2})(:\d\d)?/; + function zero(value) { return value < 10 ? `0${value}` : `${value}`; } @@ -246,17 +249,16 @@ class DateTimePicker { lang: 'fr', } - static formatDT = /(?\d{4})-(?\d{2})-(?\d{2}) (?\d{2}):(?\d{2})/; static formatD = /(?\d{4})-(?\d{1,2})-(?\d{1,2})/; static parseDate(value) { - const _vals = DateTimePicker.formatDT.exec(value); - return _vals === null ? undefined : new Date(_vals[1], _vals[2] - 1, _vals[3], _vals[4], _vals[5]); + const _vals = formatDT_1.exec(value) || formatDT_2.exec(value); + return _vals === null ? undefined : new Date(_vals.groups.year, _vals.groups.month - 1, _vals.groups.day, _vals.groups.hour, _vals.groups.minutes); } static parseDay(value) { const _vals = DateTimePicker.formatD.exec(value); - return _vals === null ? undefined : new Date(_vals[1], _vals[2] - 1, _vals[3]); + return _vals === null ? undefined : new Date(_vals.groups.year, _vals.groups.month - 1, _vals.groups.day); } static dateValue(value) {