From 7c75a0dfecb883c4e98e2fa037c7dfccf2c67a31 Mon Sep 17 00:00:00 2001
From: justme-1968 <justme-1968@users.noreply.github.com>
Date: Tue, 3 Dec 2013 09:55:20 +0000
Subject: [PATCH] evalute valueFormat before valueIcon in notify don't add
 .icon to informId (prevents timestamp update)

git-svn-id: https://svn.fhem.de/fhem/trunk@4317 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/33_readingsGroup.pm | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/fhem/FHEM/33_readingsGroup.pm b/fhem/FHEM/33_readingsGroup.pm
index 171f51567..22e02f01b 100644
--- a/fhem/FHEM/33_readingsGroup.pm
+++ b/fhem/FHEM/33_readingsGroup.pm
@@ -387,7 +387,7 @@ readingsGroup_2html($)
 
         $txt = "<a href=\"/fhem?detail=$name\">$txt</a>" if( $show_links );
         $ret .= "<td><div $name_style class=\"dname\">$txt</div></td>" if( $first || $multi == 1 );
-        $ret .= "<td informId=\"$d-$name.$n.icon\">$devStateIcon</td>" if( $devStateIcon );
+        $ret .= "<td informId=\"$d-$name.$n\">$devStateIcon</td>" if( $devStateIcon );
         $ret .= "<td><div $value_style informId=\"$d-$name.$n\">$v</div></td>" if( !$devStateIcon );
         $ret .= "<td><div $timestamp_style informId=\"$d-$name.$n-ts\">$t</div></td>" if( $show_time && $t );
 
@@ -503,6 +503,19 @@ readingsGroup_Notify($$)
           next if( $regex && $regex =~ m/^\?/ );
           next if( defined($regex) && $reading !~ m/^$regex$/);
 
+          my $value = $value;
+          if( $value_format ) {
+            my $value_format = lookup2($value_format,$dev->{NAME},$reading,$value);
+
+            if( !defined($value_format) ) {
+              $value = "";
+            } elsif( $value_format =~ m/%/ ) {
+              $value = sprintf( $value_format, $value );
+            } elsif( $value_format ) {
+              $value = $value_format;
+            }
+          }
+
           my $devStateIcon;
           if( $valueIcon ) {
             my $n = $h->{NAME};
@@ -519,23 +532,10 @@ readingsGroup_Notify($$)
               }
             }
 
-            CommandTrigger( "", "$name $n.$reading.icon: $devStateIcon" ) if( $devStateIcon );
+            CommandTrigger( "", "$name $n.$reading: $devStateIcon" ) if( $devStateIcon );
             next if( $devStateIcon );
           }
 
-          my $value = $value;
-          if( $value_format ) {
-            my $value_format = lookup2($value_format,$dev->{NAME},$reading,$value);
-
-            if( !defined($value_format) ) {
-              $value = "";
-            } elsif( $value_format =~ m/%/ ) {
-              $value = sprintf( $value_format, $value );
-            } elsif( $value_format ) {
-              $value = $value_format;
-            }
-          }
-
           CommandTrigger( "", "$name $dev->{NAME}.$reading: $value" );
         }
       }