From fe00634a7ccf584529f34fa9db84b35e362635e6 Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Thu, 19 Dec 2013 17:28:44 +0000 Subject: [PATCH] internal values fix fixed row header for <...> as first reading git-svn-id: https://svn.fhem.de/fhem/trunk@4419 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/33_readingsGroup.pm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm index b037ef8b1..4d8ac0f22 100644 --- a/fhem/FHEM/33_readingsGroup.pm +++ b/fhem/FHEM/33_readingsGroup.pm @@ -216,8 +216,8 @@ readingsGroup_2html($) return undef if( !$hash ); if( $hash->{DEF} =~ m/=/ ) { - if( !$hash->{fhem}->{last_timeout} - || gettimeofday() - $hash->{fhem}->{last_timeout} > 600 ) { + if( !$hash->{fhem}->{last_update} + || gettimeofday() - $hash->{fhem}->{last_update} > 600 ) { readingsGroup_updateDevices($hash); } } @@ -322,14 +322,26 @@ readingsGroup_2html($) next if( !defined($txt) ); } + my $name_style = lookup2($name_style,$name,$1,undef); + if( $first || $multi == 1 ) { $ret .= sprintf("", ($row&1)?"odd":"even"); $row++; + + if( $h != $hash ) { + my $a = AttrVal($name, "alias", $name); + my $m = "$a$separator"; + $m = $a if( $multi != 1 ); + my $room = AttrVal($name, "room", ""); + my $group = AttrVal($name, "group", ""); + my $txt = lookup($mapping,$name,$a,"","",$room,$group,$m); + + $ret .= "
$txt
"; + } } $item++; my $inform_id = ""; $inform_id = "informId=\"$d-$item.item\"" if( $readings ); - my $name_style = lookup2($name_style,$name,$1,undef); $ret .= "
$txt
"; $first = 0; next;