From fdd1e485124d16d23528dbc79c1fef667a6966d4 Mon Sep 17 00:00:00 2001 From: Jorge Lobo Date: Thu, 16 Jun 2022 09:25:38 +0200 Subject: [PATCH] B #5856: Fix sunstone charters times on non-relative actions (cherry picked from commit c63fa9eab7b7db1d650b66b7153ac72046d1980b) --- .../public/app/tabs/oneflow-services-tab/datatable.js | 4 ++-- .../public/app/tabs/vms-tab/utils/datatable-common.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js index cf7b507b39..985425d7cf 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js @@ -205,10 +205,10 @@ define(function(require) { !isNaN(parseInt(leases[action.ACTION].time)) && leases[action.ACTION].color ){ - var endTime = action.TIME.startsWith("+")? action.TIME : action.TIME - startTime; + var endTime = (action.TIME.startsWith("+")? action.TIME : action.TIME - startTime).toString(); if(checkTime(startTime, endTime)){ - rtn = $("",{class:"describeCharter fa fa-clock",data_start:startTime, data_add:endTime.toString(), data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color}); + rtn = $("",{class:"describeCharter fa fa-clock",data_start:startTime, data_add:endTime, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color}); if( leases[action.ACTION].warning && leases[action.ACTION].warning.time && diff --git a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js index 4238cb2632..9dfc0460ae 100644 --- a/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js +++ b/src/sunstone/public/app/tabs/vms-tab/utils/datatable-common.js @@ -173,10 +173,10 @@ define(function(require) { !isNaN(parseInt(leases[action.ACTION].time)) && leases[action.ACTION].color ){ - var endTime = action.TIME.startsWith("+")? action.TIME : action.TIME - startTime; + var endTime = (action.TIME.startsWith("+")? action.TIME : action.TIME - startTime).toString(); if(checkTime(element.STIME, endTime)){ - rtn = $("",{class:"describeCharter fa fa-clock",data_start:element.STIME, data_add:endTime.toString(), data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color}); + rtn = $("",{class:"describeCharter fa fa-clock",data_start:element.STIME, data_add:endTime, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color}); if( leases[action.ACTION].warning && leases[action.ACTION].warning.time &&