From 403a7151c1c4848920b4823b44ccffc335429008 Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Fri, 7 Mar 2025 19:48:53 +0000
Subject: [PATCH] 76_SolarForecast: version 1.47.1

git-svn-id: https://svn.fhem.de/fhem/trunk@29734 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED                  |  1 +
 fhem/FHEM/76_SolarForecast.pm | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index c81bc8d2d..63cd8fc4b 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it
+ - feature: 76_SolarForecast: version 1.47.1
  - bugfix:  98_vitoconnect: Adapt schedule data before sending
  - feature: 76_SolarForecast: Major release 1.47.0
  - feature: 76_SolarForecast: new spec. Reading key todayConsumptionForecastDay
diff --git a/fhem/FHEM/76_SolarForecast.pm b/fhem/FHEM/76_SolarForecast.pm
index 9628246f4..302305df9 100644
--- a/fhem/FHEM/76_SolarForecast.pm
+++ b/fhem/FHEM/76_SolarForecast.pm
@@ -160,6 +160,7 @@ BEGIN {
 
 # Versions History intern
 my %vNotesIntern = (
+  "1.47.1" => "07.03.2025  __substituteIcon: consider Tooltip content if ctrlBatSocManagementXX is set ",
   "1.47.0" => "05.03.2025  aiInit: change AI init sequence, use Random Forest with Ensemble algorithm, use Scalar::Util ".
                            "_beamGraphic.*: change decimal places für battery SoC, set aiDecTree: change addInstances to addInstAndTrain ".
                            "addInstAndTrain is generally executed non-blocking, _batChargeRecmd: use effective surplus for soc forecast, ".
@@ -15630,15 +15631,15 @@ sub __batteryOnBeam {
           }
 
           my ($bicon, $title) = __substituteIcon ( { name  => $name,                                  # Icon / Status des Batterie Devices
-                                                      pn    => $bn,
-                                                      ptyp  => 'battery',
-                                                      flag  => $hfcg->{$i}{'rcdchargebat'.$bn},
-                                                      msg1  => $balias,
-                                                      soc   => $soc,
-                                                      pcurr => $bpower,
-                                                      lang  => $lang
-                                                    }
-                                                  );
+                                                     pn    => $bn,
+                                                     ptyp  => 'battery',
+                                                     flag  => $hfcg->{$i}{'rcdchargebat'.$bn},
+                                                     msg1  => $balias,
+                                                     soc   => $soc,
+                                                     pcurr => $bpower,
+                                                     lang  => $lang
+                                                   }
+                                                 );
 
           $title   .= defined $currsoc ? "\n".$htitles{socbacur}{$lang}.": ".$currsoc." %" : '';
           my $image = defined $hfcg->{$i}{'rcdchargebat'.$bn} ? FW_makeImage ($bicon) : '';
@@ -16420,6 +16421,8 @@ sub __substituteIcon {
       $inorcmd  = $inorcmd  ? $inorcmd  : '';
       $icharge  = $icharge  ? $icharge  : '';
       $idischrg = $idischrg ? $idischrg : '';
+      
+      my $cgbt = AttrVal ($name, 'ctrlBatSocManagement'.$pn, '');
 
       if (defined $flag) {                                                               # Empfehlungszeitraum
           if ($flag) {                                                                   # Ladefreigabe
@@ -16434,7 +16437,7 @@ sub __substituteIcon {
                   $pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1";
               }
               else {                                                                     # prognostizierte Ladefreigabe
-                  $pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1\n".$htitles{bcharrel}{$lang};
+                  $pretxt = $htitles{onlybatw}{$lang}." $pn: $msg1".($cgbt ? "\n".$htitles{bcharrel}{$lang} : '');
               }
           }
           else {                                                                         # keine Ladefreigabe
@@ -16444,7 +16447,7 @@ sub __substituteIcon {
                                 BICONDEF;                                                # nur Farbe angegeben
 
               $color  //= BICCOLNRCDDEF;
-              $pretxt   = $htitles{onlybatw}{$lang}." $pn: $msg1\n".$htitles{bncharel}{$lang};
+              $pretxt   = $htitles{onlybatw}{$lang}." $pn: $msg1\n".($cgbt ? "\n".$htitles{bncharel}{$lang} : '');
           }
       }