From 5b27da0e5e032678d757fa1baa1fb99d9fcfe8c2 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Mon, 9 Oct 2023 14:19:00 +0200
Subject: [PATCH 1/2] =?UTF-8?q?r=C3=A9paration=20de=20la=20r=C3=A9cup?=
=?UTF-8?q?=C3=A9ration=20d'heure=20dans=20le=20pattern?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ui/src/composable/application/DatePattern.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ui/src/composable/application/DatePattern.js b/ui/src/composable/application/DatePattern.js
index 7d25d766a..bb4bbb080 100644
--- a/ui/src/composable/application/DatePattern.js
+++ b/ui/src/composable/application/DatePattern.js
@@ -3,9 +3,9 @@ export function datePatternLang(date, pattern) {
let dateExec = new Date(regex.exec(date)[0]);
if (pattern != null) {
let year = dateExec.toLocaleString("default", {year: "numeric"});
- let hour = dateExec.toLocaleString("default", {hour: "2-digit"});
- let minute = dateExec.toLocaleString("default", {minute: "2-digit"});
- let second = dateExec.toLocaleString("default", {second: "2-digit"});
+ let hour = dateExec.toLocaleString("en-US", {hour: "2-digit", hour12: false});
+ let minute = (dateExec.getMinutes() < 10 ? '0' : '') + dateExec.getMinutes() ;
+ let second = (dateExec.getSeconds() < 10 ? '0' : '') + dateExec.getSeconds() ;
pattern = pattern.replace("yyyy", year);
pattern = pattern.replace("HH", hour);
pattern = pattern.replace("mm", minute);
--
GitLab
From ca93c2c63991838fd59628937269fd7fb7b66c77 Mon Sep 17 00:00:00 2001
From: lucile varloteaux <lucile.varloteaux@inrae.fr>
Date: Mon, 9 Oct 2023 16:16:20 +0200
Subject: [PATCH 2/2] =?UTF-8?q?r=C3=A9solution=20de=20l'erreur=20lors=20de?=
=?UTF-8?q?=20l'absence=20de=20checker?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ui/src/composable/application/DatePattern.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ui/src/composable/application/DatePattern.js b/ui/src/composable/application/DatePattern.js
index bb4bbb080..2f7c8ae86 100644
--- a/ui/src/composable/application/DatePattern.js
+++ b/ui/src/composable/application/DatePattern.js
@@ -44,7 +44,7 @@ export function patternCheckerDateRef(application, columnName, refId) {
}
}
}
- } else if (application.configuration.references && application.configuration.references[refId].columns[columnName].checker
+ } else if (application.configuration.references && application.configuration.references[refId].columns[columnName]?.checker
&& application.configuration.references && application.configuration.references[refId].columns[columnName].checker.params.pattern) {
return application.configuration.references[refId].columns[columnName].checker.params.pattern;
}
--
GitLab