@@ -119,13 +119,31 @@ class BatteryManager {
durationStr = (diffSec / 3600).toFixed(1) + ' h';
}
const isGridHeavy = s.ratio < 50;
- const rowStyle = isGridHeavy ? `color: ${COLOR_MODE_CHARGE_FROM_GRID};` : '';
+ const isInventory = s.is_inventory;
+ const inventoryEnergy = s.inventory_energy || 0;
+ let rowStyle = isGridHeavy ? `color: ${COLOR_MODE_CHARGE_FROM_GRID};` : '';
+ if (isInventory) {
+ rowStyle += 'background-color: rgba(76, 175, 80, 0.05); border-left: 3px solid #4caf50;';
+ } else {
+ rowStyle += 'opacity: 0.5;';
+ }
+
+ const inventoryInfo = isInventory && inventoryEnergy < s.charged_energy
+ ? `
`
+ : '';
+
return `
- | ${start.toLocaleDateString()} ${start.getHours().toString().padStart(2, '0')}:${start.getMinutes().toString().padStart(2, '0')} |
+
+ ${start.toLocaleDateString()} ${start.getHours().toString().padStart(2, '0')}:${start.getMinutes().toString().padStart(2, '0')}
+ ${isInventory ? ' ' : ''}
+ |
${durationStr} |
- ${(s.charged_energy / 1000).toFixed(3)} |
+
+ ${(s.charged_energy / 1000).toFixed(3)}
+ ${inventoryInfo}
+ |
${(s.charged_from_pv / 1000).toFixed(3)} |
${(s.charged_from_grid / 1000).toFixed(3)} |
${s.cost.toFixed(2)} ${localization.currency_symbol} |
@@ -151,16 +169,51 @@ class BatteryManager {
* Render the charging sessions chart
*/
renderSessionsChart(sessions) {
- const ctx = document.getElementById('batterySessionsChart').getContext('2d');
+ const canvas = document.getElementById('batterySessionsChart');
+ const ctx = canvas.getContext('2d');
+ // Create hatched patterns for historical data
+ const createPattern = (color) => {
+ const pCanvas = document.createElement('canvas');
+ const pCtx = pCanvas.getContext('2d');
+ pCanvas.width = 10;
+ pCanvas.height = 10;
+ pCtx.strokeStyle = color;
+ pCtx.lineWidth = 1;
+ pCtx.beginPath();
+ pCtx.moveTo(0, 10);
+ pCtx.lineTo(10, 0);
+ pCtx.stroke();
+ return ctx.createPattern(pCanvas, 'repeat');
+ };
+
+ const pvPattern = createPattern('rgba(76, 175, 80, 0.4)');
+ const gridPattern = createPattern('rgba(33, 150, 243, 0.4)');
+
// Prepare data
const labels = sessions.map(s => {
const d = new Date(s.start_time);
return `${d.getDate()}.${d.getMonth()+1} ${d.getHours().toString().padStart(2, '0')}:${d.getMinutes().toString().padStart(2, '0')}`;
});
- const pvData = sessions.map(s => s.charged_from_pv / 1000);
- const gridData = sessions.map(s => s.charged_from_grid / 1000);
+ // Split data into Inventory and Historical parts
+ const pvInventory = [];
+ const pvHistorical = [];
+ const gridInventory = [];
+ const gridHistorical = [];
+
+ sessions.forEach(s => {
+ const total = s.charged_energy || 1;
+ const inv = s.inventory_energy || 0;
+ const hist = s.charged_energy - inv;
+ const pvRatio = s.charged_from_pv / total;
+ const gridRatio = s.charged_from_grid / total;
+
+ pvInventory.push((inv * pvRatio) / 1000);
+ pvHistorical.push((hist * pvRatio) / 1000);
+ gridInventory.push((inv * gridRatio) / 1000);
+ gridHistorical.push((hist * gridRatio) / 1000);
+ });
const mobile = isMobile();
const fontSize = mobile ? 9 : 12;
@@ -172,16 +225,28 @@ class BatteryManager {
labels: labels,
datasets: [
{
- label: 'PV Energy (kWh)',
- data: pvData,
+ label: 'PV (Inventory)',
+ data: pvInventory,
backgroundColor: '#4caf50',
stack: 'Stack 0',
},
{
- label: 'Grid Energy (kWh)',
- data: gridData,
+ label: 'PV (Historical)',
+ data: pvHistorical,
+ backgroundColor: pvPattern,
+ stack: 'Stack 0',
+ },
+ {
+ label: 'Grid (Inventory)',
+ data: gridInventory,
backgroundColor: '#2196f3',
stack: 'Stack 0',
+ },
+ {
+ label: 'Grid (Historical)',
+ data: gridHistorical,
+ backgroundColor: gridPattern,
+ stack: 'Stack 0',
}
]
},
@@ -190,17 +255,29 @@ class BatteryManager {
maintainAspectRatio: false,
plugins: {
legend: {
- display: window.innerWidth > 400,
+ display: window.innerWidth > 600,
position: 'top',
labels: {
color: '#ccc',
font: { size: fontSize },
- boxWidth: mobile ? 10 : 40
+ boxWidth: mobile ? 10 : 20,
+ // Filter legend to show only main categories
+ filter: (item) => !item.text.includes('Historical')
}
},
tooltip: {
mode: 'index',
- intersect: false
+ intersect: false,
+ callbacks: {
+ label: function(context) {
+ let label = context.dataset.label || '';
+ if (label) label += ': ';
+ if (context.parsed.y !== undefined) {
+ label += context.parsed.y.toFixed(3) + ' kWh';
+ }
+ return label;
+ }
+ }
}
},
scales: {
From e22fad7f1e87665f14a276c8f56a9f7b4d11e27a Mon Sep 17 00:00:00 2001
From: ohAnd <15704728+ohAnd@users.noreply.github.com>
Date: Mon, 22 Dec 2025 21:02:23 +0100
Subject: [PATCH 6/8] fix: correct import statement for BatteryPriceHandler in
battery_interface.py
---
src/interfaces/battery_interface.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/interfaces/battery_interface.py b/src/interfaces/battery_interface.py
index 62ed6f97..0b343fb7 100644
--- a/src/interfaces/battery_interface.py
+++ b/src/interfaces/battery_interface.py
@@ -40,7 +40,7 @@
import threading
import time
import requests
-from interfaces.battery_price_handler import BatteryPriceHandler
+from .battery_price_handler import BatteryPriceHandler
logger = logging.getLogger("__main__")
logger.info("[BATTERY-IF] loading module ")
From 6066ab0633b3dc5f14a9b3a2a1f112098ad355ff Mon Sep 17 00:00:00 2001
From: ohAnd <15704728+ohAnd@users.noreply.github.com>
Date: Mon, 22 Dec 2025 21:07:33 +0100
Subject: [PATCH 7/8] feat: add sanitization step for Docker tag reference name
in workflow
---
.github/workflows/docker_feature.yml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/docker_feature.yml b/.github/workflows/docker_feature.yml
index 7697eaf0..ce02a151 100644
--- a/.github/workflows/docker_feature.yml
+++ b/.github/workflows/docker_feature.yml
@@ -44,6 +44,9 @@ jobs:
- name: Convert repository owner to lowercase
run: echo "owner=$(echo '${{ github.repository_owner }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+ - name: Sanitize ref name for Docker tag
+ run: echo "clean_ref=$(echo '${{ github.ref_name }}' | sed 's/\//_/g')" >> $GITHUB_ENV
+
# 1. Setup QEMU for ARM64 emulation
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
@@ -69,5 +72,5 @@ jobs:
context: .
platforms: linux/amd64,linux/arm64
tags: |
- ghcr.io/${{ env.owner }}/eos_connect:feature_dev_${{ github.ref_name }}
+ ghcr.io/${{ env.owner }}/eos_connect:feature_dev_${{ env.clean_ref }}
push: true
From 9f3d609aec15befe6c2693fc687f2639a1b719de Mon Sep 17 00:00:00 2001
From: ohAnd <15704728+ohAnd@users.noreply.github.com>
Date: Mon, 22 Dec 2025 21:15:43 +0100
Subject: [PATCH 8/8] feat: enhance battery overview to reflect dynamic price
calculation status and improve UI responsiveness
---
src/interfaces/battery_interface.py | 5 ++++-
src/web/js/battery.js | 26 ++++++++++++++++++--------
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/interfaces/battery_interface.py b/src/interfaces/battery_interface.py
index 0b343fb7..10433e22 100644
--- a/src/interfaces/battery_interface.py
+++ b/src/interfaces/battery_interface.py
@@ -309,7 +309,10 @@ def get_stored_energy_info(self):
"""
Returns detailed information about the stored energy cost analysis.
"""
- return self.price_handler.get_analysis_results()
+ results = self.price_handler.get_analysis_results().copy()
+ results["enabled"] = self.price_handler.price_calculation_enabled
+ results["price_source"] = "sensor" if self.price_sensor else "fixed"
+ return results
def set_min_soc(self, min_soc):
"""
diff --git a/src/web/js/battery.js b/src/web/js/battery.js
index c0db53a2..26c9ce56 100644
--- a/src/web/js/battery.js
+++ b/src/web/js/battery.js
@@ -29,6 +29,7 @@ class BatteryManager {
const stored = battery.stored_energy || {};
const sessions = stored.charging_sessions || [];
const lookbackHours = stored.duration_of_analysis || 96;
+ const isEnabled = stored.enabled !== false;
const header = `
@@ -42,9 +43,14 @@ class BatteryManager {
const usableKWh = (battery.usable_capacity / 1000).toFixed(1);
const maxChargeKW = (battery.max_charge_power_dyn / 1000).toFixed(2);
const wac = stored.stored_energy_price !== undefined ? (stored.stored_energy_price * 1000).toFixed(2) : "--";
- const pvRatio = stored.ratio !== undefined ? stored.ratio.toFixed(1) : "--";
+ const pvRatio = isEnabled && stored.ratio !== undefined ? stored.ratio.toFixed(1) : "--";
const lastUpdate = stored.last_update ? new Date(stored.last_update).toLocaleString() : "Never";
+ let priceSubLabel = "Inventory Valuation";
+ if (!isEnabled) {
+ priceSubLabel = stored.price_source === "sensor" ? "External Sensor" : "Fixed Value";
+ }
+
const content = `
@@ -68,11 +74,11 @@ class BatteryManager {
Stored Energy Price
${wac} ct/kWh
-
Inventory Valuation
+
${priceSubLabel}
PV Share
-
${pvRatio}%
+
${pvRatio}${isEnabled ? '%' : ''}
Solar vs Grid
@@ -81,17 +87,20 @@ class BatteryManager {
Recent Charging Sessions
-
Last analysis: ${lastUpdate}
+
${isEnabled ? `Last analysis: ${lastUpdate}` : 'Analysis disabled'}
-
-
+
+ ${isEnabled ? '
' : '
Dynamic price calculation is not enabled in configuration.
'}
-
Session Details (${sessions.length} sessions in last ${lookbackHours}h)
+
+ ${isEnabled ? `Session Details (${sessions.length} sessions in last ${lookbackHours}h)` : 'Session Details'}
+
+ ${isEnabled ? `
@@ -152,6 +161,7 @@ class BatteryManager {
}).join('')}
+ ` : '
Session history is only available when dynamic price calculation is enabled.
'}
@@ -160,7 +170,7 @@ class BatteryManager {
showFullScreenOverlay(header, content);
// Render Chart
- if (sessions.length > 0) {
+ if (isEnabled && sessions.length > 0) {
this.renderSessionsChart(sessions);
}
}