From 9e1e0021d83965ef625d962719005a5f5581c1cf Mon Sep 17 00:00:00 2001
From: Beta-User <>
Date: Sun, 7 May 2023 04:14:04 +0000
Subject: [PATCH] mqtt2.template: changes to ahoy-devStateIcon

git-svn-id: https://svn.fhem.de/fhem/trunk@27526 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/AttrTemplate/99_attrT_Ahoy_Utils.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fhem/contrib/AttrTemplate/99_attrT_Ahoy_Utils.pm b/fhem/contrib/AttrTemplate/99_attrT_Ahoy_Utils.pm
index 19585f1eb..790542c52 100644
--- a/fhem/contrib/AttrTemplate/99_attrT_Ahoy_Utils.pm
+++ b/fhem/contrib/AttrTemplate/99_attrT_Ahoy_Utils.pm
@@ -23,8 +23,8 @@ BEGIN {
           ReadingsVal
           ReadingsNum
           ReadingsAge
+		  isday
           defs
-          isday
           )
     );
 }
@@ -46,15 +46,16 @@ sub devStateIcon {
 
   return if !defined $defs{$devname};
 
-  my $ret = ReadingsNum($devname,'available',0);
-  $ret = $ret > 1 ? '10px-kreis-gruen' : isday() ? '10px-kreis-rot' :'10px-kreis-gelb'; 
-  $ret = FW_makeImage($ret, 'edit_settings');
-  $ret .= ' ';
   my $col = substr(Color::pahColor(-10,50,70,ReadingsNum($devname,'temperature',0),$colors),0,6);
-  $ret .= FW_makeImage("sani_solar_temp\@$col",'file_unknown@grey');
+  my $ret = FW_makeImage("sani_solar_temp\@$col",'file_unknown@grey');
   $ret .= ' ';
   $ret .= ReadingsNum($devname,'temperature',0,1);
   $ret .= ' °C<br>';
+
+  my $avail = ReadingsNum($devname,'available',0);
+  $avail = $avail > 1 ? '10px-kreis-gruen' : isday() ? '10px-kreis-rot' :'10px-kreis-gelb'; 
+  $ret .= FW_makeImage($avail, 'edit_settings');
+  $ret .= ' ';
   $ret .= ReadingsNum($devname,'P_AC',0);
   $ret .= ' W / ';
   $ret .= ReadingsNum($devname,'YieldDay',0);