From 45a6cc463dde29179eb1c379b2006616f8004022 Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Sat, 8 Aug 2020 14:20:55 +0000 Subject: [PATCH] 76_SMAPortal: contrib 3.4.0 git-svn-id: https://svn.fhem.de/fhem/trunk@22559 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/76_SMAPortal.pm | 30 ++++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/fhem/contrib/DS_Starter/76_SMAPortal.pm b/fhem/contrib/DS_Starter/76_SMAPortal.pm index 6aa812ad1..355d14ee0 100644 --- a/fhem/contrib/DS_Starter/76_SMAPortal.pm +++ b/fhem/contrib/DS_Starter/76_SMAPortal.pm @@ -138,7 +138,7 @@ BEGIN { # Versions History intern my %vNotesIntern = ( "3.4.0" => "08.08.2020 attr balanceDay, balanceMonth, balanceYear for data provider balanceDayData, balanceMonthData, balanceYearData ". - "set getData command", + "set getData command, update button in header of PortalAsHtml", "3.3.4" => "12.07.2020 fix break in header if attribute hourCount was reduced ", "3.3.3" => "07.07.2020 change extractLiveData, minor fixes ", "3.3.2" => "05.07.2020 change timeout calc, new reading lastSuccessTime ", @@ -3182,8 +3182,8 @@ sub PortalAsHtml { # Headerzeile generieren if ($header) { - my $lang = AttrVal("global","language","EN"); - my $alias = AttrVal($name, "alias", "SMA Sunny Portal"); # Linktext als Aliasname oder "SMA Sunny Portal" + my $lang = AttrVal("global", "language", "EN"); + my $alias = AttrVal($name, "alias", "SMA Sunny Portal"); # Linktext als Aliasname oder "SMA Sunny Portal" my $dlink = "$alias"; my $lup = ReadingsTimestamp($name, "${fmin}_ForecastToday_Consumption", "0000-00-00 00:00:00"); # letzter Forecast Update @@ -3203,11 +3203,29 @@ sub PortalAsHtml { $header = ""; - # Header Link + Status + # Header Link + Status + Update Button if($hdrDetail eq "all" || $hdrDetail eq "statusLink") { my ($year, $month, $day, $hour, $min, $sec) = $lup =~ /(\d+)-(\d\d)-(\d\d)\s+(.*)/x; - $lup = "$3.$2.$1 $4"; - $header .= ""; + $lup = "$3.$2.$1 $4"; + + my $cmdupdate = "\"FW_cmd('$FW_ME$FW_subdir?XHR=1&cmd=set $name getData')\""; # Update Button generieren + + if ($ftui && $ftui eq "ftui") { + $cmdupdate = "\"ftui.setFhemStatus('set $name getData')\""; + } + + my $upstate = ReadingsVal($name,"state", "undef"); + my $upicon = ""; + + if ($upstate =~ /ok/ix) { + $upicon = ""; + } elsif ($upstate =~ /running/ix) { + $upicon = ""; + } else { + $upicon = ""; + } + + $header .= ""; } # Header Information pv
".$dlink."(".$lupt." ".$lup.")
".$dlink."(".$lupt." ".$lup."   ".$upicon.")