From 0f1cce5893c5d2991a6b3c2a032a9bbbf5f01d70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Sun, 11 Oct 2020 19:04:16 +0200 Subject: [PATCH] Support timedelta in CSV import/export issue9220 review297531002 --- CHANGELOG | 1 + src/window.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9a52f9320f..3806ab301c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Format timedelta in CSV export * Manage symbol widget * Fallback to model name as title * Set treeview footer sticky on bottom diff --git a/src/window.js b/src/window.js index 6ae2f98b00..fd63597139 100644 --- a/src/window.js +++ b/src/window.js @@ -1964,10 +1964,15 @@ Sao.common.moment_format('%X')); } else if (val.isDate) { val = val.format(Sao.common.date_format()); + } else if (val.isTimeDelta) { + val = Sao.common.timedelta.format( + val, {'s': 1, 'm': 60, 'h': 60 * 60}); } else if (!isNaN(Number(val))) { val = val.toLocaleString( Sao.i18n.BC47(Sao.i18n.getlang())); } + } else if (val.isTimeDelta) { + val = val.asSeconds(); } else if (typeof(val) == 'boolean') { val += 0; }