From 449c7a71516e6d27fefe54cf674fa03411fce223 Mon Sep 17 00:00:00 2001 From: Jorge Lobo <47326048+jloboescalona2@users.noreply.github.com> Date: Thu, 30 Apr 2020 13:27:40 +0200 Subject: [PATCH] M #~: add charters in cloud view (#4633) Signed-off-by: Jorge Lobo --- .../public/app/tabs/provision-tab/vms/list.js | 63 ++++++++++--------- .../tabs/vms-tab/utils/datatable-common.js | 6 +- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/list.js b/src/sunstone/public/app/tabs/provision-tab/vms/list.js index 90a8ef2f4d..f952378fc3 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/list.js +++ b/src/sunstone/public/app/tabs/provision-tab/vms/list.js @@ -29,6 +29,7 @@ define(function(require) { var StateActions = require("tabs/vms-tab/utils/state-actions"); var Vnc = require("utils/vnc"); var Spice = require("utils/spice"); + var VMsTableUtils = require('../../vms-tab/utils/datatable-common'); var TemplateVmsList = require("hbs!./list"); var TemplateConfirmSaveAsTemplate = require("hbs!./confirm_save_as_template"); @@ -170,53 +171,55 @@ define(function(require) { }, "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { var data = aData.VM; - if(data == undefined){ return nRow; } - var state = get_provision_vm_state(data); - var monitoring = ""; if(data.MONITORING.GUEST_IP){ monitoring = "
  • " + data.MONITORING.GUEST_IP + "
  • "; } - - $(".provision_vms_ul", context).append("
    "+ - "
      "+ - "
    • "+ - ""+ - ""+ - ""+ - ""+ - data.NAME + ""+ - "
    • "+ - "
    • "+ - " "+ - "x"+data.TEMPLATE.CPU+" - "+ + var charter = VMsTableUtils.leasesClock(data); + var addStyle = charter && charter.length && 'style="padding-left:.5rem;"' + $(".provision_vms_ul", context).append("
      \ + "+ - "
      "); - + "\ +
    • \ +
    \ +
    " + ); + VMsTableUtils.tooltipCharters(); return nRow; } }); 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 755ad241ef..8de43235bb 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 @@ -50,7 +50,8 @@ define(function(require) { 'elementArray': _elementArray, 'emptyElementArray': _emptyElementArray, 'tooltipCharters': showCharterInfo, - 'columns': _columns + 'columns': _columns, + 'leasesClock': leasesClock }; function checkTime(startTime, addedEndTime, warningTime, rtnTime){ @@ -107,7 +108,8 @@ define(function(require) { "z-index":"1", "min-width":"8rem", "font-family": '"Lato","Helvetica Neue",Helvetica,Roboto,Arial,sans-serif', - "font-weight": "100" + "font-weight": "100", + "color":"#000" }; $(".describeCharter").off("mouseenter").on("mouseenter",function(e){ $(this).find(".charterInfo").remove();