iobroker.sun2000 2.4.4 → 2.4.5

package/README.md

@@ -69,6 +69,11 @@ The sun2000 adapter calculates how much of your self-generated solar energy is a
 	Placeholder for the next version (at the beginning of the line):
 	### **WORK IN PROGRESS**
 -->
+### 2.4.5 (2026-05-14)
+* statistics fix: return weekly range up to current Monday
+* statistics: added support for generating statistics templates directly from built-in charts
+* statistics: improved tooltip formatter - tooltip units are now provided explicitly via tooltip.valueFormatter
+
 ### 2.4.4 (2026-05-04)
 * statistics fix: add error handling for waitForValue function
 
@@ -91,9 +96,6 @@ The sun2000 adapter calculates how much of your self-generated solar energy is a
 * new state `inverter.x.emma.activeAlarmSN` and `inverter.x.emma.HistoricalAlarmSN` : emma alarms  [#226](https://github.com/bolliy/ioBroker.sun2000/issues/226)
 * statistics: Aggregates historical collected datapoints into time-based summaries (e.g. hourly, daily, monthly, yearly). The data is stored in the path `statistics` as JSON.
 
-### 2.3.7 (2026-02-01)
-* deleted deprecated state `collected.usableSurplusPower`
-
 ## License
 MIT License
 

package/io-package.json

@@ -1,8 +1,21 @@
 {
   "common": {
     "name": "sun2000",
-    "version": "2.4.4",
+    "version": "2.4.5",
     "news": {
+      "2.4.5": {
+        "en": "statistics fix: return weekly range up to current Monday\nstatistics: added support for generating statistics templates directly from built-in charts\nstatistics: improved tooltip formatter - tooltip units are now provided explicitly via tooltip.valueFormatter",
+        "de": "statistik fix: wöchentliche Rückgabe bis zum aktuellen Montag\nstatistik: unterstützung für die erstellung von statistiken vorlagen direkt aus integrierten diagrammen\nstatistiken: verbesserter Tooltip-Formater - Tooltip-Einheiten werden nun explizit über tooltip.valueFormatter bereitgestellt",
+        "ru": "исправление статистики: еженедельный диапазон возврата до текущего понедельника\nстатистика: добавлена поддержка для создания шаблонов статистики непосредственно из встроенных диаграмм\nстатистика: улучшенный инструментальный формататор - инструментальные блоки теперь предоставляются явно через tooltip.value",
+        "pt": "estatística correção: retorno semanal intervalo até a segunda-feira atual\nestatística: suporte adicionado para gerar modelos estatísticos diretamente de gráficos embutidos\nestatísticas: a dica de formatação melhorada - as unidades de dica são agora fornecidas explicitamente via tooltip.valueFormatter",
+        "nl": "statistieken fix: retour wekelijkse bereik tot de huidige maandag\nstatistieken: extra ondersteuning voor het genereren van statistieken templates rechtstreeks uit ingebouwde grafieken\nstatistieken: verbeterde tooltip formatter - tooltip-eenheden worden nu expliciet geleverd via tooltip.valueFormatter",
+        "fr": "correction statistique: retour hebdomadaire jusqu'à lundi actuel\nstatistiques: appui supplémentaire à la production de modèles de statistiques directement à partir de graphiques intégrés\nstatistiques: amélioration de l'outil pour la matière - les unités d'outil sont désormais fournies explicitement via tooltip.valueFormatter",
+        "it": "statistiche fix: rientro settimanale fino al lunedì corrente\nstatistiche: aggiunto il supporto per la generazione di modelli di statistiche direttamente da grafici incorporati\nstatistiche: migliorato tooltip formatter - le unità tooltip sono ora fornite esplicitamente tramite tooltip.valueFormatter",
+        "es": "solucion de estadísticas: retorno semanal hasta el lunes actual\nestadística: apoyo añadido para generar plantillas de estadísticas directamente desde gráficos incorporados\nestadística: mejorada herramienta formatter - unidades de punta de herramientas se proporcionan ahora explícitamente a través de tooltip.valueFormatter",
+        "pl": "statystyki naprawić: wrócić tygodniowy zakres do bieżącego poniedziałku\nstatystyki: dodano wsparcie dla tworzenia szablonów statystycznych bezpośrednio z wykresów built- in\nstatystyki: ulepszone formatowanie podpowiedzi narzędziowej - jednostki podpowiedzi są teraz wyraźnie dostarczane za pośrednictwem tooltip.valueFormatter",
+        "uk": "статистика виправити: повернути щотижневий діапазон до поточного понеділка\nстатистика: додана підтримка створення шаблонів статистики безпосередньо з вбудованих діаграм\nстатистика: поліпшений форматувальник інструментів - блоки інструментів тепер забезпечують явно через tooltip.valueFormatter",
+        "zh-cn": "统计修补:截至本星期一的每周返回范围\n统计:为直接从内建图表生成统计模板提供更多支持\n统计:改进后的工具提示用于物质-工具提示单位现在通过工具提示明确提供. valueFormatter"
+      },
       "2.4.4": {
         "en": "statistics fix: add error handling for waitForValue function",
         "de": "statistik fix: Fehlerbehandlung für waitForValue-Funktion hinzufügen",
@@ -80,19 +93,6 @@
         "pl": "aktualizacje zależności i konfiguracji\nnowość \"inverter.x.derived.alarmsJSON\": tablica json z alarmami intverter (id, name, level) [# 226] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 226)\ndata umieszczenia w wykazie\ndodać minimalną i maksymalną temperaturę dla baterii [# 236] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 236)",
         "uk": "оновлення залежності та конфігурації\nновий стан `inverter.x.derived.alarmsJSON` : json array with intverter тривоги (id, назва, рівень) [#226](https://github.com/bolliy/ioBroker.sun2000/products/226)\nadd ChargeDischargePower для батарей [#234](https://github.com/bolliy/ioBroker.sun2000/products/234)\nдодайте мінімальну і максимальну температуру для акумуляторних пакетів [#236](https://github.com/bolliy/ioBroker.sun2000/products/236)",
         "zh-cn": "依赖和配置更新\nnew state `inverter.x. inducted.alarmsJSON ' : json 数组带内置式警报器(id, name, level) [# 226] (https://github.com/bolliy/ioBroker.sun2000/issues/226) (中文(简体) )\n添加电池单位充电放电器[#234](https://github.com/bolliy/ioBroker.sun2000/issues/234)\n增加电池包的最低和最高温度[第236号](https://github.com/bolliy/ioBroker.sun2000/issues/236)"
-      },
-      "2.3.5": {
-        "en": "dependency and configuration updates\nBattery status check was suspended in inverter control [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: dynamic detection of sun2000 inverters and integration of devices such as sun2000\nallow Modbus ID 0 when using the sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "de": "abhängigkeits- und konfigurationsupdates\nDie Batteriestatusprüfung wurde in der Wechselrichtersteuerung [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220) ausgesetzt\nEmma: dynamische Erkennung von Wechselrichtern von Sun2000 und Integration von Geräten wie sun2000\nerlauben Sie Modbus ID 0 bei Verwendung des sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "ru": "обновления зависимостей и конфигурации\nПроверка состояния батареи была приостановлена в инверторном управлении [#220] (https://github.com/bolliy/ioBroker.sun2000/issues/220)\nЭмма: динамическое обнаружение инверторов Sun2000 и интеграция таких устройств, как Sun2000\nразрешить Modbus ID 0 при использовании sDongle [#218] (https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "pt": "atualizações de dependência e configuração\nA verificação do estado da bateria foi suspensa no controle do inversor [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: detecção dinâmica de inversores sun2000 e integração de dispositivos como sun2000\npermitir Modbus ID 0 ao usar o sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "nl": "afhankelijkheid en configuratie-updates\nDe controle van de status van de batterij werd opgeschort bij controle van de inverter [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: dynamische detectie van zonne2000 omvormers en integratie van apparaten zoals sun2000\nmodbus ID 0 toestaan bij gebruik van sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "fr": "mises à jour de la dépendance et de la configuration\nLe contrôle de l'état de la batterie a été suspendu dans le contrôle de l'onduleur [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma : détection dynamique des onduleurs Sun2000 et intégration de dispositifs tels que Sun2000\npermettre Modbus ID 0 lors de l'utilisation de sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "it": "aggiornamenti di dipendenza e configurazione\nIl controllo dello stato della batteria è stato sospeso nel controllo dell'inverter [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: rilevazione dinamica degli inverter Sun2000 e integrazione di dispositivi come sun2000\nconsentire Modbus ID 0 quando si utilizza lo sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "es": "actualizaciones de dependencia y configuración\nSe suspendió el control del estado de la batería [#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\nEmma: detección dinámica de inversores de sol2000 e integración de dispositivos como el sol2000\npermitir Modbus ID 0 al utilizar el sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "pl": "aktualizacje zależności i konfiguracji\nKontrola stanu baterii została zawieszona w kontrolach inwertera [# 220] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 220)\nEmma: dynamiczna detekcja inwerterów sun2000 i integracja urządzeń takich jak sun2000\nw przypadku stosowania sDongle [# 218] (https: / / github.com / bolliy / ioBroker.sun2000 / issues / 118)",
-        "uk": "оновлення залежності та конфігурації\nПеревірка стану акумулятора була припинена в інверторному режимі [#220] (https://github.com/bolliy/ioBroker.sun2000/issues/220)\nЕмма: динамічне виявлення інверторів сонця2000 та інтеграції пристроїв, таких як сонце2000\nдозволити Modbus ID 0 при використанні sDongle [#218](https://github.com/bolliy/ioBroker.sun2000/issues/118)",
-        "zh-cn": "依赖和配置更新\n在反转控制中暂停了电池状态检查[#220](https://github.com/bolliy/ioBroker.sun2000/issues/220)\n艾玛:对太阳2000反转器的动态检测和太阳2000等设备的集成\n允许在使用 sDongle [# 218] 时使用 Modbus ID (https:// github.com/ bolliy/ioBroker.sun2000/issues/118) "
       }
     },
     "titleLang": {

package/lib/json_helper.js

@@ -0,0 +1,148 @@
+'use strict';
+
+/**
+ * Serializes an object to JSON, converting functions to their string representation.
+ *
+ * @param {any} obj - The object to serialize.
+ * @returns {string} JSON string where functions are represented as strings.
+ */
+function stringifyWithFunctions(obj) {
+	return JSON.stringify(
+		obj,
+		(key, value) => {
+			if (typeof value === 'function') {
+				return value.toString();
+			}
+
+			if (value === undefined) {
+				return null;
+			}
+			return value;
+		},
+		2,
+	);
+}
+/*
+const FUNCTION_KEYS = ['formatter', 'render', 'parser'];
+
+function reviveFunctions(obj, key = '') {
+	if (typeof obj === 'string' && FUNCTION_KEYS.includes(key)) {
+		const str = obj.trim();
+
+		try {
+			return new Function(`return (${str})`)();
+		} catch {
+			return obj;
+		}
+	}
+
+	if (typeof obj === 'object' && obj !== null) {
+		for (const k in obj) {
+			obj[k] = reviveFunctions(obj[k], k);
+		}
+	}
+
+	return obj;
+}
+*/
+const FUNCTION_KEYS = ['formatter', 'parser', 'render', 'labelFormatter', 'valueFormatter', 'position'];
+
+function reviveFunctions(obj, key = '') {
+	if (typeof obj === 'string' && FUNCTION_KEYS.includes(key)) {
+		const str = obj.trim();
+
+		// Arrow Function erkennen
+		if (str.includes('=>')) {
+			try {
+				return new Function(`return (${str})`)();
+			} catch {
+				return obj;
+			}
+		}
+
+		// klassische function() {} erkennen
+		if (str.startsWith('function')) {
+			try {
+				return new Function(`return (${str})`)();
+			} catch {
+				return obj;
+			}
+		}
+	}
+
+	if (typeof obj === 'object' && obj !== null) {
+		for (const key in obj) {
+			obj[key] = reviveFunctions(obj[key], key);
+		}
+	}
+
+	return obj;
+}
+
+/**
+ * Deeply merges source object properties into the target object.
+ *
+ * @param {object} target - The target object to merge into.
+ * @param {object} source - The source object whose properties are merged.
+ * @returns {object} The merged target object.
+ */
+function deepMerge(target, source) {
+	for (const key of Object.keys(source)) {
+		if (
+			source[key] !== null &&
+			typeof source[key] === 'object' &&
+			!Array.isArray(source[key]) &&
+			target[key] !== null &&
+			typeof target[key] === 'object' &&
+			!Array.isArray(target[key])
+		) {
+			deepMerge(target[key], source[key]);
+		} else {
+			target[key] = source[key];
+		}
+	}
+	return target;
+}
+
+/**
+ * Sets a value on an object using a dot‑separated path, creating intermediate objects as needed.
+ *
+ * @param {object} obj - The object to modify.
+ * @param {string} path - Dot‑separated path (e.g., "a.b.c").
+ * @param {any} value - The value to set at the specified path.
+ */
+function setByPath(obj, path, value) {
+	const keys = path.split('.');
+	let current = obj;
+
+	while (keys.length > 1) {
+		const key = keys.shift();
+
+		if (!(key in current)) {
+			current[key] = {};
+		}
+
+		current = current[key];
+	}
+
+	current[keys[0]] = value;
+}
+
+/**
+ * Applies a set of overrides to a target object based on dot‑separated paths.
+ *
+ * @param {object} target - The target object to which overrides are applied.
+ * @param {object} overrides - An object whose keys are dot‑separated paths and values are the overrides.
+ */
+function applyOverrides(target, overrides) {
+	for (const path in overrides) {
+		setByPath(target, path, overrides[path]);
+	}
+}
+
+module.exports = {
+	stringifyWithFunctions,
+	reviveFunctions,
+	deepMerge,
+	applyOverrides,
+};

package/lib/statistics.js

@@ -18,6 +18,7 @@ in ioBroker VIS using the ioBroker.flexcharts adapter.
 const stringify = require('javascript-stringify').stringify;
 const { dataRefreshRate, statisticsType } = require(`${__dirname}/types.js`);
 const tools = require(`${__dirname}/tools.js`);
+const { stringifyWithFunctions, reviveFunctions } = require(`${__dirname}/json_helper.js`);
 
 class statistics {
 	constructor(adapterInstance, stateCache) {
@@ -511,109 +512,6 @@ class statistics {
 			this.adapter.logger.warn(`Error during ${periodType} aggregation: ${err.message}`);
 		}
 	}
-	// eslint-disable-next-line jsdoc/require-returns-check
-	/**
-	 * Calculates and aggregates consumption statistics based on the given parameters.
-	 *
-	 * @param {string} sourceStateId
-	 * @param {string} targetStateId
-	 * @param {Function} getWindow
-	 * @param {string} periodType
-	 * @returns {boolean} true if a new entry was appended, false otherwise.
-	 */
-	_calculateAggregation_old(sourceStateId, targetStateId, getWindow, periodType) {
-		try {
-			const now = new Date();
-			const window = getWindow(now);
-			const fromDate = window.from;
-			const toDate = window.to;
-			if (now < toDate) {
-				this.adapter.logger.debug(`statistics.js: Skipping ${periodType} aggregation because current time is before end of aggregation window`);
-				return false;
-			}
-			const toStr = this._localIsoWithOffset(toDate);
-			//const fromStr = this._localIsoWithOffset(fromDate);
-
-			let jsonTarget = this.stateCache.get(targetStateId)?.value ?? '[]';
-			let targetArray = [];
-			try {
-				targetArray = JSON.parse(jsonTarget);
-				if (!Array.isArray(targetArray)) targetArray = [];
-			} catch {
-				targetArray = [];
-			}
-
-			const last = targetArray.length > 0 ? targetArray[targetArray.length - 1] : {};
-
-			if (last.to === toStr) return false;
-
-			const target = {
-				from: this._localIsoWithOffset(fromDate),
-				to: toStr,
-			};
-
-			let jsonStr = this.stateCache.get(sourceStateId)?.value ?? '[]';
-			let sourceEntries = [];
-			try {
-				sourceEntries = JSON.parse(jsonStr);
-				if (!Array.isArray(sourceEntries)) sourceEntries = [];
-			} catch {
-				sourceEntries = [];
-			}
-
-			sourceEntries = sourceEntries.filter(item => {
-				const ts = Date.parse(item.from);
-				return !Number.isNaN(ts) && ts >= fromDate.getTime() && ts < toDate.getTime();
-			});
-
-			if (sourceEntries.length > 0) {
-				this.adapter.logger.debug(
-					`statistics.js: Found ${sourceEntries.length} source entries for ${periodType} aggregation between ${fromDate.toISOString()} and ${toDate.toISOString()}`,
-				);
-
-				// First pass: sum delta/deltaReset stats
-				for (const stat of this.stats) {
-					if (stat.type === statisticsType.level) continue;
-					if (stat.type === statisticsType.computed) continue;
-
-					let sum = 0;
-					try {
-						sourceEntries.forEach(entry => {
-							sum += Number(entry[stat.targetPath]?.['value'] ?? 0);
-						});
-					} catch (e) {
-						this.adapter.logger.warn(`statistics.js: Error during ${periodType} statistic aggregation: ${e.message}`);
-					}
-					sum = Math.round((Number(sum) + Number.EPSILON) * 1000) / 1000;
-					target[stat.targetPath] = { value: Number(sum.toFixed(3)), unit: stat.unit || 'kWh' };
-				}
-
-				// Second pass: compute derived stats from aggregated values
-				for (const stat of this.stats) {
-					if (stat.type !== statisticsType.computed) continue;
-					try {
-						const value = stat.compute(target);
-						target[stat.targetPath] = {
-							value: Number(Number(value).toFixed(3)),
-							unit: stat.unit || '%',
-						};
-					} catch (e) {
-						this.adapter.logger.warn(`statistics: error computing aggregated ${stat.targetPath}: ${e.message}`);
-						target[stat.targetPath] = { value: 0, unit: stat.unit || '%' };
-					}
-				}
-
-				targetArray.push(target);
-			}
-
-			targetArray.sort((a, b) => Date.parse(a.to) - Date.parse(b.to));
-			this.stateCache.set(targetStateId, JSON.stringify(targetArray), { type: 'string' });
-			this.adapter.logger.debug(`Appended ${periodType} statistic ${toStr}`);
-			return targetArray.length > 0;
-		} catch (err) {
-			this.adapter.logger.warn(`Error during ${periodType} aggregation: ${err.message}`);
-		}
-	}
 
 	/**
 	 * Updates the statistics.jsonToday state with the current live day values.
@@ -741,10 +639,12 @@ class statistics {
 				monday.setDate(now.getDate() - (now.getDay() || 7) + 1);
 				const prevMonday = new Date(monday);
 				prevMonday.setDate(monday.getDate() - 7);
+				/*
 				const nextMonday = new Date(monday);
 				nextMonday.setDate(monday.getDate() + 7);
+				*/
 				// Window: previous Monday → next Monday (covers both last and current week)
-				return { from: prevMonday, to: nextMonday };
+				return { from: prevMonday, to: monday };
 			},
 			'weekly',
 		);
@@ -1030,12 +930,23 @@ class statistics {
 			seriesData[`${stat.targetPath}Neg`] = negate(values);
 		}
 
+		// --- X-Axis label formatter (hourly only) ---
+		const xAxisFormatter = value => {
+			if (value.includes('|')) return value;
+			return value.split(' ')[1] ?? value;
+		};
+
 		// --- Tooltip formatter ---
 		const tooltipFormatter = params => {
 			if (!Array.isArray(params)) params = [params];
 			return params
 				.filter(p => p.seriesName !== 'DayBreak')
 				.map(p => {
+					if (typeof p.value === 'object') {
+						const val = p.value.value;
+						const unit = p.value.unit || 'kWh';
+						return `${p.marker}${p.seriesName}: <b>${val}${unit}</b>`;
+					}
 					const negatedSeries = ['Grid Export', 'Charge'];
 					const val = negatedSeries.includes(p.seriesName) ? Math.abs(p.value) : p.value;
 					const unit = ['SOC', 'Self-sufficiency', 'Self-consumption'].includes(p.seriesName) ? ' %' : ' kWh';
@@ -1051,20 +962,94 @@ class statistics {
 		const outputStateId = `statistics.flexCharts.jsonOutput.${myChart}`;
 
 		const templateStr = this.stateCache.get(templateStateId)?.value ?? '{}';
-		let chartStr = '{}';
+		let template = {}; //empty object as fallback if parsing fails or template is empty
+		let command = '';
 
 		try {
 			const templ = JSON.parse(templateStr);
-			if (Object.keys(templ).length === 0) {
-				chartStr = this._buildDefaultChart(myChart, chartStyle, xAxisData, xAxisDataShort, dayAreas, seriesData);
+			command = templ.command || '';
+			if (Object.keys(templ).length === 0 || command === 'createTemplateFromBuiltin') {
+				template = this._buildDefaultTemplate(myChart, chartStyle);
 			} else {
-				chartStr = stringify(templ);
+				delete templ._meta;
+				template = reviveFunctions(templ); // Functions in templates are stored as strings and need to be revived before usage
 			}
 		} catch (e) {
 			this.adapter.logger.warn(`statistics: invalid template for ${myChart}: ${e.message}`);
-			chartStr = this._buildDefaultChart(myChart, chartStyle, xAxisData, xAxisDataShort, dayAreas, seriesData);
+			template = this._buildDefaultTemplate(myChart, chartStyle);
+		}
+		// No-data hint — chart-type specific
+		const noDataHints = {
+			hourly: 'No data yet — first entry available after the next full hour.',
+			daily: 'No data yet — first entry available tomorrow after midnight.',
+			weekly: 'No data yet — first entry available after the current week ends.',
+			monthly: 'No data yet — first entry available after the current month ends.',
+			annual: 'No data yet — first entry available after the current year ends.',
+		};
+
+		const chart = {
+			...template,
+			series: [
+				...(template.series ?? []),
+				// Day-break areas (hourly only)
+				...(dayAreas.length > 0
+					? [
+							{
+								name: 'DayBreak',
+								type: 'bar',
+								barWidth: 0,
+								data: [],
+								legendHoverLink: false,
+								silent: true,
+								markArea: {
+									silent: true,
+									data: dayAreas,
+								},
+							},
+						]
+					: []),
+			],
+			// No-data graphic — shown only when data is empty
+			graphic:
+				xAxisData.length === 0
+					? [
+							{
+								type: 'text',
+								left: 'center',
+								top: 'middle',
+								style: {
+									text: noDataHints[myChart] || 'No data available yet.',
+									fontSize: 14,
+									fill: '#999',
+								},
+							},
+						]
+					: [],
+		};
+
+		// --- Slider start position — show recent entries by default ---
+		// For hourly: show last 25 entries (~1 day)
+		// For daily: show last 7 entries (~1 week)
+		// For weekly: show last 8 entries (~2 months)
+		// For monthly: show last 13 entries (~1 year)
+		// For annual: show full range
+		const sliderDefaults = {
+			hourly: { start: Math.max(0, Math.round((1 - 25 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
+			daily: { start: Math.max(0, Math.round((1 - 7 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
+			weekly: { start: Math.max(0, Math.round((1 - 8 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
+			monthly: { start: Math.max(0, Math.round((1 - 13 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
+			annual: { start: 0, end: 100 },
+		};
+		const slider = sliderDefaults[myChart] ?? { start: 0, end: 100 };
+
+		// If template has a dataZoom component without start/end, apply defaults
+		if (chart?.dataZoom?.[0] && !chart.dataZoom[0].start && !chart.dataZoom[0].end) {
+			chart.dataZoom[0].start = slider.start;
+			chart.dataZoom[0].end = slider.end;
 		}
 
+		let chartStr = stringify(chart);
+
 		// --- Replace placeholders ---
 		chartStr = chartStr
 			.replace("'%%xAxisData%%'", JSON.stringify(xAxisData))
@@ -1072,6 +1057,7 @@ class statistics {
 			.replace("'%%xAxisMax%%'", String(xAxisData.length - 1))
 			.replace("'%%chartTitle%%'", JSON.stringify(`PV Statistics — ${myChart}`))
 			.replace("'%%dayAreas%%'", JSON.stringify(dayAreas))
+			.replace("'%%xAxisFormatter%%'", stringify(xAxisFormatter))
 			.replace("'%%tooltipFormatter%%'", stringify(tooltipFormatter));
 
 		// All this.stats entries dynamically — both positive and negated
@@ -1082,7 +1068,17 @@ class statistics {
 
 		this.stateCache.set(outputStateId, chartStr, { type: 'string' });
 		this.adapter.logger.debug(`statistics: flexCharts built for ${myChart}/${chartStyle}`);
-
+		if (command === 'createTemplateFromBuiltin') {
+			this.adapter.logger.debug(`statistics: created new template for ${myChart} based on built-in`);
+			template = {
+				_meta: {
+					generatedFrom: 'builtin',
+					generatedAt: new Date().toISOString(),
+				},
+				...template,
+			};
+			this.stateCache.set(templateStateId, stringifyWithFunctions(template), { type: 'string' }); // Store the final chart configuration back in the template state for persistence and debugging
+		}
 		return chartStr;
 	}
 
@@ -1091,69 +1087,20 @@ class statistics {
 	 * Used when no template is provided.
 	 * @param myChart
 	 * @param chartStyle
-	 * @param xAxisData
-	 * @param xAxisDataShort
-	 * @param dayAreas
-	 * @param seriesData
 	 */
-	_buildDefaultChart(myChart, chartStyle, xAxisData, xAxisDataShort, dayAreas, seriesData) {
-		const xAxisFormatterHourly = value => {
-			if (value.includes('|')) return value;
-			return value.split(' ')[1] ?? value;
-		};
-
+	_buildDefaultTemplate(myChart, chartStyle) {
 		const seriesType = chartStyle === 'line' ? 'line' : 'bar';
 		const lineOptions =
 			chartStyle === 'line' ? { smooth: true, symbol: 'circle', symbolSize: 4, lineStyle: { width: 2 }, areaStyle: { opacity: 0.15 } } : {};
 
-		const negate = arr => arr.map(v => Number((-v).toFixed(3)));
 		const showSOC = myChart === 'hourly';
 
-		// No-data hint — chart-type specific
-		const noDataHints = {
-			hourly: 'No data yet — first entry available after the next full hour.',
-			daily: 'No data yet — first entry available tomorrow after midnight.',
-			weekly: 'No data yet — first entry available after the current week ends.',
-			monthly: 'No data yet — first entry available after the current month ends.',
-			annual: 'No data yet — first entry available after the current year ends.',
-		};
-
-		const tooltipFormatter = params => {
-			if (!Array.isArray(params)) params = [params];
-			return params
-				.filter(p => p.seriesName !== 'DayBreak')
-				.map(p => {
-					const negatedSeries = ['Grid Export', 'Charge'];
-					const val = negatedSeries.includes(p.seriesName) ? Math.abs(p.value) : p.value;
-					const unit = ['SOC', 'Self-sufficiency', 'Self-consumption'].includes(p.seriesName) ? ' %' : ' kWh';
-					const seriesName =
-						myChart === 'hourly' && ['Self-sufficiency', 'Self-consumption'].includes(p.seriesName) ? `${p.seriesName} today` : p.seriesName;
-					return `${p.marker}${seriesName}: <b>${val}${unit}</b>`;
-				})
-				.join('<br/>');
-		};
-
-		// --- Slider start position — show recent entries by default ---
-		// For hourly: show last 25 entries (~1 day)
-		// For daily: show last 7 entries (~1 week)
-		// For weekly: show last 8 entries (~2 months)
-		// For monthly: show last 13 entries (~1 year)
-		// For annual: show full range
-		const sliderDefaults = {
-			hourly: { start: Math.max(0, Math.round((1 - 25 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
-			daily: { start: Math.max(0, Math.round((1 - 7 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
-			weekly: { start: Math.max(0, Math.round((1 - 8 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
-			monthly: { start: Math.max(0, Math.round((1 - 13 / Math.max(xAxisData.length, 1)) * 100)), end: 100 },
-			annual: { start: 0, end: 100 },
-		};
-		const slider = sliderDefaults[myChart] ?? { start: 0, end: 100 };
-
-		const chart = {
+		const template = {
 			backgroundColor: '#fff',
 			animation: false,
 			title: {
 				left: 'center',
-				text: `SUN2000 - PV Statistics - ${myChart}`,
+				text: '%%chartTitle%%',
 			},
 			legend: {
 				top: 35,
@@ -1197,22 +1144,6 @@ class statistics {
 					saveAsImage: { show: true },
 				},
 			},
-			// No-data graphic — shown only when data is empty
-			graphic:
-				xAxisData.length === 0
-					? [
-							{
-								type: 'text',
-								left: 'center',
-								top: 'middle',
-								style: {
-									text: noDataHints[myChart] || 'No data available yet.',
-									fontSize: 14,
-									fill: '#999',
-								},
-							},
-						]
-					: [],
 			grid: [
 				{ left: '8%', right: showSOC ? '8%' : '4%', top: 80, height: '45%' },
 				{ left: '8%', right: showSOC ? '8%' : '4%', top: '72%', height: '15%' },
@@ -1220,25 +1151,36 @@ class statistics {
 			xAxis: [
 				{
 					type: 'category',
-					data: xAxisDataShort,
+					data: '%%xAxisDataShort%%',
 					scale: true,
 					boundaryGap: chartStyle !== 'line',
 					axisLine: { onZero: false },
 					splitLine: { show: false },
 					axisPointer: { z: 100 },
-					min: 0,
-					max: xAxisDataShort.length - 1,
 					axisLabel: {
 						interval: 0,
 						lineHeight: 16,
 						fontSize: 11,
 						formatter: '%%xAxisFormatter%%',
 					},
+					min: 0,
+					max: '%%xAxisMax%%',
+					/*
+					axisTick: { show: false },
+					gridIndex: 0,
+					splitNumber: 5,
+					name: myChart === 'hourly' ? 'Time' : 'Date',
+					nameLocation: 'middle',
+					nameGap: 30,
+					nameTextStyle: { fontSize: 12, fontWeight: 'bold' },
+					splitLine: { show: false },
+					axisLine: { show: true },
+					*/
 				},
 				{
 					type: 'category',
 					gridIndex: 1,
-					data: xAxisData,
+					data: '%%xAxisData%%',
 					scale: true,
 					boundaryGap: chartStyle !== 'line',
 					axisLine: { onZero: false },
@@ -1246,7 +1188,7 @@ class statistics {
 					splitLine: { show: false },
 					axisLabel: { show: false },
 					min: 0,
-					max: xAxisData.length - 1,
+					max: '%%xAxisMax%%',
 				},
 			],
 			yAxis: [
@@ -1291,16 +1233,12 @@ class statistics {
 				{
 					type: 'inside',
 					xAxisIndex: [0, 1],
-					start: slider.start,
-					end: slider.end,
 				},
 				{
 					show: true,
 					xAxisIndex: [0, 1],
 					type: 'slider',
 					bottom: 5,
-					start: slider.start,
-					end: slider.end,
 				},
 			],
 			series: [
@@ -1308,42 +1246,57 @@ class statistics {
 				{
 					name: 'Solar Yield',
 					type: seriesType,
-					data: seriesData.solarYield,
+					data: '%%solarYield%%',
 					itemStyle: { color: '#f6c94e' },
 					emphasis: { focus: 'series' },
+					tooltip: {
+						valueFormatter: value => ({ value: value, unit: 'kWh' }),
+					},
 					...lineOptions,
 				},
 				// Negative values (below zero line)
 				{
 					name: 'Grid Export',
 					type: seriesType,
-					data: negate(seriesData.gridExport),
+					data: '%%gridExportNeg%%',
 					itemStyle: { color: '#5cb85c' },
 					emphasis: { focus: 'series' },
+					tooltip: {
+						valueFormatter: value => ({ value: -value, unit: 'kWh' }),
+					},
 					...lineOptions,
 				},
 				{
 					name: 'Grid Import',
 					type: seriesType,
-					data: seriesData.gridImport,
+					data: '%%gridImport%%',
 					itemStyle: { color: '#ec0000' },
 					emphasis: { focus: 'series' },
+					tooltip: {
+						valueFormatter: value => ({ value: value, unit: 'kWh' }),
+					},
 					...lineOptions,
 				},
 				{
 					name: 'Charge',
 					type: seriesType,
-					data: negate(seriesData.chargeCapacity),
+					data: '%%chargeCapacityNeg%%',
 					itemStyle: { color: '#5bc0de' },
 					emphasis: { focus: 'series' },
+					tooltip: {
+						valueFormatter: value => ({ value: -value, unit: 'kWh' }),
+					},
 					...lineOptions,
 				},
 				{
 					name: 'Discharge',
 					type: seriesType,
-					data: seriesData.dischargeCapacity,
+					data: '%%dischargeCapacity%%',
 					itemStyle: { color: '#ed50e0' },
 					emphasis: { focus: 'series' },
+					tooltip: {
+						valueFormatter: value => ({ value: value, unit: 'kWh' }),
+					},
 					...lineOptions,
 				},
 				// SOC — hourly only, on right axis
@@ -1353,11 +1306,14 @@ class statistics {
 								name: 'SOC',
 								type: 'line',
 								yAxisIndex: 1,
-								data: seriesData.SOC,
+								data: '%%SOC%%',
 								itemStyle: { color: '#985e24' },
 								lineStyle: { width: 2, type: 'dashed' },
 								symbol: 'none',
 								smooth: true,
+								tooltip: {
+									valueFormatter: value => ({ value: value, unit: '%' }),
+								},
 							},
 						]
 					: []),
@@ -1366,76 +1322,53 @@ class statistics {
 					name: 'Self-sufficiency',
 					type: 'line',
 					yAxisIndex: 1,
-					data: seriesData.selfSufficiency,
+					data: '%%selfSufficiency%%',
 					itemStyle: { color: '#9c27b0' },
 					lineStyle: { width: 2, type: 'dashed' },
 					symbol: 'circle',
 					symbolSize: 4,
 					smooth: true,
+					tooltip: {
+						valueFormatter: value => ({ value: value, unit: '%' }),
+					},
 				},
 				// Self-consumption — right axis
 				{
 					name: 'Self-consumption',
 					type: 'line',
 					yAxisIndex: 1,
-					data: seriesData.selfConsumption,
+					data: '%%selfConsumption%%',
 					itemStyle: { color: '#ff9800' },
 					lineStyle: { width: 2, type: 'dashed' },
 					symbol: 'circle',
 					symbolSize: 4,
 					smooth: true,
+					tooltip: {
+						valueFormatter: value => ({ value: value, unit: '%' }),
+					},
 				},
 				// Consumption in lower grid — always yAxisIndex 2
 				{
 					name: 'Consumption',
 					type: seriesType,
-					data: seriesData.consumption,
+					data: '%%consumption%%',
 					itemStyle: { color: '#337ab7' },
 					xAxisIndex: 1,
 					yAxisIndex: 2,
+					/*
+					emphasis: {
+						focus: 'series',
+					},
+					*/
+					tooltip: {
+						valueFormatter: value => ({ value: value, unit: 'kWh' }),
+					},
 					...lineOptions,
 				},
-				// Day-break areas (hourly only)
-				...(dayAreas.length > 0
-					? [
-							{
-								name: 'DayBreak',
-								type: 'bar',
-								barWidth: 0,
-								data: [],
-								legendHoverLink: false,
-								silent: true,
-								markArea: { silent: true, data: dayAreas },
-							},
-						]
-					: []),
 			],
 		};
 
-		return stringify(chart).replace("'%%xAxisFormatter%%'", stringify(xAxisFormatterHourly)).replace("'%%tooltipFormatter%%'", stringify(tooltipFormatter));
-	}
-
-	/**
-	 * Merges two objects deeply.
-	 * @param target
-	 * @param source
-	 */
-	_deepMerge(target, source) {
-		for (const key of Object.keys(source)) {
-			if (
-				source[key] !== null &&
-				typeof source[key] === 'object' &&
-				!Array.isArray(source[key]) &&
-				target[key] !== null &&
-				typeof target[key] === 'object' &&
-				!Array.isArray(target[key])
-			) {
-				this._deepMerge(target[key], source[key]);
-			} else {
-				target[key] = source[key];
-			}
-		}
-		return target;
+		return template; //as object, not stringified, since we use reviveFunctions to restore the functions after stringification in the state
 	}
 
 	/**
@@ -1453,8 +1386,10 @@ class statistics {
 		if (state?.val != null) {
 			this.adapter.logger.debug(`statistics: Event - state: ${chartType} changed: ${state.val} ack: ${state.ack}`);
 			this.stateCache.set(templateStateId, state.val, { type: 'string', stored: true });
-			await this.adapter.setState(templateStateId, { val: state.val, ack: true });
+			//await this.adapter.setState(templateStateId, { val: state.val, ack: true });
 			this._buildFlexchart(chartType);
+			await this.adapter.setState(templateStateId, { val: this.stateCache.get(templateStateId)?.value, ack: true });
+			//this.stateCache.set(templateStateId, this.stateCache.get(templateStateId), { type: 'string', renew: true });
 		}
 	}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.sun2000",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "sun2000",
   "author": {
     "name": "bolliy",