From e3316b9ff31dad4edadef9739652c67c00b83fdb Mon Sep 17 00:00:00 2001
From: Bruce Duncan <bwduncan@gmail.com>
Date: Mon, 22 Feb 2021 21:10:35 +0000
Subject: [PATCH 1/4] Remove commented-out code.

---
 apps/OpenEnergyMonitor/octopus/octopus.php | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/apps/OpenEnergyMonitor/octopus/octopus.php b/apps/OpenEnergyMonitor/octopus/octopus.php
index 14c6ee34..ba9b4574 100644
--- a/apps/OpenEnergyMonitor/octopus/octopus.php
+++ b/apps/OpenEnergyMonitor/octopus/octopus.php
@@ -76,7 +76,6 @@
 
     <div class="block-bound">
       <div class="bluenav config-open"><i class="icon-wrench icon-white"></i></div>
-      <!--<div class="bluenav viewcostenergy">VIEW COST</div>-->
       <div class="bluenav cost">Cost</div>
       <div class="bluenav energy bluenav-active">Energy</div>
       <div id="app-title" class="block-title">OCTOPUS AGILE</div>
@@ -114,18 +113,6 @@
         <span class="bluenav" id="fastleft" >&lt;&lt;</span>
         <span class="bluenav" id="right" >&gt;</span>
         <span class="bluenav" id="left" >&lt;</span>
-        <!--<span class="bluenav" id="zoomout" >-</span>-->
-        <!--<span class="bluenav" id="zoomin" >+</span>
-        <span class="bluenav time" time='1440' title='Previous 60 days'>60d</span>
-        <span class="bluenav time" time='720' title='Previous 30 days'>30d</span>
-        <span class="bluenav time" time='168' title='Previous 7 days'>7d</span>
-        <span class="bluenav time" time='24' title='Previous 24 hours'>1d</span>
-        <span class="bluenav time" time='12' title='Previous 12 hours'>12h</span>
-        <span class="bluenav time" time='M' title='Since midnight 1st of month'>Month</span>
-        <span class="bluenav time" time='W' title='Since midnight Sunday'>Week</span>
-        <span class="bluenav time" time='Y' title='Yesterday'>Yesterday</span>
-        <span class="bluenav time" time='T' title='Today since midnight'>Today</span>-->
-        
         <select class="time-select">
             <option value='1440'>Previous 60 days</option>
             <option value='720'>Previous 30 days</option>

From 07936600a38ad4eef234c48985f01f4cbc1a9b74 Mon Sep 17 00:00:00 2001
From: Bruce Duncan <bwduncan@gmail.com>
Date: Mon, 22 Feb 2021 21:14:42 +0000
Subject: [PATCH 2/4] Instantaneous cost display
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Nothing updated the graph. Call graph_draw from updater which is
called every 5s.
- Remove legacy viewcostenergy.
- Add a currency symbol setting, defaults to £.
- Update the power_now value with agile and consumption data for cost,
if we have it.
---
 apps/OpenEnergyMonitor/octopus/octopus.php | 51 ++++++++++++----------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/apps/OpenEnergyMonitor/octopus/octopus.php b/apps/OpenEnergyMonitor/octopus/octopus.php
index ba9b4574..b2181175 100644
--- a/apps/OpenEnergyMonitor/octopus/octopus.php
+++ b/apps/OpenEnergyMonitor/octopus/octopus.php
@@ -226,6 +226,7 @@
 // ----------------------------------------------------------------------
 config.app = {
     "title":{"type":"value", "default":"OCTOPUS AGILE", "name": "Title", "description":"Optional title for app"},
+    "currency":{"type":"value", "default":"£", "name": "Currency", "description":"Currency symbol (£, $, ...)"},
     "import":{"optional":true, "type":"feed", "autoname":"import", "engine":"5"},
     "import_kwh":{"type":"feed", "autoname":"import_kwh", "engine":5},
     "use_kwh":{"optional":true, "type":"feed", "autoname":"use_kwh", "engine":5},
@@ -283,8 +284,6 @@
 var data = {};
 var graph_series = [];
 var previousPoint = false;
-var viewmode = "graph";
-var viewcostenergy = "energy";
 var panning = false;
 var period_text = "month";
 var period_average = 0;
@@ -413,17 +412,8 @@ function updater()
             if (config.app[key].value) feeds[key] = result[config.app[key].value];
         }
 
-        if (feeds["import"]!=undefined) {
-            if (viewcostenergy=="energy") {
-                if (feeds["import"].value<10000) {
-                    $("#power_now").html(Math.round(feeds["import"].value)+"<span class='units'>W</span>");
-                } else {
-                    $("#power_now").html((feeds["import"].value*0.001).toFixed(1)+"<span class='units'>kW</span>");
-                }
-            } else {
-                $("#power_now").html(config.app.currency.value+(feeds["import"].value*1*config.app.unitcost.value*0.001).toFixed(3)+"<span class='units'>/hr</span>");
-            }
-        }
+        graph_load()
+        graph_draw()
     });
 }
 
@@ -534,17 +524,6 @@ function updater()
     setTimeout(function() { panning = false; }, 100);
 });
 
-$(".viewcostenergy").click(function(){
-    var view = $(this).html();
-    if (view=="VIEW COST") {
-        $(this).html("VIEW ENERGY");
-        viewcostenergy = "cost";
-    } else {
-        $(this).html("VIEW COST");
-        viewcostenergy = "energy";
-    }
-});
-
 $(".energy").click(function() {
     view_mode = "energy";
     graph_draw()
@@ -961,8 +940,32 @@ function graph_draw()
         let unit_price = data["agile"][2*this_halfhour_index][1]*1.05;
         $("#unit_price").html(unit_price.toFixed(2)+"<span class='units'>p</span>");
 
+        if (feeds["import"]!=undefined) {
+            if (view_mode=="energy") {
+                if (feeds["import"].value<10000) {
+                    $("#power_now").html(Math.round(feeds["import"].value)+"<span class='units'>W</span>");
+                } else {
+                   $("#power_now").html((feeds["import"].value*0.001).toFixed(1)+"<span class='units'>kW</span>");
+                }
+            } else {
+                $("#power_now").html(config.app.currency.value+(unit_price*feeds["import"].value*1e-5).toFixed(3)+"<span class='units'>/hr</span>");
+            }
+            $("#power_now").show();
+        }
+
         $(".last_halfhour_stats").show();
     } else {
+        if (feeds["import"]!=undefined && view_mode=="energy") {
+            if (feeds["import"].value<10000) {
+                $("#power_now").html(Math.round(feeds["import"].value)+"<span class='units'>W</span>");
+            } else {
+               $("#power_now").html((feeds["import"].value*0.001).toFixed(1)+"<span class='units'>kW</span>");
+            }
+            $("#power_now").show();
+        } else {
+            $("#power_now").hide();
+        }
+
         $(".last_halfhour_stats").hide();
     }
 

From b2e2244cca1f383dc19d0bc3389e9c8377d8ac75 Mon Sep 17 00:00:00 2001
From: Bruce Duncan <bwduncan@gmail.com>
Date: Fri, 26 Feb 2021 18:10:39 +0000
Subject: [PATCH 3/4] Remove more unused code.

---
 apps/OpenEnergyMonitor/octopus/octopus.php | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/apps/OpenEnergyMonitor/octopus/octopus.php b/apps/OpenEnergyMonitor/octopus/octopus.php
index b2181175..7cb8dac1 100644
--- a/apps/OpenEnergyMonitor/octopus/octopus.php
+++ b/apps/OpenEnergyMonitor/octopus/octopus.php
@@ -450,17 +450,6 @@ function updater()
     }
 });
 
-$("#advanced-toggle").click(function () {
-    var mode = $(this).html();
-    if (mode=="SHOW DETAIL") {
-        $("#advanced-block").show();
-        $(this).html("HIDE DETAIL");
-    } else {
-        $("#advanced-block").hide();
-        $(this).html("SHOW DETAIL");
-    }
-});
-
 $('#placeholder').bind("plothover", function (event, pos, item) {
     if (item) {
         var z = item.dataIndex;

From 9adf208317955b0752ff9eebd3a4d4d3ed6fe590 Mon Sep 17 00:00:00 2001
From: Bruce Duncan <bwduncan@gmail.com>
Date: Fri, 26 Feb 2021 18:11:35 +0000
Subject: [PATCH 4/4] Move getdataremote calls out of updater

---
 apps/OpenEnergyMonitor/octopus/octopus.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/OpenEnergyMonitor/octopus/octopus.php b/apps/OpenEnergyMonitor/octopus/octopus.php
index 7cb8dac1..92224f50 100644
--- a/apps/OpenEnergyMonitor/octopus/octopus.php
+++ b/apps/OpenEnergyMonitor/octopus/octopus.php
@@ -412,7 +412,7 @@ function updater()
             if (config.app[key].value) feeds[key] = result[config.app[key].value];
         }
 
-        graph_load()
+        graph_reload()
         graph_draw()
     });
 }
@@ -624,15 +624,6 @@ function graph_load()
         $("#use_meter_kwh_hh_bound").show();
     }
 
-    var import_kwh = feed.getdata(feeds["import_kwh"].id,view.start,view.end,interval,0,0);
-
-    var use_kwh = [];
-    if (solarpv_mode) use_kwh = feed.getdata(feeds["use_kwh"].id,view.start,view.end,interval,0,0);
-    var solar_kwh = [];
-    if (solarpv_mode) solar_kwh = feed.getdata(feeds["solar_kwh"].id,view.start,view.end,interval,0,0);    
-    var meter_kwh_hh = []
-    if (smart_meter_data) meter_kwh_hh = feed.getdata(feeds["meter_kwh_hh"].id,view.start,view.end,interval,0,0); 
-    
     data = {};
     
     data["agile"] = []
@@ -665,7 +656,18 @@ function graph_load()
     // Invert export tariff
     for (var z in data["outgoing"]) data["outgoing"][z][1] *= -1;
 
+    graph_reload()
+}
+function graph_reload() {
+    var interval = 1800;
+    var import_kwh = feed.getdata(feeds["import_kwh"].id,view.start,view.end,interval,0,0);
 
+    var use_kwh = [];
+    if (solarpv_mode) use_kwh = feed.getdata(feeds["use_kwh"].id,view.start,view.end,interval,0,0);
+    var solar_kwh = [];
+    if (solarpv_mode) solar_kwh = feed.getdata(feeds["solar_kwh"].id,view.start,view.end,interval,0,0);
+    var meter_kwh_hh = []
+    if (smart_meter_data) meter_kwh_hh = feed.getdata(feeds["meter_kwh_hh"].id,view.start,view.end,interval,0,0);
     data["use"] = [];
     data["import"] = [];
     data["import_cost"] = [];