From c045ccabe4ffde69332afad9b7a73356a37fd0bc Mon Sep 17 00:00:00 2001 From: Katsuhiko YOSHIDA Date: Sun, 10 Dec 2017 22:46:31 +0900 Subject: [PATCH 1/3] Replace invalid date time strings --- client/app/filters/datetime.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/filters/datetime.js b/client/app/filters/datetime.js index bcd4547c2..f60cd7fc8 100644 --- a/client/app/filters/datetime.js +++ b/client/app/filters/datetime.js @@ -5,7 +5,7 @@ export default function init(ngModule) { ngModule.filter('dateTime', clientConfig => function dateTime(value) { - if (!value) { + if (!value || !value.isValid()) { return '-'; } From b7b8e567222a9fdf7bc83e020a5bdb814464714b Mon Sep 17 00:00:00 2001 From: Katsuhiko YOSHIDA Date: Mon, 11 Dec 2017 20:09:27 +0900 Subject: [PATCH 2/3] Consider value is string case --- client/app/filters/datetime.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/filters/datetime.js b/client/app/filters/datetime.js index f60cd7fc8..2d7ea9d32 100644 --- a/client/app/filters/datetime.js +++ b/client/app/filters/datetime.js @@ -5,7 +5,7 @@ export default function init(ngModule) { ngModule.filter('dateTime', clientConfig => function dateTime(value) { - if (!value || !value.isValid()) { + if (!value || !moment(value).isValid()) { return '-'; } From 1a4d7471f5ddf76177ed2e1056aca8cf7dccb21f Mon Sep 17 00:00:00 2001 From: Arik Fraimovich Date: Wed, 13 Dec 2017 11:52:56 +0200 Subject: [PATCH 3/3] Stored parsed moment value. --- client/app/filters/datetime.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/client/app/filters/datetime.js b/client/app/filters/datetime.js index 2d7ea9d32..1772fb9eb 100644 --- a/client/app/filters/datetime.js +++ b/client/app/filters/datetime.js @@ -5,10 +5,16 @@ export default function init(ngModule) { ngModule.filter('dateTime', clientConfig => function dateTime(value) { - if (!value || !moment(value).isValid()) { - return '-'; + if (!value) { + return ''; } - - return moment(value).format(clientConfig.dateTimeFormat); + + const parsed = moment(value); + + if (!parsed.isValid()) { + return '-'; + } + + return parsed.format(clientConfig.dateTimeFormat); }); }