Merge pull request #36 from basecubedev/bugfix/Add-since_date-to-Energy-Lifetime-Statistics

Add  to Energy Lifetime Statistics

Author: basecubedev

dashboard/sqlite_store.py

@@ -196,6 +196,7 @@ def record(self, snapshot):
 
     def latest(self):
         if self._latest is not None:
+            self._latest["energy_stats"] = self.energy_summary()
             return self._latest
 
         with self._lock, self._connect() as con:
@@ -209,6 +210,7 @@ def latest(self):
             return snapshot
 
         self._latest = json.loads(row[0])
+        self._latest["energy_stats"] = self.energy_summary()
         return self._latest
 
     def history(self, range_name="6h"):
@@ -383,7 +385,10 @@ def _energy_summary(self, con, now=None):
                     for month in range(1, 13)
                 ],
                 "yearly": [],
-                "lifetime": _energy_payload(0, 0),
+                "lifetime": {
+                    **_energy_payload(0, 0),
+                    "since_date": None,
+                },
             })
 
         return summary
@@ -472,12 +477,16 @@ def _lifetime_summary(self, con):
             """
             SELECT
                 COALESCE(SUM(inverter_output_wh), 0),
-                COALESCE(SUM(savings_value), 0)
+                COALESCE(SUM(savings_value), 0),
+                MIN(date)
             FROM daily_energy_stats
+            WHERE sample_count > 0
             """
         ).fetchone()
 
-        return _energy_payload(row[0], row[1])
+        payload = _energy_payload(row[0], row[1])
+        payload["since_date"] = row[2]
+        return payload
 
     def _cleanup(self, con):
         cutoff = (

dashboard/static/app.js

@@ -317,7 +317,7 @@ function renderEnergyStats(stats) {
   const monthly = normalizeMonthlyEnergy(stats.monthly_current_year);
   const yearly = normalizeYearlyEnergy(stats.yearly);
   const lifetime = stats.lifetime || {};
-  const hasEnergy = [
+  const hasCollectedStats = Boolean(lifetime.since_date) || [
     stats.today,
     stats.last_7_days,
     stats.last_4_weeks,
@@ -328,7 +328,7 @@ function renderEnergyStats(stats) {
     ...yearly,
   ].some((item) => energyKwh(item) > 0);
 
-  if (!hasEnergy) {
+  if (!hasCollectedStats) {
     container.innerHTML = `<div class="energy-empty control-empty compact">Waiting for the first measured inverter output sample.</div>`;
     return;
   }
@@ -443,10 +443,18 @@ function energyLifetimeCard(values, currency) {
     values,
     currency,
     className: "energy-lifetime-card",
+    details: values?.since_date
+      ? [{ label: "Date", value: formatEnergyDate(values.since_date) }]
+      : [],
   });
 }
 
-function energySummaryCard({ title, subtitle, values, currency, className = "", current = false }) {
+function energySummaryCard({ title, subtitle, values, currency, className = "", current = false, details = [] }) {
+  const detailFacts = details
+    .filter((detail) => detail?.value)
+    .map((detail) => energyFact(detail.label || "Detail", detail.value, detail.iconName || "history", detail.tone || "neutral"))
+    .join("");
+
   return `
     <article class="energy-summary-card ${escapeHtml(className)} ${current ? "energy-current" : ""}">
       <div class="energy-summary-head">
@@ -456,6 +464,7 @@ function energySummaryCard({ title, subtitle, values, currency, className = "",
       <div class="energy-summary-values">
         ${energyFact("Energy", formatEnergyKwh(values), "inverter", "output")}
         ${energyFact("Savings", formatSavings(values, currency), "charge", "savings")}
+        ${detailFacts}
       </div>
     </article>
   `;
@@ -567,8 +576,11 @@ function formatSavings(values, currency) {
 
 function formatEnergyDate(value) {
   if (!value) return "";
+  const raw = String(value);
+  const dateOnly = raw.match(/^(\d{4})-(\d{2})-(\d{2})$/);
+  if (dateOnly) return `${dateOnly[1]}-${dateOnly[2]}-${dateOnly[3]}`;
   const date = new Date(value);
-  if (Number.isNaN(date.getTime())) return String(value);
+  if (Number.isNaN(date.getTime())) return raw;
   return date.toISOString().slice(0, 10);
 }
 

tests/test_dashboard_battery_flow_semantics.py

@@ -378,7 +378,7 @@ class FakeElement {
             { year: 2026, inverter_output_kwh: 840.0, savings_value: 294.0 },
             { year: 2027, inverter_output_kwh: 910.0, savings_value: 318.5 },
           ],
-          lifetime: { inverter_output_kwh: 2070.0, savings_value: 724.5 },
+          lifetime: { inverter_output_kwh: 2070.0, savings_value: 724.5, since_date: "2026-05-31" },
         };
 
         const html = render(stats);
@@ -405,6 +405,8 @@ class FakeElement {
         assert(html.includes("Monthly Summary"), "monthly section renders");
         assert(html.includes("Yearly Summary"), "yearly section renders");
         assert(html.includes("Result / Lifetime"), "Lifetime card renders as a normal result summary");
+        assert(html.includes("All stored daily totals"), "Lifetime subtitle remains descriptive");
+        assert(html.includes("Date") && html.includes("2026-05-31"), "Lifetime since date renders as a detail field");
         assert(html.includes("3.2 kWh"), "Today kWh renders");
         assert(html.includes("18.4 kWh"), "Last 7 Days kWh renders");
         assert(html.includes("72.1 kWh"), "Last 4 Weeks kWh renders");
@@ -433,6 +435,7 @@ class FakeElement {
         assert(render(undefined).includes("Energy statistics not available yet."), "missing stats fallback renders");
         assert(render({ enabled: false }).includes("Energy statistics are disabled."), "disabled fallback renders");
         assert(render({ enabled: true, currency: "EUR", today: { inverter_output_kwh: 0 }, lifetime: { inverter_output_kwh: 0 } }).includes("Waiting for the first measured inverter output sample."), "first sample fallback renders");
+        assert(render({ enabled: true, currency: "EUR", today: { inverter_output_kwh: 0 }, lifetime: { inverter_output_kwh: 0, since_date: "2026-05-31" } }).includes("2026-05-31"), "lifetime since date renders before energy accumulates");
 
         const demo = context.demoSnapshot();
         context.renderSnapshot(demo);

tests/test_dashboard_store.py

@@ -1,3 +1,4 @@
+import json
 import sqlite3
 from datetime import datetime, timedelta, timezone
 from types import SimpleNamespace
@@ -65,7 +66,7 @@ def daily_row(path, date_key):
         ).fetchone()
 
 
-def insert_daily(path, date_key, wh, savings=0, peak=0):
+def insert_daily(path, date_key, wh, savings=0, peak=0, sample_count=1):
     with sqlite3.connect(path) as con:
         con.execute(
             """
@@ -79,9 +80,16 @@ def insert_daily(path, date_key, wh, savings=0, peak=0):
                 sample_count,
                 updated_at
             )
-            VALUES(?, ?, ?, 0.35, 'EUR', ?, 1, ?)
+            VALUES(?, ?, ?, 0.35, 'EUR', ?, ?, ?)
             """,
-            (date_key, wh, savings, peak, f"{date_key}T12:00:00+00:00"),
+            (
+                date_key,
+                wh,
+                savings,
+                peak,
+                sample_count,
+                f"{date_key}T12:00:00+00:00",
+            ),
         )
 
 
@@ -96,6 +104,35 @@ def test_store_records_latest_and_history(tmp_path):
     assert store.latest()["control_explain"] is None
 
 
+def test_latest_refreshes_energy_stats_from_daily_aggregates(tmp_path):
+    path = tmp_path / "dashboard.sqlite"
+    DashboardStore(path)
+    insert_daily(path, "2026-05-31", 1000, savings=1)
+    timestamp = datetime(2026, 6, 1, 12, 0, tzinfo=timezone.utc).isoformat()
+
+    with sqlite3.connect(path) as con:
+        stale_snapshot = snapshot(timestamp)
+        stale_snapshot["energy_stats"] = {
+            "enabled": True,
+            "currency": "EUR",
+            "lifetime": {
+                "inverter_output_wh": 0,
+                "inverter_output_kwh": 0,
+                "savings_value": 0,
+            },
+        }
+        con.execute(
+            "INSERT INTO snapshots(timestamp, payload) VALUES(?, ?)",
+            (timestamp, json.dumps(stale_snapshot)),
+        )
+
+    store = DashboardStore(path)
+    latest = store.latest()
+
+    assert latest["energy_stats"]["lifetime"]["inverter_output_wh"] == 1000
+    assert latest["energy_stats"]["lifetime"]["since_date"] == "2026-05-31"
+
+
 def test_store_cleanup_uses_retention(tmp_path):
     store = DashboardStore(tmp_path / "dashboard.sqlite", retention_hours=1)
     old = (datetime.now(timezone.utc) - timedelta(hours=3)).isoformat()
@@ -287,10 +324,53 @@ def test_energy_rolling_summaries_and_best_day(tmp_path):
     assert summary["last_4_weeks"]["inverter_output_wh"] == 10000
     assert summary["last_12_months"]["inverter_output_wh"] == 15000
     assert summary["lifetime"]["inverter_output_wh"] == 21000
+    assert summary["lifetime"]["since_date"] == "2025-06-29"
     assert summary["best_day"]["date"] == "2025-06-29"
     assert summary["best_day"]["inverter_output_wh"] == 6000
 
 
+def test_energy_lifetime_since_date_is_null_without_daily_stats(tmp_path):
+    store = DashboardStore(tmp_path / "dashboard.sqlite")
+
+    summary = store.energy_summary(
+        now=datetime(2026, 6, 29, 12, 0, tzinfo=timezone.utc)
+    )
+
+    assert summary["lifetime"]["inverter_output_wh"] == 0
+    assert summary["lifetime"]["since_date"] is None
+
+
+def test_energy_lifetime_since_date_uses_first_collected_day_across_gaps(tmp_path):
+    path = tmp_path / "dashboard.sqlite"
+    DashboardStore(path)
+    insert_daily(path, "2026-06-01", 1000, savings=1)
+    insert_daily(path, "2026-06-08", 2000, savings=2)
+
+    store = DashboardStore(path)
+    summary = store.energy_summary(
+        now=datetime(2026, 6, 29, 12, 0, tzinfo=timezone.utc)
+    )
+
+    assert summary["lifetime"]["inverter_output_wh"] == 3000
+    assert summary["lifetime"]["since_date"] == "2026-06-01"
+
+
+def test_energy_lifetime_since_date_ignores_zero_sample_days(tmp_path):
+    path = tmp_path / "dashboard.sqlite"
+    DashboardStore(path)
+    insert_daily(path, "2026-05-31", 5000, savings=5, sample_count=0)
+    insert_daily(path, "2026-06-01", 1000, savings=1)
+    insert_daily(path, "2026-06-02", 2000, savings=2)
+
+    store = DashboardStore(path)
+    summary = store.energy_summary(
+        now=datetime(2026, 6, 29, 12, 0, tzinfo=timezone.utc)
+    )
+
+    assert summary["lifetime"]["inverter_output_wh"] == 3000
+    assert summary["lifetime"]["since_date"] == "2026-06-01"
+
+
 def test_energy_monthly_and_yearly_summaries(tmp_path):
     path = tmp_path / "dashboard.sqlite"
     DashboardStore(path)