more work on graph comparison

Author: Lennart Koopmann

app/controllers/visuals_controller.rb

@@ -14,7 +14,7 @@ def fetch
         when "totalgraph" then
           r["data"] = calculate_totalgraph(params[:hours])
         when "streamgraph" then
-          r["data"] = calculate_streamgraph(params[:stream_id], params[:hours])
+          r["data"] = calculate_streamgraph(params[:stream_ids], params[:hours])
       end
     end
 
@@ -130,36 +130,49 @@ def calculate_totalgraph(hours = 12)
     end
   end
 
-  def calculate_streamgraph(stream_id, hours=12)
-    stream = Stream.find(stream_id)
+  def calculate_streamgraph(stream_ids, hours=12)
+    streams = Array.new
+    stream_ids.split(',').each do |id|
+      stream = Stream.find(id)
+      next if stream.streamrules.blank?
+
+      streams << stream
+    end
 
-    return Array.new if stream.streamrules.blank?
+    return Array.new if streams.blank?
 
-    data = Array.new
-    data2 = Array.new
-    Message.stream_counts_of_last_minutes(stream.id, hours.to_i*60).collect do |c|
-      data << [ (c[:minute].to_i+Time.now.utc_offset)*1000, c[:count] ]
-      data2 << [ (c[:minute].to_i+Time.now.utc_offset)*1000, c[:count]+rand(50) ]
+    rows = Array.new
+    streams.each do |stream|
+      data = Array.new
+      Message.stream_counts_of_last_minutes(stream.id, hours.to_i*60).collect do |c|
+        data << [ (c[:minute].to_i+Time.now.utc_offset)*1000, c[:count] ]
+      end
+      rows << data
     end
 
     ret = Array.new
 
-    ret << {
-      "color" => "#000",
-      "shadowSize" => 0,
-      "data" => data2,
-      "points" => { "show" => false },
-      "lines" => { "show" => true, "fill" => false }
-    }
+    i = 0
+    rows.each do |row|
+      if i == 0
+        color = "#fd0c99"
+        filling = true
+        shadow = true
+      else
+        color = "#000"
+        filling = false
+        shadow = false
+      end
+      ret << {
+        "color" => color,
+        "shadowSize" => shadow,
+        "data" => row,
+        "points" => { "show" => false },
+        "lines" => { "show" => true, "fill" => filling }
+      }
+      i += 1
+    end
 
-    ret << {
-      "color" => "#fd0c99",
-      "shadowSize" => 10,
-      "data" => data,
-      "points" => { "show" => false },
-      "lines" => { "show" => true, "fill" => false }
-    }
-
     return ret
   end
 

app/helpers/application_helper.rb

@@ -72,10 +72,10 @@ def build_controller_action_uri append_params = nil
   end
 
   def flot_graph_loader(options)
-   if options[:stream_id].blank?
+   if options[:stream_ids].blank?
      url = visuals_path("totalgraph", :hours => options[:hours])
    else
-     url = visuals_path("streamgraph", :stream_id => options[:stream_id], :hours => options[:hours])
+     url = visuals_path("streamgraph", :stream_ids => options[:stream_ids], :hours => options[:hours])
    end
 
    "<script type='text/javascript'>

app/views/streams/analytics.html.erb

@@ -24,7 +24,7 @@
 
 <%=raw flot_graph_loader(
     :inject => "#streams-analytics-new-messages",
-    :stream_id => @stream.id,
+    :stream_ids => params[:compare_with].blank? ? @stream.id : @stream.id.to_s + ",#{params[:compare_with]}",
     :hours => 12
   )
 %>