";
FW_pO "
"; - FW_zoomLink("cmd=$cmd;zoom=-1", "Zoom-in", "zoom in"); - FW_zoomLink("cmd=$cmd;zoom=1", "Zoom-out","zoom out"); - FW_zoomLink("cmd=$cmd;off=-1", "Prev", "prev"); - FW_zoomLink("cmd=$cmd;off=1", "Next", "next"); + FW_pO FW_zoomLink("cmd=$cmd;zoom=-1", "Zoom-in", "zoom in"); + FW_pO FW_zoomLink("cmd=$cmd;zoom=1", "Zoom-out","zoom out"); + FW_pO FW_zoomLink("cmd=$cmd;off=-1", "Prev", "prev"); + FW_pO FW_zoomLink("cmd=$cmd;off=1", "Next", "next"); FW_pO "", $pageHash ? "" : "block ");
+ foreach my $f (FW_fileList($defs{$d}{logfile})) {
+ my $class = (!$pageHash ? (($row++&1)?"odd":"even") : "");
+ $ret .= "
";
+ return $ret;
+}
+
+
###################################
# We use this function to be able to scroll/zoom in the plots created from the
# logfile. When outfile is specified, it is used with gnuplot post-processing,
diff --git a/fhem/FHEM/98_weblink.pm b/fhem/FHEM/98_weblink.pm
index 037713a04..68f690aa8 100755
--- a/fhem/FHEM/98_weblink.pm
+++ b/fhem/FHEM/98_weblink.pm
@@ -4,6 +4,11 @@ package main;
use strict;
use warnings;
+use vars qw($FW_subdir); # Sub-path in URL for extensions, e.g. 95_FLOORPLAN
+use vars qw($FW_ME); # webname (default is fhem), needed by 97_GROUP
+use vars qw(%FW_hiddenroom); # hash of hidden rooms, used by weblink
+use vars qw($FW_plotmode);# Global plot mode (WEB attribute), used by weblink
+use vars qw($FW_plotsize);# Global plot size (WEB attribute), used by weblink
#####################################
sub
@@ -12,7 +17,11 @@ weblink_Initialize($)
my ($hash) = @_;
$hash->{DefFn} = "weblink_Define";
- $hash->{AttrList}= "fixedrange plotmode plotsize label title htmlattr plotfunction";
+ $hash->{AttrList} = "fixedrange plotmode plotsize label ".
+ "title htmlattr plotfunction";
+ $hash->{FW_summaryFn} = "weblink_FwFn";
+ $hash->{FW_detailFn} = "weblink_FwFn";
+ $hash->{FW_atPageEnd} = 1;
}
@@ -34,6 +43,110 @@ weblink_Define($$)
return undef;
}
+#####################################
+# FLOORPLAN compat
+sub
+FW_showWeblink($$$$)
+{
+ my ($d,undef,undef,$buttons) = @_;
+
+ if($buttons !~ m/HASH/) {
+ my %h = (); $buttons = \%h;
+ }
+ FW_pO weblink_FwFn(undef, $d, "", $buttons);
+ return $buttons;
+}
+
+
+##################
+sub
+weblink_FwDetail($)
+{
+ my ($d)= @_;
+ my $alias= AttrVal($d, "alias", $d);
+
+ my $ret = "
"; + $ret .= FW_pHPlain("detail=$d", $alias) if(!$FW_subdir); + FW_pO "
"; + return $ret; +} + +sub +weblink_FwFn($$$$) +{ + my ($FW_chash, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn. + my $hash = $defs{$d}; + my $link = $hash->{LINK}; + my $wltype = $hash->{WLTYPE}; + my $ret = ""; + + my $attr = AttrVal($d, "htmlattr", ""); + if($wltype eq "htmlCode") { + $link = AnalyzePerlCommand(undef, $link) if($link =~ m/^{(.*)}$/); + $ret = $link; + + } elsif($wltype eq "link") { + $ret = "$d"; # no FW_pH, open extra browser + + } elsif($wltype eq "image") { + $ret = "![](\"$link\")
" . + weblink_FwDetail($d); + + } elsif($wltype eq "iframe") { + $ret = "" . + weblink_FwDetail($d); + + } elsif($wltype eq "fileplot" || $wltype eq "dbplot" ) { + + # plots navigation buttons + if((!$pageHash || !$pageHash->{buttons}) && + ($wltype eq "fileplot" || $wltype eq "dbplot") && + AttrVal($d, "fixedrange", "x") !~ m/^[ 0-9:-]*$/) { + + $ret .= FW_zoomLink("zoom=-1", "Zoom-in", "zoom in"); + $ret .= FW_zoomLink("zoom=1", "Zoom-out","zoom out"); + $ret .= FW_zoomLink("off=-1", "Prev", "prev"); + $ret .= FW_zoomLink("off=1", "Next", "next"); + $pageHash->{buttons} = 1 if($pageHash); + $ret .= "
"; + } + + my @va = split(":", $link, 3); + if($wltype eq "fileplot" && + (@va != 3 || !$defs{$va[0]} || !$defs{$va[0]}{currentlogfile})) { + $ret .= "Broken definition for fileplot $d: $link
"; + + } elsif ($wltype eq "dbplot" && (@va != 2 || !$defs{$va[0]})) { + $ret .= "Broken definition for dbplot $d: $link
"; + + } else { + if(defined($va[2]) && $va[2] eq "CURRENT") { + $defs{$va[0]}{currentlogfile} =~ m,([^/]*)$,; + $va[2] = $1; + } + + if ($wltype eq "dbplot") { + $va[2] = "-"; + } + + my $wl = "&pos=" . join(";", map {"$_=$FW_pos{$_}"} keys %FW_pos); + + my $arg="$FW_ME?cmd=showlog $d $va[0] $va[1] $va[2]$wl"; + if(AttrVal($d,"plotmode",$FW_plotmode) eq "SVG") { + my ($w, $h) = split(",", AttrVal($d,"plotsize",$FW_plotsize)); + $ret .= "
"; - FW_zoomLink("cmd=$cmd;zoom=-1", "Zoom-in", "zoom in"); - FW_zoomLink("cmd=$cmd;zoom=1", "Zoom-out","zoom out"); - FW_zoomLink("cmd=$cmd;off=-1", "Prev", "prev"); - FW_zoomLink("cmd=$cmd;off=1", "Next", "next"); + FW_pO FW_zoomLink("cmd=$cmd;zoom=-1", "Zoom-in", "zoom in"); + FW_pO FW_zoomLink("cmd=$cmd;zoom=1", "Zoom-out","zoom out"); + FW_pO FW_zoomLink("cmd=$cmd;off=-1", "Prev", "prev"); + FW_pO FW_zoomLink("cmd=$cmd;off=1", "Next", "next"); FW_pO "
| "; FW_pO " | "; my $logtype = $defs{$d}{TYPE}; @@ -1658,9 +1594,9 @@ FW_zoomLink($$$) $val = "day" if(!$val); $val = $FW_zoom{$val}; - return if(!defined($val) || $val+$off < 0 || $val+$off >= int(@FW_zoom) ); + return "" if(!defined($val) || $val+$off < 0 || $val+$off >= int(@FW_zoom)); $val = $FW_zoom[$val+$off]; - return if(!$val); + return "" if(!$val); # Approximation of the next offset. my $w_off = $FW_pos{off}; @@ -1683,7 +1619,7 @@ FW_zoomLink($$$) } else { - return if((!$val && $off > 0) || ($val && $val+$off > 0)); # no future + return "" if((!$val && $off > 0) || ($val && $val+$off > 0)); # no future $off=($val ? $val+$off : $off); my $zoom=$FW_pos{zoom}; $zoom = 0 if(!$zoom); @@ -1691,8 +1627,7 @@ FW_zoomLink($$$) } - FW_pO " "; - FW_pHPlain "$cmd", FW_makeImage($img, $alt); + return " ".FW_pHPlain("$cmd", FW_makeImage($img, $alt)); } ################## @@ -2010,36 +1945,43 @@ FW_pO(@) sub FW_pH(@) { - my ($link, $txt, $td, $class) = @_; + my ($link, $txt, $td, $class, $doRet) = @_; + my $ret = ""; - FW_pO " | " if($td); - $link = ($link =~ m,^/,) ? $link : "$FW_ME$FW_subdir?$link"; - $class = "" if(!defined($class)); - $class = " class=\"$class\"" if($class); + $ret .= " | " if($td);
+ $link = ($link =~ m,^/,) ? $link : "$FW_ME$FW_subdir?$link";
+ $class = "" if(!defined($class));
+ $class = " class=\"$class\"" if($class);
- # Using onclick, as href starts safari in a webapp.
- # Known issue: the pointer won't change
- if($FW_ss || $FW_tp) {
- FW_pO " | " if($td);
+ } else {
+ $ret .= "" if($td); - if($FW_ss || $FW_tp) { - FW_pO "$txt"; - } else { - FW_pO "$txt"; - } - FW_pO " | " if($td); + my $ret = ""; + $ret .= "" if($td); + if($FW_ss || $FW_tp) { + $ret .= "$txt"; + } else { + $ret .= "$txt"; + } + $ret .= " | " if($td); + return $ret; } @@ -2084,92 +2026,6 @@ FW_fC($@) return $ret; } -################## -sub -FW_showWeblinkDetail($) -{ - my ($d)= @_; - my $alias= AttrVal($d, "alias", $d); - - FW_pO "". + "". + "". + " | "; +} + +sub +FW_timepickerFn() +{ + my ($d,$cmd,$values) = @_; + + return undef if($values ne "time"); + my $srf = $FW_room ? "&room=$FW_room" : ""; + my $cv = ReadingsVal($d, $cmd, Value($d)); + $cmd = "" if($cmd eq "state"); + my $c = "\"$FW_ME?cmd=set $d $cmd %$srf\""; + return "". + "". + "". + " | "; +} + +sub +FW_dropdownFn() +{ + my ($d,$cmd,$values) = @_; + + my @tv = split(",", $values); + # Hack: eventmap (translation only) should not result in a + # dropdown. eventMap/webCmd/etc handling must be cleaned up. + if(@tv > 1) { + my $txt; + if($cmd eq "desired-temp" || $cmd eq "desiredTemperature") { + $txt = ReadingsVal($d, $cmd, 20); + $txt =~ s/ .*//; # Cut off Celsius + $txt = sprintf("%2.1f", int(2*$txt)/2) if($txt =~ m/[0-9.-]/); + } else { + $txt = Value($d); + $txt =~ s/$cmd //; + } + return ""; + } + return undef; +} + 1; =pod diff --git a/fhem/FHEM/92_FileLog.pm b/fhem/FHEM/92_FileLog.pm index 7ba3ce8f9..326ced67b 100755 --- a/fhem/FHEM/92_FileLog.pm +++ b/fhem/FHEM/92_FileLog.pm @@ -6,6 +6,7 @@ use strict; use warnings; use IO::File; #use Devel::Size qw(size total_size); +use vars qw($FW_ss); # is smallscreen sub seekTo($$$$); @@ -23,6 +24,9 @@ FileLog_Initialize($) $hash->{AttrFn} = "FileLog_Attr"; # logtype is used by the frontend $hash->{AttrList} = "disable:0,1 logtype nrarchive archivedir archivecmd"; + + $hash->{FW_summaryFn} = "FW_dumpFileLog"; + $hash->{FW_detailFn} = "FW_dumpFileLog"; } @@ -94,6 +98,7 @@ FileLog_Log($$) my $ln = $log->{NAME}; return if($attr{$ln} && $attr{$ln}{disable}); + return if(!$dev || !defined($dev->{CHANGED})); my $n = $dev->{NAME}; my $re = $log->{REGEXP}; @@ -161,6 +166,38 @@ FileLog_Set($@) return undef; } +######################### +sub +FW_dumpFileLog($$$$) +{ + my ($FW_chash, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn. + + return " |
$f | ";
+ my $idx = 0;
+ foreach my $ln (split(",", AttrVal($d, "logtype", "text"))) {
+ if($FW_ss && $idx++) {
+ $ret .= "
| ";
+ }
+ my ($lt, $name) = split(":", $ln);
+ $name = $lt if(!$name);
+ $ret .= FW_pH("cmd=logwrapper $d $lt $f",
+ " $name ", 1, "dval", 1);
+ }
+ $ret .= " |
"; + $ret .= FW_pHPlain("detail=$d", $alias) if(!$FW_subdir); + FW_pO "
"; + return $ret; +} + +sub +weblink_FwFn($$$$) +{ + my ($FW_chash, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn. + my $hash = $defs{$d}; + my $link = $hash->{LINK}; + my $wltype = $hash->{WLTYPE}; + my $ret = ""; + + my $attr = AttrVal($d, "htmlattr", ""); + if($wltype eq "htmlCode") { + $link = AnalyzePerlCommand(undef, $link) if($link =~ m/^{(.*)}$/); + $ret = $link; + + } elsif($wltype eq "link") { + $ret = "$d"; # no FW_pH, open extra browser + + } elsif($wltype eq "image") { + $ret = "
" . + weblink_FwDetail($d); + + } elsif($wltype eq "iframe") { + $ret = "" . + weblink_FwDetail($d); + + } elsif($wltype eq "fileplot" || $wltype eq "dbplot" ) { + + # plots navigation buttons + if((!$pageHash || !$pageHash->{buttons}) && + ($wltype eq "fileplot" || $wltype eq "dbplot") && + AttrVal($d, "fixedrange", "x") !~ m/^[ 0-9:-]*$/) { + + $ret .= FW_zoomLink("zoom=-1", "Zoom-in", "zoom in"); + $ret .= FW_zoomLink("zoom=1", "Zoom-out","zoom out"); + $ret .= FW_zoomLink("off=-1", "Prev", "prev"); + $ret .= FW_zoomLink("off=1", "Next", "next"); + $pageHash->{buttons} = 1 if($pageHash); + $ret .= "
"; + } + + my @va = split(":", $link, 3); + if($wltype eq "fileplot" && + (@va != 3 || !$defs{$va[0]} || !$defs{$va[0]}{currentlogfile})) { + $ret .= "Broken definition for fileplot $d: $link
"; + + } elsif ($wltype eq "dbplot" && (@va != 2 || !$defs{$va[0]})) { + $ret .= "Broken definition for dbplot $d: $link
"; + + } else { + if(defined($va[2]) && $va[2] eq "CURRENT") { + $defs{$va[0]}{currentlogfile} =~ m,([^/]*)$,; + $va[2] = $1; + } + + if ($wltype eq "dbplot") { + $va[2] = "-"; + } + + my $wl = "&pos=" . join(";", map {"$_=$FW_pos{$_}"} keys %FW_pos); + + my $arg="$FW_ME?cmd=showlog $d $va[0] $va[1] $va[2]$wl"; + if(AttrVal($d,"plotmode",$FW_plotmode) eq "SVG") { + my ($w, $h) = split(",", AttrVal($d,"plotsize",$FW_plotsize)); + $ret .= "