iobroker.pv-notifications 1.2.11 → 1.2.12

package/admin/i18n/de/translations.json

@@ -88,5 +88,7 @@
     "label_testButton": "Test-Benachrichtigung",
     "buttonText_testButton": "Test senden",
     "tooltip_testButton": "Sendet eine Test-Benachrichtigung an alle konfigurierten Telegram-Benutzer",
-    "Test Notification": "Test-Benachrichtigung"
+    "Test Notification": "Test-Benachrichtigung",
+    "Production today": "Produktion heute",
+    "Current production": "Aktuelle Produktion"
 }

package/admin/i18n/en/translations.json

@@ -88,5 +88,7 @@
     "label_testButton": "Test Notification",
     "buttonText_testButton": "Send Test",
     "tooltip_testButton": "Sends a test notification to all configured Telegram users",
-    "Test Notification": "Test Notification"
+    "Test Notification": "Test Notification",
+    "Production today": "Production today",
+    "Current production": "Current production"
 }

package/admin/i18n/es/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "Notificación de Prueba",
     "buttonText_testButton": "Enviar Prueba",
     "tooltip_testButton": "Envía una notificación de prueba a todos los usuarios de Telegram configurados",
-    "Test Notification": "Notificación de Prueba"
+    "Test Notification": "Notificación de Prueba",
+    "Production today": "Producción hoy",
+    "Current production": "Producción actual"
 }

package/admin/i18n/fr/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "Notification de Test",
     "buttonText_testButton": "Envoyer Test",
     "tooltip_testButton": "Envoie une notification de test à tous les utilisateurs Telegram configurés",
-    "Test Notification": "Notification de Test"
+    "Test Notification": "Notification de Test",
+    "Production today": "Production aujourd'hui",
+    "Current production": "Production actuelle"
 }

package/admin/i18n/it/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "Notifica di Test",
     "buttonText_testButton": "Invia Test",
     "tooltip_testButton": "Invia una notifica di test a tutti gli utenti Telegram configurati",
-    "Test Notification": "Notifica di Test"
+    "Test Notification": "Notifica di Test",
+    "Production today": "Produzione oggi",
+    "Current production": "Produzione attuale"
 }

package/admin/i18n/nl/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "Testmelding",
     "buttonText_testButton": "Verstuur Test",
     "tooltip_testButton": "Verstuurt een testmelding naar alle geconfigureerde Telegram-gebruikers",
-    "Test Notification": "Testmelding"
+    "Test Notification": "Testmelding",
+    "Production today": "Productie vandaag",
+    "Current production": "Huidige productie"
 }

package/admin/i18n/pl/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "Powiadomienie Testowe",
     "buttonText_testButton": "Wyślij Test",
     "tooltip_testButton": "Wysyła powiadomienie testowe do wszystkich skonfigurowanych użytkowników Telegram",
-    "Test Notification": "Powiadomienie Testowe"
+    "Test Notification": "Powiadomienie Testowe",
+    "Production today": "Produkcja dzisiaj",
+    "Current production": "Aktualna produkcja"
 }

package/admin/i18n/pt/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "Notificação de Teste",
     "buttonText_testButton": "Enviar Teste",
     "tooltip_testButton": "Envia uma notificação de teste para todos os usuários do Telegram configurados",
-    "Test Notification": "Notificação de Teste"
+    "Test Notification": "Notificação de Teste",
+    "Production today": "Produção hoje",
+    "Current production": "Produção atual"
 }

package/admin/i18n/ru/translations.json

@@ -88,5 +88,7 @@
     "label_testButton": "Тестовое уведомление",
     "buttonText_testButton": "Отправить тест",
     "tooltip_testButton": "Отправляет тестовое уведомление всем настроенным пользователям Telegram",
-    "Test Notification": "Тестовое уведомление"
+    "Test Notification": "Тестовое уведомление",
+    "Production today": "Выработка сегодня",
+    "Current production": "Текущая мощность"
 }

package/admin/i18n/uk/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "Тестове Сповіщення",
     "buttonText_testButton": "Надіслати Тест",
     "tooltip_testButton": "Надсилає тестове сповіщення всім налаштованим користувачам Telegram",
-    "Test Notification": "Тестове Сповіщення"
+    "Test Notification": "Тестове Сповіщення",
+    "Production today": "Виробництво сьогодні",
+    "Current production": "Поточне виробництво"
 }

package/admin/i18n/zh-cn/translations.json

@@ -82,5 +82,7 @@
     "label_testButton": "测试通知",
     "buttonText_testButton": "发送测试",
     "tooltip_testButton": "向所有配置的 Telegram 用户发送测试通知",
-    "Test Notification": "测试通知"
+    "Test Notification": "测试通知",
+    "Production today": "今日发电量",
+    "Current production": "当前发电量"
 }

package/io-package.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "name": "pv-notifications",
-    "version": "1.2.11",
+    "version": "1.2.12",
     "titleLang": {
       "en": "PV Notifications",
       "de": "PV-Benachrichtigungen",
@@ -29,6 +29,19 @@
       "zh-cn": "发送 Telegram 通知用于 PV 电池状态"
     },
     "news": {
+      "1.2.12": {
+        "en": "Added current production (W) to test message, daily statistics and intermediate messages with improved layout",
+        "de": "Aktuelle Produktion (W) zu Test-Nachricht, Tagesstatistik und Zwischenmeldungen mit verbessertem Layout hinzugefügt",
+        "ru": "Добавлена текущая выработка (Вт) в тестовое сообщение, дневную статистику и промежуточные уведомления с улучшенным макетом",
+        "pt": "Adicionada produção atual (W) à mensagem de teste, estatísticas diárias e mensagens intermediárias com layout aprimorado",
+        "nl": "Huidige productie (W) toegevoegd aan testbericht, dagelijkse statistieken en intermediate-berichten met verbeterde lay-out",
+        "fr": "Ajout de la production actuelle (W) au message de test, statistiques quotidiennes et messages intermédiaires avec une mise en page améliorée",
+        "it": "Aggiunta produzione attuale (W) al messaggio di test, statistiche giornaliere e messaggi intermedi con layout migliorato",
+        "es": "Agregada producción actual (W) al mensaje de prueba, estadísticas diarias y mensajes intermedios con diseño mejorado",
+        "pl": "Dodano aktualną produkcję (W) do wiadomości testowej, statystyk dziennych i wiadomości pośrednich z ulepszonym układem",
+        "uk": "Додано поточне виробництво (Вт) до тестового повідомлення, денної статистики та проміжних повідомлень з покращеним макетом",
+        "zh-cn": "已添加当前发电量（W）到测试消息、每日统计和中间消息，并改进了布局"
+      },
       "1.2.11": {
         "en": "Fixed daily statistics: self-consumption cannot be negative (Math.max), added weather today to daily stats message",
         "de": "Tagesstatistik fixiert: Eigenverbrauch kann nicht negativ sein (Math.max), Wetter heute zur Tagesstatistik hinzugefügt",
@@ -106,19 +119,6 @@
         "pl": "Dodano atrybuty rozmiaru (xs, xl) dla pól monthlyStatsDay, monthlyStatsTime, weatherEnabled, weatherInIntermediate, weatherInDailyStats, highProduction, highConsumption (poprawka E5507)",
         "uk": "Додано атрибути розміру (xs, xl) для полів monthlyStatsDay, monthlyStatsTime, weatherEnabled, weatherInIntermediate, weatherInDailyStats, highProduction, highConsumption (виправлення E5507)",
         "zh-cn": "已为 monthlyStatsDay、monthlyStatsTime、weatherEnabled、weatherInIntermediate、weatherInDailyStats、highProduction、highConsumption 字段添加大小属性（xs, xl）（E5507 修复）"
-      },
-      "1.2.5": {
-        "en": "Added size attributes (xs, xl) for monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime fields (E5507 fix)",
-        "de": "Größenattribute (xs, xl) für monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime Felder hinzugefügt (E5507 Fix)",
-        "ru": "Добавлены атрибуты размеров (xs, xl) для полей monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime (исправление E5507)",
-        "pt": "Atributos de tamanho (xs, xl) adicionados para os campos monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime (correção E5507)",
-        "nl": "Grootte-attributen (xs, xl) toegevoegd voor monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime velden (E5507 fix)",
-        "fr": "Attributs de taille (xs, xl) ajoutés pour les champs monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime (correction E5507)",
-        "it": "Aggiunti attributi di dimensione (xs, xl) per i campi monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime (correzione E5507)",
-        "es": "Atributos de tamaño (xs, xl) agregados para los campos monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime (corrección E5507)",
-        "pl": "Dodano atrybuty rozmiaru (xs, xl) dla pól monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime (poprawka E5507)",
-        "uk": "Додано атрибути розміру (xs, xl) для полів monthlyStatsEnabled, minIntervalIntermediate, statsDayTime, statsWeekDay, statsWeekTime (виправлення E5507)",
-        "zh-cn": "已为 monthlyStatsEnabled、minIntervalIntermediate、statsDayTime、statsWeekDay、statsWeekTime 字段添加大小属性（xs, xl）（E5507 修复）"
       }
     },
     "authors": [

package/main.js

@@ -1072,6 +1072,16 @@ class PvNotifications extends utils.Adapter {
         const powerState = await this.getStateAsync('statistics.currentPower');
         const power = powerState && powerState.val !== null ? powerState.val : 0;
 
+        // Gesamtproduktion heute lesen
+        const totalProdState = await this.getStateAsync('statistics.currentTotalProduction');
+        const totalProd = totalProdState && totalProdState.val !== null ? this.round(totalProdState.val, 1) : 0;
+
+        // Eigenverbrauch berechnen
+        const feedInState = await this.getStateAsync('statistics.currentFeedIn');
+        const feedIn = feedInState && feedInState.val !== null ? Math.abs(feedInState.val) : 0;
+        const selfConsumption = this.round(Math.max(0, totalProd - feedIn), 1);
+        const selfConsumptionRate = totalProd > 0 ? this.round((selfConsumption / totalProd) * 100, 1) : 0;
+
         const trend = direction === 'up' ? '⬆️' : '⬇️';
         const currentKWh = this.round(((soc / 100) * this.config.batteryCapacityWh) / 1000, 1);
 
@@ -1088,10 +1098,16 @@ class PvNotifications extends utils.Adapter {
         // Einheitliche Nachricht für alle Stufen (20, 40, 60, 80)
         const batteryAt = this.translate('Battery at');
         const production = this.translate('Production');
+        const productionToday = this.translate('Production today');
+        const ownConsumption = this.translate('Own consumption');
 
         let message = `🔋 ${batteryAt} ${soc}% (${currentKWh} kWh) ${trend}
-⚡ ${production}: ${this.round(power)} W
-${statusText}`;
+${statusText}
+━━━━━━━━━━━━━━━━━━━━━━
+⚡️ ${production}: ${this.round(power)} W
+✅ ${productionToday}: ${totalProd} kWh
+🏠 ${ownConsumption}: ${selfConsumption} kWh (${selfConsumptionRate}%)
+━━━━━━━━━━━━━━━━━━━━━━`;
 
         // Wetter-Prognose für morgen hinzufügen (optional, nur wenn weatherInIntermediate aktiv)
         const weatherConfigured =
@@ -1205,6 +1221,10 @@ ${statusText}`;
         const gridPowerState = await this.getStateAsync('statistics.currentGridPower');
         const gridPower = gridPowerState && gridPowerState.val !== null ? this.round(gridPowerState.val, 0) : 0;
 
+        // Aktuelle Leistung (W) lesen
+        const powerState = await this.getStateAsync('statistics.currentPower');
+        const power = powerState && powerState.val !== null ? this.round(powerState.val, 0) : 0;
+
         // Eigenverbrauch berechnen (kann nicht negativ sein)
         const selfConsumption = this.round(Math.max(0, totalProd - feedIn), 1);
         const selfConsumptionRate = totalProd > 0 ? this.round((selfConsumption / totalProd) * 100, 1) : 0;
@@ -1215,6 +1235,7 @@ ${statusText}`;
 ⚡ ${this.translate('Current energy')}: ${currentKWh} kWh (${batteryCapacityKWh} kWh ${this.translate('Total capacity')})
 ━━━━━━━━━━━━━━━━━━━━━━
 ☀️ ${this.translate('Production')}: ${totalProd} kWh
+⚡️ ${this.translate('Current production')}: ${power} W
 🏠 ${this.translate('Own consumption')}: ${selfConsumption} kWh (${selfConsumptionRate}%)
 🔌 ${this.translate('Feed-in')}: ${feedIn} kWh
 ⚡ ${this.translate('Grid consumption')}: ${gridPower} kWh`;
@@ -1847,6 +1868,10 @@ ${statusText}`;
         const gridPowerState = await this.getStateAsync('statistics.currentGridPower');
         const gridPower = gridPowerState && gridPowerState.val !== null ? this.round(gridPowerState.val, 0) : 0;
 
+        // Aktuelle Leistung (W) lesen
+        const powerState = await this.getStateAsync('statistics.currentPower');
+        const power = powerState && powerState.val !== null ? this.round(powerState.val, 0) : 0;
+
         // Eigenverbrauch berechnen
         const selfConsumption = this.round(totalProd - feedIn, 1);
         const selfConsumptionRate = totalProd > 0 ? this.round((selfConsumption / totalProd) * 100, 1) : 0;
@@ -1857,6 +1882,7 @@ ${statusText}`;
 ⚡ ${this.translate('Current energy')}: ${currentKWh} kWh (${batteryCapacityKWh} kWh ${this.translate('Total capacity')})
 ━━━━━━━━━━━━━━━━━━━━━━
 ✅ ${this.translate('Production')}: ${totalProd} kWh
+⚡️ ${this.translate('Current production')}: ${power} W
 🏠 ${this.translate('Own consumption')}: ${selfConsumption} kWh (${selfConsumptionRate}%)
 🔌 ${this.translate('Feed-in')}: ${feedIn} kWh
 ⚡ ${this.translate('Grid consumption')}: ${gridPower} kWh

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iobroker.pv-notifications",
-  "version": "1.2.11",
+  "version": "1.2.12",
   "description": "PV-Anlage Batterie-Status Telegram Benachrichtigungen",
   "author": {
     "name": "Alex1808 via LLM: Qwen",