diff --git a/FHEM/33_readingsGroup.pm b/FHEM/33_readingsGroup.pm index 1745f0e25..2bae98ddc 100644 --- a/FHEM/33_readingsGroup.pm +++ b/FHEM/33_readingsGroup.pm @@ -35,7 +35,7 @@ sub readingsGroup_Initialize($) #$hash->{SetFn} = "readingsGroup_Set"; $hash->{GetFn} = "readingsGroup_Get"; $hash->{AttrFn} = "readingsGroup_Attr"; - $hash->{AttrList} = "disable:1,2,3 nameIcon valueIcon mapping separator style nameStyle valueStyle valueFormat timestampStyle noheading:1 nolinks:1 notime:1 nostate:1 alwaysTrigger:1"; + $hash->{AttrList} = "disable:1,2,3 nameIcon valueIcon mapping separator style nameStyle valueColumns valueStyle valueFormat timestampStyle noheading:1 nolinks:1 notime:1 nostate:1 alwaysTrigger:1"; $hash->{FW_detailFn} = "readingsGroup_detailFn"; $hash->{FW_summaryFn} = "readingsGroup_detailFn"; @@ -266,6 +266,12 @@ readingsGroup_2html($) $value_format = $vf if( $vf ); } + my $value_columns = AttrVal( $d, "valueColumns", "" ); + if( $value_columns =~ m/^{.*}$/ ) { + my $vc = eval $value_columns; + $value_columns = $vc if( $vc ); + } + my $mapping = AttrVal( $d, "mapping", ""); $mapping = eval $mapping if( $mapping =~ m/^{.*}$/ ); #$mapping = undef if( ref($mapping) ne 'HASH' ); @@ -401,6 +407,8 @@ readingsGroup_2html($) $v = $value_format; } + my $value_columns = lookup2($value_columns,$name,$n,$v); + my $a = AttrVal($name, "alias", $name); my $m = "$a$separator$n"; $m = $a if( $multi != 1 ); @@ -437,7 +445,7 @@ readingsGroup_2html($) $ret .= "
attr temperatures valueStyle style="text-align:right"
attr wzReceiverRG valueColumns { eventdescription => 'colspan="4"' }