From 749bc9e31e84042a4a227ca5addfda6b57808e20 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Fri, 10 Nov 2023 20:49:17 +0000
Subject: [PATCH 01/14] Fix the width of the legend to not wrap

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 9a04e80d..5a65c75f 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -1104,7 +1104,7 @@ function powergraph_draw()
             margin:{top:30}
         },
         selection: { mode: "x" },
-        legend:{position:"NW", noColumns:7}
+        legend:{position:"NW", noColumns:10}
     }
     if ($('#placeholder').width()) {
         $.plot($('#placeholder'),powergraph_series,options);

From c6310db6bfcbd4cbca59d7acb6ab6cb5e36a1fe3 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Fri, 10 Nov 2023 20:49:58 +0000
Subject: [PATCH 02/14] Swap heating/hot water stats with show flow rate

---
 .../myheatpump/myheatpump.php                 | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
index a1087fd3..f194897c 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
@@ -100,10 +100,22 @@
         COP in window: <b id="window-cop"></b> <span id="window-carnot-cop"></span>
       </div>
     </div>
-          
+    
     <div id="advanced-block" style="background-color:#fff; padding:10px; display:none">
       <div style="color:#000">
-        <p id="show_flow_rate_bound" style="display:none"><b>Show flow rate:</b> <input id="show_flow_rate" type="checkbox" style="margin-top:-4px; margin-left:7px"></p>
+        <div id="dhw_stats" style="display: none">
+          <p><b>Heating</b>:
+          Electricity consumed: <span id="ch_elec_kwh"></span> kWh
+            &raquo; heat produced: <span id="ch_heat_kwh"></span> kWh
+            = COP <b><span id="ch_cop"></span></b>
+          </p>
+          <p><b>Hot Water</b>:
+          Electricity consumed: <span id="dhw_elec_kwh"></span> kWh
+            &raquo; heat produced: <span id="dhw_heat_kwh"></span> kWh
+            = COP <b><span id="dhw_cop"></span></b>
+          </p>
+        </div>
+        <hr style="margin:10px 0px 10px 0px">
       
         <table class="table">
           <tr>
@@ -118,19 +130,7 @@
           <tbody id="stats"></tbody>
         </table>
         
-        <div id="dhw_stats" style="display: none">
-          <hr style="margin:10px 0px 10px 0px">
-          <p><b>Heating</b>:
-            Electricity consumed: <span id="ch_elec_kwh"></span> kWh
-            &raquo; heat produced: <span id="ch_heat_kwh"></span> kWh
-            = COP <b><span id="ch_cop"></span></b>
-          </p>
-          <p><b>Hot Water</b>:
-            Electricity consumed: <span id="dhw_elec_kwh"></span> kWh
-            &raquo; heat produced: <span id="dhw_heat_kwh"></span> kWh
-            = COP <b><span id="dhw_cop"></span></b>
-          </p>
-        </div>
+        <p id="show_flow_rate_bound" style="display:none"><b>Show flow rate:</b> <input id="show_flow_rate" type="checkbox" style="margin-top:-4px; margin-left:7px"></p>
         
         <hr style="margin:10px 0px 10px 0px">
         <p><b>Standby</b></p>

From 79247bf30048d513d4d09df044b7ff84310ab9d8 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Sat, 11 Nov 2023 16:26:40 +0000
Subject: [PATCH 03/14] Add button for 6 hour zoom

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
index f194897c..b13a508f 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
@@ -81,6 +81,7 @@
         <span class="bluenav time dmy" time='720'>M</span>
         <span class="bluenav time dmy" time='168'>W</span>
         <span class="bluenav time" time='24'>D</span>
+        <span class="bluenav time" time='6'>6H</span>
         <span class="bluenav time" time='1'>H</span>
       </div>
         

From ca1c33b2bf39158056fea04a783b2f64c4025431 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Sun, 12 Nov 2023 00:07:07 +0000
Subject: [PATCH 04/14] Add button to view history over 1 year

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js  | 9 +++++++++
 apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 1 +
 2 files changed, 10 insertions(+)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 5a65c75f..d2bb7cc5 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -476,6 +476,15 @@ $('.bargraph-month').click(function () {
     bargraph_draw();
 });
 
+$('.bargraph-year').click(function () {
+    var timeWindow = (3600000*24.0*365);
+    var end = (new Date()).getTime();
+    var start = end - timeWindow;
+    if (start<(start_time*1000)) start = start_time * 1000;
+    bargraph_load(start,end);
+    bargraph_draw();
+});
+
 $("#carnot_enable").click(function(){
 
     if ($("#carnot_enable_prc")[0].checked && !$("#carnot_enable")[0].checked) {
diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
index b13a508f..e67d48d9 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
@@ -68,6 +68,7 @@
       <div class="bargraph-navigation">
         <!--<div class="bluenav bargraph-other">OTHER</div>-->
         <div class="bluenav bargraph-alltime">ALL TIME</div>
+        <div class="bluenav bargraph-year">YEAR</div>
         <div class="bluenav bargraph-month">MONTH</div>
         <div class="bluenav bargraph-week">WEEK</div>
       </div>

From 44d5baa2b6880103dc1f07f39b6d47a75422bd94 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Sun, 12 Nov 2023 16:34:07 +0000
Subject: [PATCH 05/14] Tweaked some colours to be clearer

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index d2bb7cc5..03f54bb0 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -603,9 +603,10 @@ function powergraph_load()
 
         let style = {lineWidth: 0, show:true, fill:0.15};
         if (all_same_interval) {
-            powergraph_series.push({label:"CH", data:remove_null_values(data["heatpump_ch"]), yaxis:4, color:"#FD8", lines:style});
+            powergraph_series.push({label:"CH", data:remove_null_values(data["heatpump_ch"]), yaxis:4, color:"#FB6", lines:style});
         } else {
-            powergraph_series.push({label:"CH", data:data["heatpump_ch"], yaxis:4, color:"#FD8", lines:style});
+            powergraph_series.push({label:"CH", data:data["heatpump_ch"], yaxis:4, color:"#FB6", lines:style});
+        }
         }
     }
     if (feeds["heatpump_flowT"]!=undefined) { 
@@ -1099,7 +1100,7 @@ function powergraph_draw()
         yaxes: [
             {min: 0, font: style,reserveSpace:false},
             {font: style,reserveSpace:false},
-            {font: style,reserveSpace:false},
+            {min: 0, font: {size:flot_font_size, color: "#44b3e2"},reserveSpace:false},
             {min: 0, max: 1, show: false, reserveSpace:false}
         ],
         grid: {

From b997951e57bec99510f04e0b3918433b1131b190 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Sun, 12 Nov 2023 16:37:08 +0000
Subject: [PATCH 06/14] Add COP points on daily barchart

---
 .../myheatpump/myheatpump.js                  | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 03f54bb0..472cc6ea 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -1158,6 +1158,23 @@ function bargraph_load(start,end)
         for (var z in data["heatpump_elec_kwhd"]) {
             elec_kwh_in_window += data["heatpump_elec_kwhd"][z][1];
         }
+
+        // add series that shows COP points for each day
+        if (heat_enabled) {
+            cop_data = [];
+            for (var z in data["heatpump_elec_kwhd"]) {
+                time = data["heatpump_elec_kwhd"][z][0];
+                elec = data["heatpump_elec_kwhd"][z][1];
+                heat = data["heatpump_heat_kwhd"][z][1];
+                if (elec && heat) {
+                    cop_data[z] = [ time, heat / elec ];
+                }
+            }
+            bargraph_series.push({
+                data: cop_data, color: "#44b3e2", yaxis:3,
+                points: { show: true }
+            });
+        }
     }
     
     if (feeds["heatpump_outsideT"]!=undefined) {
@@ -1166,7 +1183,7 @@ function bargraph_load(start,end)
             data["heatpump_outsideT_daily"] = feed.getdata(feeds["heatpump_outsideT"].id,start,end,"daily",1,0);
             bargraph_series.push({
                 data: data["heatpump_outsideT_daily"], color: 4, yaxis:2,
-                lines: { show: true, align: "center", fill: false}, points: { show: true }
+                lines: { show: true, align: "center", fill: false}, points: { show: false }
             });
         }
     }
@@ -1197,6 +1214,10 @@ function bargraph_draw()
             // labelWidth:-5
             reserveSpace:false,
             // max:40
+        },{ 
+            font: {size:flot_font_size, color:"#44b3e2"}, 
+            reserveSpace:false,
+            min: 0
         }],
         selection: { mode: "x" },
         grid: {

From a6689a2df63c3f64f7ac3f6cf98d3051076b7d6c Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Mon, 13 Nov 2023 16:37:52 +0000
Subject: [PATCH 07/14] Tweaked description of status feeds

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 472cc6ea..1a425ca0 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -26,8 +26,8 @@ config.app = {
     "heatpump_outsideT":{"type":"feed", "autoname":"heatpump_outsideT", "engine":5, "optional":true, "description":"Outside temperature"},
     "heatpump_roomT":{"type":"feed", "autoname":"heatpump_roomT", "engine":5, "optional":true, "description":"Room temperature"},
     "heatpump_flowrate":{"type":"feed", "autoname":"heatpump_flowrate", "engine":5, "optional":true, "description":"Flow rate"},
-    "heatpump_dhw":{"type":"feed", "autoname":"heatpump_dhw", "optional":true, "description":"Heating Hot Water"},
-    "heatpump_ch":{"type":"feed", "autoname":"heatpump_ch", "optional":true, "description":"Central Heating"},
+    "heatpump_dhw":{"type":"feed", "autoname":"heatpump_dhw", "optional":true, "description":"Status of Hot Water circuit (non-zero when running)"},
+    "heatpump_ch":{"type":"feed", "autoname":"heatpump_ch", "optional":true, "description":"Status of Central Heating circuit (non-zero when running)"},
     "start_date":{"type":"value", "default":0, "name": "Start date", "description":_("Start date for all time values (unix timestamp)")},
 };
 config.feeds = feed.list();

From e2d1b57da107a6f9538b7c0fed5391e84acc8ed2 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Mon, 13 Nov 2023 16:45:43 +0000
Subject: [PATCH 08/14] Added tooltips to navigation buttons

---
 .../myheatpump/myheatpump.php                 | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
index e67d48d9..4a1953fc 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
@@ -74,16 +74,16 @@
       </div>
       
       <div class="powergraph-navigation" style="display:none">
-        <div class="bluenav viewhistory">BACK</div>
-        <span class="bluenav" id="right" >></span>
-        <span class="bluenav" id="left" ><</span>
-        <span class="bluenav" id="zoomout" >-</span>
-        <span class="bluenav" id="zoomin" >+</span>
-        <span class="bluenav time dmy" time='720'>M</span>
-        <span class="bluenav time dmy" time='168'>W</span>
-        <span class="bluenav time" time='24'>D</span>
-        <span class="bluenav time" time='6'>6H</span>
-        <span class="bluenav time" time='1'>H</span>
+        <div class="bluenav viewhistory" title="Back to daily summary">BACK</div>
+        <span class="bluenav" id="right" title="Scroll right">&gt;</span>
+        <span class="bluenav" id="left" title="Scroll left">&lt;</span>
+        <span class="bluenav" id="zoomout" title="Zoom out">-</span>
+        <span class="bluenav" id="zoomin" title="Zoom in">+</span>
+        <span class="bluenav time dmy" time='720' title="Last 30 days">M</span>
+        <span class="bluenav time dmy" time='168' title="Last 7 days">W</span>
+        <span class="bluenav time" time='24' title="Last 24 hours">D</span>
+        <span class="bluenav time" time='6' title="Last 6 hours">6</span>
+        <span class="bluenav time" time='1' title="Last hour">H</span>
       </div>
         
       <div class="block-title">HISTORY</div>       

From 7a52b5e9db687b216656486311595ebd56eedb1f Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Mon, 13 Nov 2023 16:48:38 +0000
Subject: [PATCH 09/14] Added 3 MONTH button to barchart

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js  | 9 +++++++++
 apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 1 +
 2 files changed, 10 insertions(+)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 1a425ca0..64fbec65 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -467,6 +467,15 @@ $('.bargraph-week').click(function () {
     bargraph_draw();
 });
 
+$('.bargraph-quarter').click(function () {
+    var timeWindow = (3600000*24.0*91);
+    var end = (new Date()).getTime();
+    var start = end - timeWindow;
+    if (start<(start_time*1000)) start = start_time * 1000;
+    bargraph_load(start,end);
+    bargraph_draw();
+});
+
 $('.bargraph-month').click(function () {
     var timeWindow = (3600000*24.0*30);
     var end = (new Date()).getTime();
diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
index 4a1953fc..ae234c9a 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
@@ -69,6 +69,7 @@
         <!--<div class="bluenav bargraph-other">OTHER</div>-->
         <div class="bluenav bargraph-alltime">ALL TIME</div>
         <div class="bluenav bargraph-year">YEAR</div>
+        <div class="bluenav bargraph-quarter">3 MONTHS</div>
         <div class="bluenav bargraph-month">MONTH</div>
         <div class="bluenav bargraph-week">WEEK</div>
       </div>

From 3a6c7111e34edb00b02b335410b29e8619e734f8 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Tue, 14 Nov 2023 12:14:54 +0000
Subject: [PATCH 10/14] Easter egg: add #power to URL to show power graph

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 64fbec65..09d34b45 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -303,6 +303,18 @@ $('.time').click(function () {
     powergraph_load(); powergraph_draw(); 
 });
 
+if (window.location.hash == "#power") {
+    view.timewindow(1.0);
+    $(".bargraph-navigation").hide();
+    viewmode = "powergraph";
+    powergraph_load();
+    powergraph_draw();
+    $(".powergraph-navigation").show();
+    $("#advanced-toggle").show();
+    $("#advanced-toggle").html("HIDE DETAIL");
+    $("#advanced-block").show();
+}
+
 $(".viewhistory").click(function () {
     $(".powergraph-navigation").hide();
     var timeWindow = (3600000*24.0*30);
@@ -616,7 +628,6 @@ function powergraph_load()
         } else {
             powergraph_series.push({label:"CH", data:data["heatpump_ch"], yaxis:4, color:"#FB6", lines:style});
         }
-        }
     }
     if (feeds["heatpump_flowT"]!=undefined) { 
         data["heatpump_flowT"] = feed.getdata(feeds["heatpump_flowT"].id,view.start,view.end,view.interval,1,0,skipmissing,limitinterval);

From 95cd4811bb9bf654a56d7519d66a8065a517a3a8 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Tue, 14 Nov 2023 14:19:52 +0000
Subject: [PATCH 11/14] Added navigation button for today

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js  | 16 ++++++++++++----
 apps/OpenEnergyMonitor/myheatpump/myheatpump.php |  1 +
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 09d34b45..b99a9064 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -304,6 +304,10 @@ $('.time').click(function () {
 });
 
 if (window.location.hash == "#power") {
+    show_powergraph();
+}
+
+function show_powergraph() {
     view.timewindow(1.0);
     $(".bargraph-navigation").hide();
     viewmode = "powergraph";
@@ -470,6 +474,10 @@ $('.bargraph-alltime').click(function () {
     bargraph_draw();
 });
 
+$('.bargraph-day').click(function () {
+    show_powergraph();
+});
+
 $('.bargraph-week').click(function () {
     var timeWindow = (3600000*24.0*7);
     var end = (new Date()).getTime();
@@ -479,8 +487,8 @@ $('.bargraph-week').click(function () {
     bargraph_draw();
 });
 
-$('.bargraph-quarter').click(function () {
-    var timeWindow = (3600000*24.0*91);
+$('.bargraph-month').click(function () {
+    var timeWindow = (3600000*24.0*30);
     var end = (new Date()).getTime();
     var start = end - timeWindow;
     if (start<(start_time*1000)) start = start_time * 1000;
@@ -488,8 +496,8 @@ $('.bargraph-quarter').click(function () {
     bargraph_draw();
 });
 
-$('.bargraph-month').click(function () {
-    var timeWindow = (3600000*24.0*30);
+$('.bargraph-quarter').click(function () {
+    var timeWindow = (3600000*24.0*91);
     var end = (new Date()).getTime();
     var start = end - timeWindow;
     if (start<(start_time*1000)) start = start_time * 1000;
diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
index ae234c9a..617153b1 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
@@ -72,6 +72,7 @@
         <div class="bluenav bargraph-quarter">3 MONTHS</div>
         <div class="bluenav bargraph-month">MONTH</div>
         <div class="bluenav bargraph-week">WEEK</div>
+        <div class="bluenav bargraph-day">DAY</div>
       </div>
       
       <div class="powergraph-navigation" style="display:none">

From d3ac0a8c088f6cadf902a98e90b16462b490732d Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Tue, 14 Nov 2023 15:21:10 +0000
Subject: [PATCH 12/14] Tidied up code for DAY and #power shortcuts

---
 .../myheatpump/myheatpump.js                  | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index b99a9064..70f049be 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -155,7 +155,7 @@ function show()
 
     // If this is a new dashboard there will be less than a days data 
     // show power graph directly in this case
-    if (((end*0.001)-start_time)<86400*3 || viewmode=="powergraph") {
+    if (((end*0.001)-start_time)<86400*3 || viewmode=="powergraph" || location.hash == "#power") {
         var timeWindow = (end - start_time*1000);
         if (timeWindow>(86400*3*1000)) timeWindow = 86400*1*1000;
         var start = end - timeWindow;
@@ -167,6 +167,12 @@ function show()
         $(".powergraph-navigation").show();
         powergraph_draw();
         $("#advanced-toggle").show();
+
+        if (location.hash == "#power") {
+          // auto-expand detail
+          $("#advanced-block").show();
+          $("#advanced-toggle").html("HIDE DETAIL");
+        }
     } else {
         var timeWindow = (3600000*24.0*30);
         var start = end - timeWindow;
@@ -303,22 +309,6 @@ $('.time').click(function () {
     powergraph_load(); powergraph_draw(); 
 });
 
-if (window.location.hash == "#power") {
-    show_powergraph();
-}
-
-function show_powergraph() {
-    view.timewindow(1.0);
-    $(".bargraph-navigation").hide();
-    viewmode = "powergraph";
-    powergraph_load();
-    powergraph_draw();
-    $(".powergraph-navigation").show();
-    $("#advanced-toggle").show();
-    $("#advanced-toggle").html("HIDE DETAIL");
-    $("#advanced-block").show();
-}
-
 $(".viewhistory").click(function () {
     $(".powergraph-navigation").hide();
     var timeWindow = (3600000*24.0*30);
@@ -475,7 +465,13 @@ $('.bargraph-alltime').click(function () {
 });
 
 $('.bargraph-day').click(function () {
-    show_powergraph();
+    view.timewindow(1.0);
+    $(".bargraph-navigation").hide();
+    viewmode = "powergraph";
+    powergraph_load();
+    powergraph_draw();
+    $(".powergraph-navigation").show();
+    $("#advanced-toggle").show();
 });
 
 $('.bargraph-week').click(function () {

From 76b5e96027f00b009bb6cecc01ba88b11f3c1567 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Tue, 14 Nov 2023 15:44:44 +0000
Subject: [PATCH 13/14] Removed dodgy hack for #power, will use proper urls
 instead

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
index 70f049be..1e4f6137 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.js
@@ -155,7 +155,7 @@ function show()
 
     // If this is a new dashboard there will be less than a days data 
     // show power graph directly in this case
-    if (((end*0.001)-start_time)<86400*3 || viewmode=="powergraph" || location.hash == "#power") {
+    if (((end*0.001)-start_time)<86400*3 || viewmode=="powergraph") {
         var timeWindow = (end - start_time*1000);
         if (timeWindow>(86400*3*1000)) timeWindow = 86400*1*1000;
         var start = end - timeWindow;
@@ -167,12 +167,6 @@ function show()
         $(".powergraph-navigation").show();
         powergraph_draw();
         $("#advanced-toggle").show();
-
-        if (location.hash == "#power") {
-          // auto-expand detail
-          $("#advanced-block").show();
-          $("#advanced-toggle").html("HIDE DETAIL");
-        }
     } else {
         var timeWindow = (3600000*24.0*30);
         var start = end - timeWindow;

From 242f3915e4dbae128bbf3ed98db7ad248bbb2846 Mon Sep 17 00:00:00 2001
From: MrTimbones <thefluffanutta@gmail.com>
Date: Tue, 14 Nov 2023 17:51:28 +0000
Subject: [PATCH 14/14] Tweaked nav bar to fit better on mobile

---
 apps/OpenEnergyMonitor/myheatpump/myheatpump.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
index 617153b1..3be8965a 100644
--- a/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
+++ b/apps/OpenEnergyMonitor/myheatpump/myheatpump.php
@@ -66,8 +66,7 @@
     <div class="block-bound">
     
       <div class="bargraph-navigation">
-        <!--<div class="bluenav bargraph-other">OTHER</div>-->
-        <div class="bluenav bargraph-alltime">ALL TIME</div>
+        <div class="bluenav bargraph-alltime">ALL</div>
         <div class="bluenav bargraph-year">YEAR</div>
         <div class="bluenav bargraph-quarter">3 MONTHS</div>
         <div class="bluenav bargraph-month">MONTH</div>
@@ -87,8 +86,6 @@
         <span class="bluenav time" time='6' title="Last 6 hours">6</span>
         <span class="bluenav time" time='1' title="Last hour">H</span>
       </div>
-        
-      <div class="block-title">HISTORY</div>       
     </div>
     
     <div style="background-color:#fff; padding:10px;">