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 e47242d363..c613d54a23 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/datatable.js @@ -205,8 +205,15 @@ define(function(require) { !isNaN(parseInt(leases[action.ACTION].time)) && leases[action.ACTION].color ){ - if(checkTime(startTime, action.TIME)){ - rtn = $("",{class:"describeCharter fa fa-clock",data_start:startTime, data_add:action.TIME, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color}); + if(action.TIME.startsWith("+")){ + endTime = action.TIME; + } else { + endTime = action.TIME - startTime; + endTime = endTime.toString(); + } + + if(checkTime(startTime, endTime)){ + 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 82b89923f7..9fb7fcbb72 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,8 +173,15 @@ define(function(require) { !isNaN(parseInt(leases[action.ACTION].time)) && leases[action.ACTION].color ){ - if(checkTime(element.STIME, action.TIME)){ - rtn = $("",{class:"describeCharter fa fa-clock",data_start:element.STIME, data_add:action.TIME, data_action:action.ACTION}).css({"position":"relative","color":leases[action.ACTION].color}); + if(action.TIME.startsWith("+")){ + endTime = action.TIME; + } else { + endTime = action.TIME - element.STIME; + endTime = endTime.toString(); + } + + if(checkTime(element.STIME, endTime)){ + 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 &&