Fixed missing plan events

Octopus Power Up and Power down events were missing from plan view.
Resolved horizontal scroll issue on Config page in mobile view.

Author: =

apps/predbat/frontend.zip

@@ -4185,10 +4185,16 @@ def fetch_octopus_sessions(self, axle_sessions=None):
                             octopus_free_slot["start"] = start
                             octopus_free_slot["end"] = end
                             octopus_free_slot["rate"] = 0
+                            if event.get("event_type", None):
+                                octopus_free_slot["event_type"] = event["event_type"]
                             octopus_free_slots.append(octopus_free_slot)
         # Direct Octopus URL
         if "octopus_free_url" in self.args:
             free_online = self.download_octopus_free(self.get_arg("octopus_free_url", indirect=False))
+            for slot in free_online:
+                # The public website feed exposes only times and a zero rate. Keep
+                # that provenance so the UI does not guess Power Up or Happy Hour.
+                slot.setdefault("event_type", "FREE_ELECTRICITY")
             octopus_free_slots.extend(free_online)
 
         # Load free electricity events from Octopus flexibility API
@@ -4205,6 +4211,8 @@ def fetch_octopus_sessions(self, axle_sessions=None):
                             octopus_free_slot["start"] = start
                             octopus_free_slot["end"] = end
                             octopus_free_slot["rate"] = 0
+                            if event.get("event_type", None):
+                                octopus_free_slot["event_type"] = event["event_type"]
                             octopus_free_slots.append(octopus_free_slot)
 
         # Octopus saving session
@@ -4364,7 +4372,7 @@ def fetch_octopus_sessions(self, axle_sessions=None):
                             continue
                         if abs((start_time - self.now_utc).days) <= 3:
                             self.log("Octopus: Joined Octopus Weekend Happy Hour {}-{} - treating as a free electricity session".format(start_time.strftime("%a %d/%m %H:%M"), end_time.strftime("%H:%M")))
-                            octopus_free_slots.append({"start": start, "end": end, "rate": 0})
+                            octopus_free_slots.append({"start": start, "end": end, "rate": 0, "event_type": "WEEKEND_HAPPY_HOUR"})
                         continue
 
                     # Skip events with no rate info unless default is configured

apps/predbat/octopus.py

@@ -73,7 +73,12 @@ def event_slot_contains_minute(slot, minute, midnight_utc, start_key="start", en
 
 def plan_rate_event_type(base, minute):
     """Return the programme that produced a plan row's generic ``saving`` rate tag."""
-    if any(event_slot_contains_minute(slot, minute, base.midnight_utc) for slot in base.octopus_free_slots):
+    matching_free_slots = [slot for slot in base.octopus_free_slots if event_slot_contains_minute(slot, minute, base.midnight_utc)]
+    if any(slot.get("event_type") == "WEEKEND_HAPPY_HOUR" for slot in matching_free_slots):
+        return "octopus_happy_hour"
+    if any(slot.get("event_type") == "FREE_ELECTRICITY" for slot in matching_free_slots):
+        return "octopus_free_electricity"
+    if matching_free_slots:
         return "octopus_power_up"
     for slot in base.octopus_saving_slots:
         active_undated_slot = slot.get("state") and not slot.get("start") and not slot.get("end") and (base.minutes_now // 30) * 30 <= minute < (base.minutes_now // 30) * 30 + 30

apps/predbat/output.py

@@ -152,6 +152,14 @@ def run_test_plan_json_rate_adjust(my_predbat):
     event_cases = [
         ("octopus_power_down", [{"start": event_start, "end": event_end}], [], []),
         ("octopus_power_up", [], [{"start": event_start, "end": event_end}], []),
+        ("octopus_free_electricity", [], [{"start": event_start, "end": event_end, "event_type": "FREE_ELECTRICITY"}], []),
+        ("octopus_happy_hour", [], [{"start": event_start, "end": event_end, "event_type": "WEEKEND_HAPPY_HOUR"}], []),
+        (
+            "octopus_happy_hour",
+            [],
+            [{"start": event_start, "end": event_end}, {"start": event_start, "end": event_end, "event_type": "WEEKEND_HAPPY_HOUR"}],
+            [],
+        ),
         ("axle_export", [], [], [{"start_time": event_start, "end_time": event_end, "import_export": "export"}]),
     ]
     try:

apps/predbat/tests/test_plan_json_rate_adjust.py

@@ -1547,7 +1547,7 @@ def run(joined_yaml):
     print("  Test 1: WEEKEND_HAPPY_HOUR is free, TURN_DOWN is a saving slot")
     octopus_free_slots, octopus_saving_slots = run(happy_hour + "\n" + turn_down_rewarded)
 
-    expected_free = [{"start": "{}T11:00:00+{}:00".format(date_today, tz_offset), "end": "{}T12:00:00+{}:00".format(date_today, tz_offset), "rate": 0}]
+    expected_free = [{"start": "{}T11:00:00+{}:00".format(date_today, tz_offset), "end": "{}T12:00:00+{}:00".format(date_today, tz_offset), "rate": 0, "event_type": "WEEKEND_HAPPY_HOUR"}]
     expected_saving = [{"start": "{}T17:00:00+{}:00".format(date_today, tz_offset), "end": "{}T18:00:00+{}:00".format(date_today, tz_offset), "rate": 50.0, "state": False}]
     if json.dumps(octopus_free_slots) != json.dumps(expected_free):
         print("ERROR: Expecting free slots {} got {}".format(expected_free, octopus_free_slots))

apps/predbat/tests/test_saving_session.py

@@ -355,6 +355,10 @@
   grid-column: 4;
 }
 
+.plan-summary-next-label-compact {
+  display: none;
+}
+
 .plan-summary-context-now,
 .plan-summary-context-next {
   position: relative;
@@ -375,3 +379,14 @@
 .plan-summary-context-next::after {
   right: 0;
 }
+
+@media (max-width: 900px) {
+  .plan-summary-context,
+  .plan-summary-next-label-desktop {
+    display: none;
+  }
+
+  .plan-summary-next-label-compact {
+    display: block;
+  }
+}

frontend/src/components/PlanSummary.css

@@ -613,7 +613,9 @@ function PlanSummary({ plan, showPlanLink = true }: PlanSummaryProps) {
                     Next action family, its window and final planned limit.
                    -------------------------------------------------------- */}
         <div className="plan-summary-metric">
-          <span className="metric-label">Action</span>
+          <span className="metric-label plan-summary-next-label-desktop">Action</span>
+
+          <span className="metric-label plan-summary-next-label-compact">Next action</span>
 
           <strong className={`metric-value action-value ${getActionClass(nextActionType)}`}>
             {nextActionType && getActionIcon(nextActionType)}

frontend/src/components/PlanSummary.tsx

@@ -33,17 +33,13 @@
 }
 
 .plan-table {
-  width: 100%;
-  min-width: 1120px;
-  table-layout: fixed;
+  width: max-content;
+  min-width: 100%;
+  table-layout: auto;
   border-collapse: collapse;
   font-size: 0.72rem;
 }
 
-.plan-table.is-debug {
-  min-width: 1420px;
-}
-
 .plan-debug-notice {
   display: flex;
   flex-wrap: wrap;

frontend/src/components/PlanTable.css

@@ -57,6 +57,11 @@ const RATE_EVENT_DETAILS: Record<string, { label: string; description: string; c
     description: 'Octopus Weekend Happy Hour: Predbat has applied the free electricity rate to this slot.',
     colour: 'power-up'
   },
+  octopus_free_electricity: {
+    label: 'Free electricity',
+    description: 'Free electricity session from an untyped public feed: Predbat has applied the zero rate to this slot.',
+    colour: 'power-up'
+  },
   axle_import: {
     label: 'Axle import',
     description: 'Axle import event: Predbat has applied the event reward to this slot.',

frontend/src/components/PlanTable.tsx

@@ -80,6 +80,7 @@ const RATE_EVENT_DETAILS: Record<NonNullable<PlanRow['rate_event_type']>, { labe
   octopus_power_down: { label: 'Power Down', colour: 'power-down' },
   octopus_power_up: { label: 'Power Up', colour: 'power-up' },
   octopus_happy_hour: { label: 'Happy Hour', colour: 'power-up' },
+  octopus_free_electricity: { label: 'Free electricity', colour: 'power-up' },
   axle_import: { label: 'Axle import', colour: 'axle-import' },
   axle_export: { label: 'Axle export', colour: 'axle-export' },
   axle_event: { label: 'Axle event', colour: 'axle-event' },