FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 16:05:19 +00:00
Code Issues Releases Wiki Activity

76_SolarForecast: graphicBeamXContent: gridfeedin available, beamGraphic: Mouse-Over shows beamcontent text

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28873 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2024-05-13 21:24:33 +00:00
parent bd6e5a7743
commit 005856c30b
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fhem/FHEM/76_SolarForecast.pm
View File

@ -12544,6 +12544,7 @@ sub _beamGraphicFirstHour {
my $beam1cont = $paref->{beam1cont}; my $beam1cont = $paref->{beam1cont};
my $beam2cont = $paref->{beam2cont}; my $beam2cont = $paref->{beam2cont};
my $lang = $paref->{lang}; my $lang = $paref->{lang};
my $kw = $paref->{kw};
my $day; my $day;
@ -12613,26 +12614,26 @@ sub _beamGraphicFirstHour {
$hfcg->{0}{beam2} //= 0; $hfcg->{0}{beam2} //= 0;
$hfcg->{0}{diff} = $hfcg->{0}{beam1} - $hfcg->{0}{beam2}; $hfcg->{0}{diff} = $hfcg->{0}{beam1} - $hfcg->{0}{beam2};
my $epc = '('.CurrentVal ($hash, 'ePurchasePriceCcy', 0).')'; my $epc = CurrentVal ($hash, 'ePurchasePriceCcy', 0);
my $efc = '('.CurrentVal ($hash, 'eFeedInTariffCcy', 0).')'; my $efc = CurrentVal ($hash, 'eFeedInTariffCcy', 0);
$hfcg->{0}{beam1txt} = ($beam1cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang} : $hfcg->{0}{beam1txt} = ($beam1cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang}." ($kw)" :
($beam1cont eq 'pvReal') ? $htitles{pvgenerl}{$lang} : ($beam1cont eq 'pvReal') ? $htitles{pvgenerl}{$lang}." ($kw)" :
($beam1cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang} : ($beam1cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang}." ($kw)" :
($beam1cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang} : ($beam1cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang}." ($kw)" :
($beam1cont eq 'consumption') ? $htitles{enconsrl}{$lang} : ($beam1cont eq 'consumption') ? $htitles{enconsrl}{$lang}." ($kw)" :
($beam1cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." $epc" : ($beam1cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." ($epc)" :
($beam1cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang} : ($beam1cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang}." ($kw)" :
($beam1cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." $efc" : ($beam1cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." ($efc)" :
''; '';
$hfcg->{0}{beam2txt} = ($beam2cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang} : $hfcg->{0}{beam2txt} = ($beam2cont eq 'pvForecast') ? $htitles{pvgenefc}{$lang}." ($kw)" :
($beam2cont eq 'pvReal') ? $htitles{pvgenerl}{$lang} : ($beam2cont eq 'pvReal') ? $htitles{pvgenerl}{$lang}." ($kw)" :
($beam2cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang} : ($beam2cont eq 'gridconsumption') ? $htitles{enppubgd}{$lang}." ($kw)" :
($beam2cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang} : ($beam2cont eq 'consumptionForecast') ? $htitles{enconsfc}{$lang}." ($kw)" :
($beam2cont eq 'consumption') ? $htitles{enconsrl}{$lang} : ($beam2cont eq 'consumption') ? $htitles{enconsrl}{$lang}." ($kw)" :
($beam2cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." $epc" : ($beam2cont eq 'energycosts') ? $htitles{enpchcst}{$lang}." ($epc)" :
($beam2cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang} : ($beam2cont eq 'gridfeedin') ? $htitles{enfeedgd}{$lang}." ($kw)" :
($beam2cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." $efc" : ($beam2cont eq 'feedincome') ? $htitles{rengfeed}{$lang}." ($efc)" :
''; '';
return $thishour; return $thishour;