From f68ae22cc01dffd5f78388c46d261b51c0ace184 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 26 May 2020 18:16:38 +0200 Subject: [PATCH] ui: factor out render_datetime_utc will be reused in the next patch Signed-off-by: Thomas Lamprecht --- www/DataStoreContent.js | 14 +------------- www/Utils.js | 11 +++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/www/DataStoreContent.js b/www/DataStoreContent.js index a7a667f7..161f2af2 100644 --- a/www/DataStoreContent.js +++ b/www/DataStoreContent.js @@ -103,25 +103,13 @@ Ext.define('PBS.DataStoreContent', { let groups = this.getRecordGroups(records); - let backup_time_to_string = function(backup_time) { - let pad = (number) => number < 10 ? '0' + number : number; - return backup_time.getUTCFullYear() + - '-' + pad(backup_time.getUTCMonth() + 1) + - '-' + pad(backup_time.getUTCDate()) + - 'T' + pad(backup_time.getUTCHours()) + - ':' + pad(backup_time.getUTCMinutes()) + - ':' + pad(backup_time.getUTCSeconds()) + - 'Z'; - }; - for (const item of records) { let group = item.data["backup-type"] + "/" + item.data["backup-id"]; let children = groups[group].children; let data = item.data; - data.text = Ext.Date.format(data["backup-time"], 'Y-m-d H:i:s'); - data.text = group + '/' + backup_time_to_string(data["backup-time"]); + data.text = group + '/' + PBS.Utils.render_datetime_utc(data["backup-time"]); data.leaf = true; data.cls = 'no-leaf-icons'; diff --git a/www/Utils.js b/www/Utils.js index 0dad644a..13d986e7 100644 --- a/www/Utils.js +++ b/www/Utils.js @@ -25,6 +25,17 @@ Ext.define('PBS.Utils', { return path.indexOf(PBS.Utils.dataStorePrefix) === 0; }, + render_datetime_utc: function(datetime) { + let pad = (number) => number < 10 ? '0' + number : number; + return datetime.getUTCFullYear() + + '-' + pad(datetime.getUTCMonth() + 1) + + '-' + pad(datetime.getUTCDate()) + + 'T' + pad(datetime.getUTCHours()) + + ':' + pad(datetime.getUTCMinutes()) + + ':' + pad(datetime.getUTCSeconds()) + + 'Z'; + }, + render_datastore_worker_id: function(id, what) { const result = id.match(/^(\S+)_([^_\s]+)_([^_\s]+)$/); if (result) {