From 005856c30b24081a295537079e7818dc71bea147 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Mon, 13 May 2024 21:24:33 +0000 Subject: [PATCH] 76_SolarForecast: graphicBeamXContent: gridfeedin available, beamGraphic: Mouse-Over shows beamcontent text git-svn-id: https://svn.fhem.de/fhem/trunk@28873 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/76_SolarForecast.pm | 37 ++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/fhem/FHEM/76_SolarForecast.pm b/fhem/FHEM/76_SolarForecast.pm index 74f85b718..b1e3ae37c 100644 --- a/fhem/FHEM/76_SolarForecast.pm +++ b/fhem/FHEM/76_SolarForecast.pm @@ -12544,6 +12544,7 @@ sub _beamGraphicFirstHour { my $beam1cont = $paref->{beam1cont}; my $beam2cont = $paref->{beam2cont}; my $lang = $paref->{lang}; + my $kw = $paref->{kw}; my $day; @@ -12613,26 +12614,26 @@ sub _beamGraphicFirstHour { $hfcg->{0}{beam2} //= 0; $hfcg->{0}{diff} = $hfcg->{0}{beam1} - $hfcg->{0}{beam2}; - my $epc = '('.CurrentVal ($hash, 'ePurchasePriceCcy', 0).')'; - my $efc = '('.CurrentVal ($hash, 'eFeedInTariffCcy', 0).')'; + my $epc = CurrentVal ($hash, 'ePurchasePriceCcy', 0); + my $efc = CurrentVal ($hash, 'eFeedInTariffCcy', 0); - $hfcg->{0}{beam1txt} = ($beam1cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang} : - ($beam1cont eq 'pvReal') ? $htitles{pvgenerl}{$lang} : - ($beam1cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang} : - ($beam1cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang} : - ($beam1cont eq 'consumption') ? $htitles{enconsrl}{$lang} : - ($beam1cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." $epc" : - ($beam1cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang} : - ($beam1cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." $efc" : + $hfcg->{0}{beam1txt} = ($beam1cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang}." ($kw)" : + ($beam1cont eq 'pvReal') ? $htitles{pvgenerl}{$lang}." ($kw)" : + ($beam1cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang}." ($kw)" : + ($beam1cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang}." ($kw)" : + ($beam1cont eq 'consumption') ? $htitles{enconsrl}{$lang}." ($kw)" : + ($beam1cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." ($epc)" : + ($beam1cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang}." ($kw)" : + ($beam1cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." ($efc)" : ''; - $hfcg->{0}{beam2txt} = ($beam2cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang} : - ($beam2cont eq 'pvReal') ? $htitles{pvgenerl}{$lang} : - ($beam2cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang} : - ($beam2cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang} : - ($beam2cont eq 'consumption') ? $htitles{enconsrl}{$lang} : - ($beam2cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." $epc" : - ($beam2cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang} : - ($beam2cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." $efc" : + $hfcg->{0}{beam2txt} = ($beam2cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang}." ($kw)" : + ($beam2cont eq 'pvReal') ? $htitles{pvgenerl}{$lang}." ($kw)" : + ($beam2cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang}." ($kw)" : + ($beam2cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang}." ($kw)" : + ($beam2cont eq 'consumption') ? $htitles{enconsrl}{$lang}." ($kw)" : + ($beam2cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." ($epc)" : + ($beam2cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang}." ($kw)" : + ($beam2cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." ($efc)" : ''; return $thishour;