FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

33_readingsGroup.pm: (re-) changed order of value mapping

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8789 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-06-21 08:25:24 +00:00
parent e6d4328def
commit a12818f945
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/33_readingsGroup.pm
View File

@ -534,7 +534,7 @@ readingsGroup_value2html($$$$$$$$$)
my $cmd;
my $devStateIcon;
if( my $value_icon = $hash->{helper}{valueIcon} ) {
if( my $icon = lookup($value_icon,$name,$alias,$n,$value_orig,$room,$group,$cell_row,"") ) {
if( my $icon = lookup($value_icon,$name,$alias,$n,$value_formated,$room,$group,$cell_row,"") ) {
if( $icon =~ m/^[\%\$]devStateIcon$/ ) {
my %extPage = ();
my ($allSets, $cmdlist, $txt) = FW_devState($name, $room, \%extPage);
@ -542,14 +542,14 @@ readingsGroup_value2html($$$$$$$$$)
} else {
$devStateIcon = FW_makeImage( $icon, $v, "icon" );
$cmd = lookup2($hash->{helper}{commands},$name,$n,$icon);
$cmd = lookup2($hash->{helper}{commands},$name,$n,$value_orig) if( !$cmd );
$cmd = lookup2($hash->{helper}{commands},$name,$n,$value_formated) if( !$cmd );
}
}
}
my $webCmdFn = 0;
if( !$devStateIcon ) {
$cmd = lookup2($hash->{helper}{commands},$name,$n,$value_orig);
$cmd = lookup2($hash->{helper}{commands},$name,$n,$value_formated);
if( $cmd && $cmd =~ m/^([\w\/.-]*):(\S*)?(\s\S*)?$/ ) {
my $set = $1;
@ -600,14 +600,14 @@ readingsGroup_value2html($$$$$$$$$)
($v,$devStateIcon) = readingsGroup_makeLink($v,$devStateIcon,$cmd) if( !$webCmdFn );
if( my $value_prefix = $hash->{helper}{valuePrefix} ) {
if( my $value_prefix = lookup2($value_prefix,$name,$n,$value_orig) ) {
if( my $value_prefix = lookup2($value_prefix,$name,$n,$value_formated) ) {
$v = $value_prefix . $v;
$devStateIcon = $value_prefix . $devStateIcon if( $devStateIcon );
}
}
if( my $value_suffix = $hash->{helper}{valueSuffix} ) {
if( my $value_suffix = lookup2($value_suffix,$name,$n,$value_orig) ) {
if( my $value_suffix = lookup2($value_suffix,$name,$n,$value_formated) ) {
$v .= $value_suffix;
$devStateIcon .= $value_suffix if( $devStateIcon );
}