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

fix informid reading, informid ts

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3456 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ulimaass 2013-07-19 21:49:24 +00:00
parent 92086c0c7c
commit 23f46413e8
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/95_FLOORPLAN.pm
View File

@ -502,14 +502,18 @@ FP_show(){
$fp_fpimage =~ s/\{state\}/$state/; # replace {state} by actual device-status $fp_fpimage =~ s/\{state\}/$state/; # replace {state} by actual device-status
$txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_fpimage\"/; # replace icon-link in html $txt =~ s/\<img\ src\=\"(.*)\"/\<img\ src\=\"\/fhem\/icons\/$fp_fpimage\"/; # replace icon-link in html
} }
FW_pO "<td informId=\"$d\" colspan=\"$cols\">$txt"; if ($style == 3 || $style == 6) {
FW_pO "<td><div informId=\"$d-$text\">$txt</div></td>"; # reading
} else {
FW_pO "<td informId=\"$d\" colspan=\"$cols\">$txt"; # state
}
FW_pO "</td></tr>"; FW_pO "</td></tr>";
if ($style == 6) { # add ReadingsTimeStamp for style 6 if ($style == 6) { # add ReadingsTimeStamp for style 6
$txt=""; $txt="";
FW_pO "<tr class=\"devicetimestamp fp_$FP_name\" id=\"$d-devicetimestamp\">"; # For css: class=devicetimestamp, id=<devicename>-devicetimestamp FW_pO "<tr class=\"devicetimestamp fp_$FP_name\" id=\"$d-devicetimestamp\">"; # For css: class=devicetimestamp, id=<devicename>-devicetimestamp
$txt = ReadingsTimestamp($d, $text, "Undefined Reading $d-<b>$text</b>") if ($style == 3 || $style == 6); # Style3+6 = DeviceReading given in $text $txt = ReadingsTimestamp($d, $text, "Undefined Reading $d-<b>$text</b>"); # Style3+6 = DeviceReading given in $text
FW_pO "<td informId=\"$d\" colspan=\"$cols\">$txt"; FW_pO "<td><div colspan=\"$cols\" informId=\"$d-$text-ts\">$txt</div></td>";
FW_pO "</td></tr>"; FW_pO "</td></tr>";
} }