From 083e1e969cab4515e756cf9e91b7e55e60cde716 Mon Sep 17 00:00:00 2001
From: Ran Tavory <rantav@gmail.com>
Date: Tue, 31 Jan 2012 14:47:47 +0200
Subject: [PATCH] Improve flot confiuration such that it displays actual dates
 in the x axis

---
 lib/saulabs/reportable/config.rb            | 3 +++
 lib/saulabs/reportable/report_tag_helper.rb | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/saulabs/reportable/config.rb b/lib/saulabs/reportable/config.rb
index 5dfbc4c..6e944a9 100644
--- a/lib/saulabs/reportable/config.rb
+++ b/lib/saulabs/reportable/config.rb
@@ -38,6 +38,9 @@ module Config
         :grid   => { 
           :show => false
         },
+        :xaxis => {
+          :mode => :time
+        },
         :series => {
           :lines      => {
             :fill      => true,
diff --git a/lib/saulabs/reportable/report_tag_helper.rb b/lib/saulabs/reportable/report_tag_helper.rb
index 73c423c..3cec537 100644
--- a/lib/saulabs/reportable/report_tag_helper.rb
+++ b/lib/saulabs/reportable/report_tag_helper.rb
@@ -146,12 +146,9 @@ def flot_report_tag(data, options = {}, flot_options = {})
         %Q{<div id="#{options[:dom_id]}" style="width:#{options[:width]}px;height:#{options[:height]}px;"></div>
         <script type="text\/javascript" charset="utf-8">
         $(function() {
-          var set = #{data.map{|d| d[1] }.to_json},
-          data = [];
-          for (var i = 0; i < set.length; i++) {
-            data.push([i, set[i]]);
-          }
-          $.plot($('##{options[:dom_id]}'), [data], #{flot_options.to_json});
+          // flot wants the x axis as a javascript timestamp, so that's the deal with the strftime below
+          var dataset = #{data.map{|d| [d[0].strftime("%s000"), d[1]]}.to_json}; 
+          $.plot($('##{options[:dom_id]}'), [dataset], #{flot_options.to_json});
         });
         </script>}
       end