FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

98_DOIFtools.pm: add some hints

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13285 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Ellert 2017-01-30 10:22:03 +00:00
parent 323bf26b29
commit f137bd238f
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- update: 98_DOIFtools.pm: add some hints
- bugfix: 74_XiaomiFlowerSens: 0.6.3 fix blockingDone Routine - bugfix: 74_XiaomiFlowerSens: 0.6.3 fix blockingDone Routine
- feature: 75_MSG: support for ReplaceSetMagic; msg command may now be used - feature: 75_MSG: support for ReplaceSetMagic; msg command may now be used
with texts containing [device:reading] to replace with with texts containing [device:reading] to replace with

20
fhem/FHEM/98_DOIFtools.pm
View File

@ -76,10 +76,10 @@ my $DOIFtoolsJavaScript = <<'EOF';
var txt = "Copy &amp; paste it to your DOIF definition<br><br>"; var txt = "Copy &amp; paste it to your DOIF definition<br><br>";
txt += "<div><ul>"; txt += "<div><ul>";
txt += "<li>event as [&lt;device&gt;:&lt;reading&gt;] representation:<br><b>"+re1+"</b></li><br>"; txt += "<li>event as [&lt;device&gt;:&lt;reading&gt;] representation:<br><code>"+re1+"</code></li><br>";
txt += "<li>event as [&lt;device&gt;:&lt;reading&gt;] representation with comparison:<br><b>"+re2+"</b></li><br>"; txt += "<li>event as [&lt;device&gt;:&lt;reading&gt;] representation with comparison:<br><code>"+re2+"</code></li><br>";
txt += "<li>event as <i>regular expression</i>:<br><b>"+re3+"</b></li><br>"; txt += "<li>event as <i>regular expression</i>:<br><code>"+re3+"</code></li><br>";
txt += "<li>event as <i>regular expression</i> with value:<br><b>"+re4+"</b></li><br>"; txt += "<li>event as <i>regular expression</i> with value:<br><code>"+re4+"</code></li><br>";
txt += "</ul></div>"; txt += "</ul></div>";
return FW_okDialog(txt); return FW_okDialog(txt);
} }
@ -124,7 +124,7 @@ sub DOIFtools_eM($$$$) {
my $ret = ""; my $ret = "";
# Event Monitor # Event Monitor
my $a0 = ReadingsVal($d,".eM", "off") eq "on" ? "off" : "on"; my $a0 = ReadingsVal($d,".eM", "off") eq "on" ? "off" : "on";
$ret .= "<div class=\"dval\"><br>Event monitor: <a href=\"/fhem?detail=$d&amp;cmd.$d=setreading $d .eM $a0\">toggle</a>&nbsp;&nbsp;"; $ret .= "<div class=\"dval\"><br><span title=\"toggle to switch event monitor on/off\">Event monitor: <a href=\"/fhem?detail=$d&amp;cmd.$d=setreading $d .eM $a0\">toggle</a>&nbsp;&nbsp;</span>";
$ret .= "</div>"; $ret .= "</div>";
my $a = ""; my $a = "";
@ -138,7 +138,7 @@ sub DOIFtools_eM($$$$) {
($a && $a eq "log" ? " checked":"")."></span>". ($a && $a eq "log" ? " checked":"")."></span>".
"&nbsp;&nbsp;<button id='eventReset'>Reset</button></div>\n"; "&nbsp;&nbsp;<button id='eventReset'>Reset</button></div>\n";
$ret .= "<div>"; $ret .= "<div>";
$ret .= "<textarea id=\"console\" style=\"width:99%; top:.1em; bottom:1em; position:relative;\" readonly=\"readonly\" rows=\"25\" cols=\"60\"></textarea>"; $ret .= "<textarea id=\"console\" style=\"width:99%; top:.1em; bottom:1em; position:relative;\" readonly=\"readonly\" rows=\"25\" cols=\"60\" title=\"selecting an event line displays example operands for DOIFs definition\" ></textarea>";
$ret .= "</div>"; $ret .= "</div>";
$ret .= $DOIFtoolsJavaScript; $ret .= $DOIFtoolsJavaScript;
} }
@ -198,7 +198,7 @@ sub DOIFtools_fhemwebFn($$$$) {
my $ret = ""; my $ret = "";
# Logfile Liste # Logfile Liste
if($FW_ss && $pageHash) { if($FW_ss && $pageHash) {
$ret."<div id=\"$d\" align=\"center\" class=\"FileLog col2\">". $ret.= "<div id=\"$d\" align=\"center\" class=\"FileLog col2\">".
"$defs{$d}{STATE}</div>"; "$defs{$d}{STATE}</div>";
} else { } else {
my $row = 0; my $row = 0;
@ -223,7 +223,7 @@ sub DOIFtools_fhemwebFn($$$$) {
} }
# Event Monitor # Event Monitor
my $a0 = ReadingsVal($d,".eM", "off") eq "on" ? "off" : "on"; my $a0 = ReadingsVal($d,".eM", "off") eq "on" ? "off" : "on";
$ret .= "<div class=\"dval\"><br>Event monitor: <a href=\"/fhem?detail=$d&amp;cmd.$d=setreading $d .eM $a0\">toggle</a>&nbsp;&nbsp;"; $ret .= "<div class=\"dval\"><br><span title=\"toggle to switch event monitor on/off\">Event monitor: <a href=\"/fhem?detail=$d&amp;cmd.$d=setreading $d .eM $a0\">toggle</a>&nbsp;&nbsp;</span>";
$ret .= "Shortcuts: " if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0) or AttrVal($d,"DOIFtoolsMyShortcuts","")); $ret .= "Shortcuts: " if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0) or AttrVal($d,"DOIFtoolsMyShortcuts",""));
if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0)) { if (!AttrVal($d,"DOIFtoolsHideModulShortcuts",0)) {
$ret .= "<a href=\"/fhem?detail=$d&amp;cmd.$d=reload 98_DOIFtools.pm\">reload DOIFtools</a>&nbsp;&nbsp;" if(ReadingsVal($d,".debug","")); $ret .= "<a href=\"/fhem?detail=$d&amp;cmd.$d=reload 98_DOIFtools.pm\">reload DOIFtools</a>&nbsp;&nbsp;" if(ReadingsVal($d,".debug",""));
@ -313,7 +313,7 @@ sub DOIFtools_fhemwebFn($$$$) {
($a && $a eq "log" ? " checked":"")."></span>". ($a && $a eq "log" ? " checked":"")."></span>".
"&nbsp;&nbsp;<button id='eventReset'>Reset</button></div>\n"; "&nbsp;&nbsp;<button id='eventReset'>Reset</button></div>\n";
$ret .= "<div>"; $ret .= "<div>";
$ret .= "<textarea id=\"console\" style=\"width:99%; top:.1em; bottom:1em; position:relative;\" readonly=\"readonly\" rows=\"25\" cols=\"60\"></textarea>"; $ret .= "<textarea id=\"console\" style=\"width:99%; top:.1em; bottom:1em; position:relative;\" readonly=\"readonly\" rows=\"25\" cols=\"60\" title=\"selecting an event line displays example operands for DOIFs definition\"></textarea>";
$ret .= "</div>"; $ret .= "</div>";
$ret .= $DOIFtoolsJavaScript; $ret .= $DOIFtoolsJavaScript;
} }
@ -350,7 +350,7 @@ sub DOIFtools_Notify($$) {
$trig .= "</a><strong>\[$hash->{helper}{counter}{0}\] +++++ Listing $sn:$1 +++++</strong>\n"; $trig .= "</a><strong>\[$hash->{helper}{counter}{0}\] +++++ Listing $sn:$1 +++++</strong>\n";
my $prev = $hash->{helper}{counter}{0} - 1; my $prev = $hash->{helper}{counter}{0} - 1;
my $next = $hash->{helper}{counter}{0} + 1; my $next = $hash->{helper}{counter}{0} + 1;
$trig .= $prev ? "<b>jump to: <a href=\"#list$prev\">prev</a>&nbsp;&nbsp;<a href=\"#list$next\">next</a> Listing</b><br>" : "<b>jump to: <a href=\"#list$next\">next</a> Listing</b><br>"; $trig .= $prev ? "<b>jump to: <a href=\"#list$prev\">prev</a>&nbsp;&nbsp;<a href=\"#list$next\">next</a> Listing</b><br>" : "<b>jump to: prev&nbsp;&nbsp;<a href=\"#list$next\">next</a> Listing</b><br>";
$trig .= "DOIF-Version: ".ReadingsVal($pn,"DOIF_version","n/a")."<br>"; $trig .= "DOIF-Version: ".ReadingsVal($pn,"DOIF_version","n/a")."<br>";
$trig .= CommandList(undef,$sn); $trig .= CommandList(undef,$sn);
foreach my $itm (keys %defs) { foreach my $itm (keys %defs) {