FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 07:19:24 +00:00
Code Issues Releases Wiki Activity

98_DOIF.pm: uiTable: new table problem fixed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@24329 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Damian 2021-04-24 18:36:18 +00:00
parent 346bec78b1
commit 9b8c157659
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/98_DOIF.pm
View File

@ -437,7 +437,7 @@ sub parse_tpl
$wcmd =~ s/\$TD\{(.*)?\}\{(.*)?\}.*(\".*\")/for my \$rowi ($1) \{for my \$coli ($2) \{\$hash->\{$table\}\{td\}\{\$rowi\}\{\$coli\} = $3\}\}/g; $wcmd =~ s/\$TD\{(.*)?\}\{(.*)?\}.*(\".*\")/for my \$rowi ($1) \{for my \$coli ($2) \{\$hash->\{$table\}\{td\}\{\$rowi\}\{\$coli\} = $3\}\}/g;
$wcmd =~ s/\$TABLE/\$hash->{$table}{tablestyle}/; $wcmd =~ s/\$TABLE/\$hash->{$table}{tablestyle}/;
$wcmd =~ s/<\n/\.\"\<\/tbody><\/table><table class=\'block wide wrapcolumns\' style=\'\$hash->{$table}{tablestyle}\'><tbody>\"\n/g; $wcmd =~ s/<\s*\n/\."<\/tbody><\/table>\$hash->{$table}{header}"\n/g;
$wcmd =~ s/\$VAR/\$hash->{var}/g; $wcmd =~ s/\$VAR/\$hash->{var}/g;
$wcmd =~ s/\$_(\w+)/\$hash->\{var\}\{$1\}/g; $wcmd =~ s/\$_(\w+)/\$hash->\{var\}\{$1\}/g;
@ -667,11 +667,12 @@ sub DOIF_RegisterEvalAll
return undef if (!defined $hash->{$table}{table}); return undef if (!defined $hash->{$table}{table});
#$ret =~ s/class\=\'block\'/$hash->{$table}{table}/ if($hash->{$table}{table}); #$ret =~ s/class\=\'block\'/$hash->{$table}{table}/ if($hash->{$table}{table});
if ($table eq "uiTable") { if ($table eq "uiTable") {
$ret .= "\n<table uitabid='DOIF-$d' class=' block wide ".$table."doif doif-$d ' style='".($hash->{$table}{tablestyle} ? $hash->{$table}{tablestyle} : "")."'". $hash->{$table}{header}= "\n<table uitabid='DOIF-$d' class=' block wide ".$table."doif doif-$d ' style='".($hash->{$table}{tablestyle} ? $hash->{$table}{tablestyle} : "")."'".
" doifnostate='".($hash->{$table}{shownostate} ? $hash->{$table}{shownostate} : "")."'". " doifnostate='".($hash->{$table}{shownostate} ? $hash->{$table}{shownostate} : "")."'".
" doifnodevline='".($hash->{$table}{shownodeviceline} ? $hash->{$table}{shownodeviceline} : "")."'". " doifnodevline='".($hash->{$table}{shownodeviceline} ? $hash->{$table}{shownodeviceline} : "")."'".
" doifattrfirst='".($hash->{$table}{attributesfirst} ? $hash->{$table}{attributesfirst} : "")."'". " doifattrfirst='".($hash->{$table}{attributesfirst} ? $hash->{$table}{attributesfirst} : "")."'".
">"; ">";
$ret.=$hash->{$table}{header};
#$ret .= "\n<table uitabid='DOIF-$d' class=' ".$table."doif doif-$d ' style='".($hash->{$table}{tablestyle} ? $hash->{$table}{tablestyle} : "")."'>"; #$ret .= "\n<table uitabid='DOIF-$d' class=' ".$table."doif doif-$d ' style='".($hash->{$table}{tablestyle} ? $hash->{$table}{tablestyle} : "")."'>";
} else { } else {
$ret .= "\n<table uitabid='DOIF-$d' class=' ".$table."doif doif-$d ' style='".($hash->{$table}{tablestyle} ? $hash->{$table}{tablestyle} : "")."'". $ret .= "\n<table uitabid='DOIF-$d' class=' ".$table."doif doif-$d ' style='".($hash->{$table}{tablestyle} ? $hash->{$table}{tablestyle} : "")."'".