2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 19:04:20 +00:00

76_SolarForecast.pm: contrib 0.67.2

git-svn-id: https://svn.fhem.de/fhem/trunk@26310 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2022-08-11 17:32:07 +00:00
parent 62ccedf60e
commit d872ed2197

View File

@ -120,6 +120,7 @@ BEGIN {
# Versions History intern
my %vNotesIntern = (
"0.67.2 "=> "11.08.2022 fix no disabled Link after restart and disable=1 ",
"0.67.1 "=> "10.08.2022 fix warning, Forum: https://forum.fhem.de/index.php/topic,117864.msg1231050.html#msg1231050 ",
"0.67.0 "=> "31.07.2022 change _gethtml, _getftui ",
"0.66.0 "=> "24.07.2022 insert function calcPeaklossByTemp to calculate peak power reduction by temperature ",
@ -4548,8 +4549,8 @@ sub entryGraphic {
my $hash = $defs{$name};
# Setup Vollständigkeit prüfen
###############################
# Setup Vollständigkeit/disabled prüfen
#########################################
my $incomplete = _checkSetupComplete ($hash);
return $incomplete if($incomplete);
@ -4617,16 +4618,6 @@ sub entryGraphic {
my $ret = q{};
if(IsDisabled($name)) {
$ret .= "<table class='roomoverview'>";
$ret .= "<tr style='height:".$paref->{height}."px'>";
$ret .= "<td>";
$ret .= qq{SolarForecast device <a href="$FW_ME$FW_subdir?detail=$name">$name</a> is disabled};
$ret .= "</td>";
$ret .= "</tr>";
$ret .= "</table>";
}
else {
$ret .= "<span>$dlink </span><br>" if(AttrVal($name,"showLink",0));
$ret .= "<html>";
@ -4724,7 +4715,6 @@ sub entryGraphic {
$ret .= "</table>";
$ret .= $html_end if (defined($html_end));
$ret .= "</html>";
}
return $ret;
}
@ -4747,11 +4737,23 @@ sub _checkSetupComplete {
my $dir = ReadingsVal ($name, "moduleDirection", undef); # Modulausrichtung Konfig
my $ta = ReadingsVal ($name, "moduleTiltAngle", undef); # Modul Neigungswinkel Konfig
if(!$is || !$fcdev || !$radev || !$indev || !$medev || !$peak || !defined $pv0 || !$dir || !$ta) {
my $link = qq{<a href="$FW_ME$FW_subdir?detail=$name">$name</a>};
my $height = AttrNum ($name, 'beamHeight', 200);
my $lang = AttrVal ("global", "language", "EN");
if(IsDisabled($name)) {
$ret .= "<table class='roomoverview'>";
$ret .= "<tr style='height:".$height."px'>";
$ret .= "<td>";
$ret .= qq{SolarForecast device $link is disabled};
$ret .= "</td>";
$ret .= "</tr>";
$ret .= "</table>";
return $ret;
}
if(!$is || !$fcdev || !$radev || !$indev || !$medev || !$peak || !defined $pv0 || !$dir || !$ta) {
$ret .= "<table class='roomoverview'>";
$ret .= "<tr style='height:".$height."px'>";
$ret .= "<td>";