From cc6c65c3d846c6186b77ddcb6b9ec39722a8efa1 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Fri, 22 Jul 2011 16:54:48 +0200
Subject: [PATCH] Feature #726: Plot series go in the same order as they were
 requested, making colors consistent among them.

---
 src/sunstone/public/js/plugins/dashboard-tab.js       | 7 ++++---
 src/sunstone/public/js/plugins/dashboard-users-tab.js | 8 +++++---
 src/sunstone/public/js/sunstone-util.js               | 7 ++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/sunstone/public/js/plugins/dashboard-tab.js b/src/sunstone/public/js/plugins/dashboard-tab.js
index 2218cd3710..48e31f6a9f 100644
--- a/src/sunstone/public/js/plugins/dashboard-tab.js
+++ b/src/sunstone/public/js/plugins/dashboard-tab.js
@@ -151,13 +151,14 @@ function plot_global_graph(data,info){
     var series = [];
     var width = ($(window).width()-129)*48/100;
     var mon_count = 0;
+    var labels_array = info.monitor_resources.split(',');
 
     $('#'+id).html('<div id="'+id+'_graph" style="height:70px;width:'+width+'px;margin-bottom:10px;"><div>');
 
-    for (var label in monitoring) {
+    for (var i=0; i<labels_array.length; i++) {
         serie = {
-            label: label,
-            data: monitoring[label]
+            label: labels_array[i],
+            data: monitoring[labels_array[i]]
         };
         series.push(serie);
         mon_count++;
diff --git a/src/sunstone/public/js/plugins/dashboard-users-tab.js b/src/sunstone/public/js/plugins/dashboard-users-tab.js
index 5126eef4eb..df362f4d06 100644
--- a/src/sunstone/public/js/plugins/dashboard-users-tab.js
+++ b/src/sunstone/public/js/plugins/dashboard-users-tab.js
@@ -136,14 +136,16 @@ function plot_global_graph(data,info){
     var series = [];
     var width = ($(window).width()-129)*48/100;
     var mon_count = 0;
+    var labels_array = info.monitor_resources.split(',');
 
     $('#'+id).html('<div id="'+id+'_graph" style="height:70px;width:'+width+'px;margin-bottom:10px;"><div>');
 
-    for (var label in monitoring) {
+    for (var i=0; i<labels_array.length; i++) {
         serie = {
-            label: label,
-            data: monitoring[label]
+            label: labels_array[i],
+            data: monitoring[labels_array[i]]
         };
+
         series.push(serie);
         mon_count++;
     };
diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index b46610e0c9..d641552e85 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -533,15 +533,16 @@ function plot_graph(data,context,id_prefix,info){
     var humanize = info.humanize_figures ?
         humanize_size : function(val){ return val };
     var id_suffix = labels.replace(/,/g,'_');
+    var labels_array = labels.split(',');
     var monitoring = data.monitoring
     var series = [];
     var serie;
     var mon_count = 0;
 
-    for (var label in monitoring) {
+    for (var i=0; i<labels_array.length; i++) {
         serie = {
-            label: label,
-            data: monitoring[label]
+            label: labels_array[i],
+            data: monitoring[labels_array[i]]
         };
         series.push(serie);
         mon_count++;