From 85f92197de920ecdbae93c0e0d0dba45ddc83fc0 Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Mon, 24 Sep 2018 13:50:11 +0100
Subject: [PATCH 1/3] added feed unit to tooltip and legend

---
 graph.js | 28 ++++++++++++++++++----------
 view.php |  1 +
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/graph.js b/graph.js
index 82cd95f..5c8affc 100644
--- a/graph.js
+++ b/graph.js
@@ -55,13 +55,22 @@ $('#placeholder').bind("plotselected", function (event, ranges)
     
     graph_reloaddraw();
 });
-
+function getFeedUnit(id){
+    let unit = ''
+    for(let key in feeds) {
+        if (feeds[key].id == id){
+            unit = feeds[key].unit
+        }
+    }
+    return unit
+}
 $('#placeholder').bind("plothover", function (event, pos, item) {
     var item_value;
     if (item) {
         var z = item.dataIndex;
         if (previousPoint != item.datapoint) {
             var dp=feedlist[item.seriesIndex].dp;
+            var feedid = feedlist[item.seriesIndex].id;
             previousPoint = item.datapoint;
 
             $("#tooltip").remove();
@@ -71,14 +80,12 @@ $('#placeholder').bind("plothover", function (event, pos, item) {
             } else {
                 item_value=(item.datapoint[1]-item.datapoint[2]).toFixed(dp);
             }
-
-            var d = new Date(item_time);
-            var days = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
-            var months = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
-            var minutes = d.getMinutes();
-            if (minutes<10) minutes = "0"+minutes;
-            var date = d.getHours()+":"+minutes+" "+days[d.getDay()]+", "+months[d.getMonth()]+" "+d.getDate();
-            tooltip(item.pageX, item.pageY, "<span style='font-size:11px'>"+item.series.label+"</span><br>"+item_value+"<br><span style='font-size:11px'>"+date+"</span>", "#fff");
+            item_value+=' '+getFeedUnit(feedid);
+            var date = moment(item_time).format('llll')
+            tooltip(item.pageX, item.pageY, "<span style='font-size:11px'>"+item.series.label+"</span>"+
+            "<br>"+item_value + 
+            "<br><span style='font-size:11px'>"+date+"</span>"+
+            "<br><span style='font-size:11px'>("+(item_time/1000)+")</span>", "#fff");
         }
     } else $("#tooltip").remove();
 });
@@ -508,7 +515,7 @@ function graph_init_editor()
     
     $('body').on("click",".legendColorBox",function(d){
           var country = $(this).html().toLowerCase();
-          console.log(country);
+        //   console.log(country);
     }); 
 
     $(".feed-options-show-stats").click(function(){
@@ -674,6 +681,7 @@ function graph_draw()
         var label = "";
         if (showtag) label += feedlist[z].tag+": ";
         label += feedlist[z].name;
+        label += ' '+getFeedUnit(feedlist[z].id);
         var stacked = (typeof(feedlist[z].stack) !== "undefined" && feedlist[z].stack);
         var plot = {label:label, data:data, yaxis:feedlist[z].yaxis, color: feedlist[z].color, stack: stacked};
         
diff --git a/view.php b/view.php
index 466e658..c7cd465 100644
--- a/view.php
+++ b/view.php
@@ -213,6 +213,7 @@
 </div>
 
 <script language="javascript" type="text/javascript" src="<?php echo $path;?>Modules/graph/graph.js?v=1"></script>
+<script language="javascript" type="text/javascript" src="<?php echo $path;?>Lib/moment.min.js"></script>
 
 <script>
     var path = "<?php echo $path; ?>";

From e1d5a1f66841e06694965205e57482b2d6915ec7 Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Mon, 24 Sep 2018 13:56:03 +0100
Subject: [PATCH 2/3] added unit to feed list below graph

---
 graph.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph.js b/graph.js
index 5c8affc..eea6628 100644
--- a/graph.js
+++ b/graph.js
@@ -715,7 +715,7 @@ function graph_draw()
             }
             out += "</td>";
 
-            out += "<td>"+feedlist[z].id+":"+feedlist[z].tag+":"+feedlist[z].name+"</td>";
+            out += "<td>"+feedlist[z].id+":"+feedlist[z].tag+":"+feedlist[z].name + ' (' + getFeedUnit(feedlist[z].id)+")</td>";
             out += "<td><select class='plottype' feedid="+feedlist[z].id+" style='width:80px'>";
 
             var selected = "";

From 143be95a1990024aeb24d72dd839ba949c6560aa Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Mon, 24 Sep 2018 13:59:11 +0100
Subject: [PATCH 3/3] removed brackets around the feed unit

---
 graph.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graph.js b/graph.js
index eea6628..9d94202 100644
--- a/graph.js
+++ b/graph.js
@@ -715,7 +715,7 @@ function graph_draw()
             }
             out += "</td>";
 
-            out += "<td>"+feedlist[z].id+":"+feedlist[z].tag+":"+feedlist[z].name + ' (' + getFeedUnit(feedlist[z].id)+")</td>";
+            out += "<td>"+feedlist[z].id+":"+feedlist[z].tag+":"+feedlist[z].name + getFeedUnit(feedlist[z].id)+"</td>";
             out += "<td><select class='plottype' feedid="+feedlist[z].id+" style='width:80px'>";
 
             var selected = "";