From f901e16da6f65da4b5a8392abeb1497ff4a1e77b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 5 Nov 2010 13:55:26 -0700 Subject: [PATCH] new UI - VM statistics - fix a bug that bar chart didn't show correctly. --- ui/scripts/cloud.core.dashboard.js | 2 +- ui/scripts/cloud.core.instance.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/scripts/cloud.core.dashboard.js b/ui/scripts/cloud.core.dashboard.js index 93b92f16dd4..04fe8d0ec52 100644 --- a/ui/scripts/cloud.core.dashboard.js +++ b/ui/scripts/cloud.core.dashboard.js @@ -318,7 +318,7 @@ function capacityBarChart($capacity, percentused) { // e.g. percentused == "51.2 var percentused2 = (percentused + "%"); $capacity.find("#percentused").text(percentused2); - var percentusedFloat = parseFloat(percentused); + var percentusedFloat = parseFloat(percentused); // e.g. percentusedFloat == 51.27 if (percentusedFloat <= 60) $capacity.find("#bar_chart").removeClass().addClass("db_barbox low").css("width", percentused2); else if (percentusedFloat > 60 && percentusedFloat <= 80 ) diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js index 447d73bd6f3..782194df7b1 100644 --- a/ui/scripts/cloud.core.instance.js +++ b/ui/scripts/cloud.core.instance.js @@ -1564,17 +1564,17 @@ function drawBarChart($capacity, percentused) { //percentused == "0.01%" (having if(percentused.indexOf("%") != -1) { percentused = percentused.replace("%", ""); percentusedFloat = parseFloat(percentused); - percentusedFloat = percentusedFloat * 0.01; //because % is removed + percentusedFloat = percentusedFloat * 0.01; //because % is removed. percentusedFloat == 0.0001 } else { percentusedFloat = parseFloat(percentused); } - if (percentusedFloat <= 60) + if (percentusedFloat <= 0.6) $capacity.find("#bar_chart").removeClass().addClass("db_barbox low").css("width", percentused); - else if (percentusedFloat > 60 && percentusedFloat <= 80 ) + else if (percentusedFloat > 0.6 && percentusedFloat <= 0.8 ) $capacity.find("#bar_chart").removeClass().addClass("db_barbox mid").css("width", percentused); - else if (percentusedFloat > 80 ) + else if (percentusedFloat > 0.8 ) $capacity.find("#bar_chart").removeClass().addClass("db_barbox high").css("width", percentused); }