diff --git a/ui/src/composable/application/DatePattern.js b/ui/src/composable/application/DatePattern.js index 7d25d766af50de347b841821bef17b7749e6f2ad..2f7c8ae866dedd537b05e29a1bf0c9b05a33b173 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); @@ -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; }