diff --git a/fhem/FHEM/98_DOIF.pm b/fhem/FHEM/98_DOIF.pm index c3c8e3adc..49bc70301 100644 --- a/fhem/FHEM/98_DOIF.pm +++ b/fhem/FHEM/98_DOIF.pm @@ -437,6 +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/\$TABLE/\$hash->{$table}{tablestyle}/; + $wcmd =~ s/<\n/\.\"\<\/tbody><\/table>{$table}{tablestyle}\'>\"\n/g; $wcmd =~ s/\$VAR/\$hash->{var}/g; $wcmd =~ s/\$_(\w+)/\$hash->\{var\}\{$1\}/g; @@ -1602,10 +1603,11 @@ sub ReplaceReadingDoIf @{$hash->{accu}{"$name $reading"}{value}}=(); } } elsif ($format =~ /^((col)(\d*))/) { - AddRegexpTriggerDoIf($hash,"collect","","collect",$name,$reading); $regExp =$1; my $hours=$3; $hours=24 if (!defined $hours or !$hours); + delete $hash->{collect}{"$name $reading"}{$hours}; + AddRegexpTriggerDoIf($hash,"collect","","collect",$name,$reading); @{$hash->{collect}{"$name $reading"}{$hours}{values}}=(); @{$hash->{collect}{"$name $reading"}{$hours}{times}}=(); $hash->{collect}{"$name $reading"}{$hours}{hours}=$hours; @@ -4721,11 +4723,11 @@ sub card $out.= ''; $out.= ''; - $out.=''; - $out.= ui_Table::ring($val,$min,$max,$minColor,$maxColor,$unit,95,$func,$decfont,$model,$lightness,undef,(defined $header or !defined $icon) ? undef: $icon); + $out.=''; + $out.= ui_Table::ring($val,$min,$max,$minColor,$maxColor,$unit,92,$func,$decfont,$model,$lightness,undef,(defined $header or !defined $icon) ? undef: $icon); $out.=''; - $out.=sprintf('%s',::strftime("%H:%M:%S",localtime($time))); + $out.=sprintf('%s',::strftime("%H:%M:%S",localtime($time))); if (defined $maxValTime) {