From a33e42053ecf1f62e5492afbcf5aa47dcd11e1fa Mon Sep 17 00:00:00 2001
From: Emrys <emrys@openenergymonitor.org>
Date: Mon, 20 May 2019 20:12:42 +0100
Subject: [PATCH] added all graph id to sidebar dropdown showing selected graph
 id removed unwanted console.log()

---
 Views/sidebar.php |  2 +-
 graph.js          | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Views/sidebar.php b/Views/sidebar.php
index 26a5db0..675439e 100644
--- a/Views/sidebar.php
+++ b/Views/sidebar.php
@@ -9,7 +9,7 @@
         <select id="graph-select"></select>
         <h5><?php echo _('Graph Name') ?>:</h5>
         <input id="graph-name" type="text">
-        <small id="selected-graph-id"><?php echo _('Selected graph id') ?>: <span id="graph-id"><?php echo _('None selected') ?></span></small>
+        <small id="selected-graph-id" class="help-block text-light"><?php echo _('Selected graph id') ?>: <span id="graph-id"><?php echo _('None selected') ?></span></small>
         <button id="graph-delete" class="btn" style="display:none"><?php echo _('Delete') ?></button>
         <button id="graph-save" class="btn"><?php echo _('Save') ?></button>
     </div>
diff --git a/graph.js b/graph.js
index 566f25e..09e7466 100644
--- a/graph.js
+++ b/graph.js
@@ -414,7 +414,7 @@ function graph_init_editor()
     
     $("body").on("click keyup",".tagheading",function(event){
         let enterKey = 13;
-        console.log(event.type,event.which);
+        // console.log(event.type,event.which);
 
         if((event.type === 'keyup' && event.which === enterKey) || event.type === 'click') {
             var tag = $(this).data("tag");
@@ -1269,6 +1269,8 @@ function histogram(feedid,type,resolution)
 //----------------------------------------------------------------------------------------
 $("#graph-select").change(function() {
     var name = $(this).val();
+    var id = $(this).find(':selected').data('id');
+    $('#graph-id').text(id);
     load_saved_graph(name);
 });
 
@@ -1421,10 +1423,11 @@ function graph_load_savedgraphs(fn=false)
         success: function(result) {
             savedgraphs = result.user;
             
-            var out = "<option>" + _lang['Select graph'] + ":</option>";
+            var out = "<option value=''>" + _lang['Select graph'] + ":</option>";
             for (var z in savedgraphs) {
-               var name = savedgraphs[z].name;
-               out += "<option>"+name+"</option>";
+                var id = savedgraphs[z].id;
+                var name = savedgraphs[z].name;
+               out += '<option data-id="' + id +'" value="' + name +'">'+ '[#'+id+'] ' + name+'</option>';
             }
             $("#graph-select").html(out);
             if (fn) fn();