Switch the JSON plan to be an attribute of the plan_html entity, based on feedback

Author: magicmonkey

apps/predbat/predbat.py

@@ -4172,7 +4172,7 @@ def get_html_plan_header(self, plan_debug):
         html += "</tr>"
         return html
 
-    def publish_json_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10, load_minutes_step, load_minutes_step10, end_record):
+    def get_json_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10, load_minutes_step, load_minutes_step10, end_record):
         output = {}
 
         plan_debug = self.get_arg("plan_debug")
@@ -4436,9 +4436,10 @@ def publish_json_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10,
         # output['raw']['load_minutes_step'] = load_minutes_step
         # output['raw']['load_minutes_step10'] = load_minutes_step10
 
-        self.dashboard_item(self.prefix + ".plan_html", state="", attributes={"json": json.dumps(output), "friendly_name": "Plan in JSON", "icon": "mdi:web-box"})
+        return output
 
     def publish_html_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10, load_minutes_step, load_minutes_step10, end_record):
+        json_output = self.get_json_plan(pv_forecast_minute_step, pv_forecast_minute_step10, load_minutes_step, load_minutes_step10, end_record)
         """
         Publish the current plan in HTML format
         """
@@ -4823,7 +4824,7 @@ def publish_html_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10,
                 html += "<td bgcolor=" + carbon_color + "> " + str(carbon_str) + " </td>"
             html += "</tr>"
         html += "</table>"
-        self.dashboard_item(self.prefix + ".plan_html", state="", attributes={"html": html, "friendly_name": "Plan in HTML", "icon": "mdi:web-box"})
+        self.dashboard_item(self.prefix + ".plan_html", state="", attributes={"html": html, "json": json.dumps(json_output), "friendly_name": "Plan in HTML", "icon": "mdi:web-box"})
         self.html_plan = html
 
     def publish_rates(self, rates, export, gas=False):
@@ -8507,8 +8508,6 @@ def calculate_plan(self, recompute=True):
 
             # HTML data
             self.publish_html_plan(pv_forecast_minute_step, pv_forecast_minute10_step, load_minutes_step, load_minutes_step10, self.end_record)
-            # JSON data
-            self.publish_json_plan(pv_forecast_minute_step, pv_forecast_minute10_step, load_minutes_step, load_minutes_step10, self.end_record)
 
         # Destroy pool
         if self.pool: