FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 18:59:33 +00:00
Code Issues Releases Wiki Activity

88_Timer: fix overview

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20253 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
HomeAuto_User 2019-09-26 17:57:59 +00:00
parent 11f4e76955
commit 6cb4a3d77e
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/88_Timer.pm
View File

@ -147,10 +147,13 @@ sub Timer_Set($$$@) {
if ($cmd eq "sortTimer") {
my @timers_unsortet;
my $userattr_new = "";
my @userattr_values;
my @attr_values_names;
my $timer_nr_new;
my $array_diff = 0; # difference, Timer can be sorted >= 1
my $array_diff_cnt1 = 0; # need to check 1 + 1
my $array_diff_cnt2 = 0; # need to check 1 + 1
RemoveInternalTimer($hash, "Timer_Check");
foreach my $readingsName (sort keys %{$hash->{READINGS}}) {
@ -158,11 +161,13 @@ sub Timer_Set($$$@) {
my $value = ReadingsVal($name, $readingsName, 0);
$value =~ /^.*\d{2},(.*),(on|off|Def)/;
push(@timers_unsortet,$1.",".ReadingsVal($name, $readingsName, 0).",$readingsName"); # unsort Reading Wert in Array
$array_diff_cnt1++;
$array_diff_cnt2 = substr($readingsName,-2) * 1;
$array_diff = 1 if ($array_diff_cnt1 != $array_diff_cnt2 && $array_diff == 0);
}
}
my @timers_sort = sort @timers_unsortet; # Timer in neues Array sortieren
my $array_diff = 0;
for (my $i=0; $i<scalar(@timers_unsortet); $i++) {
$array_diff++ if ($timers_unsortet[$i] ne $timers_sort[$i]);
@ -466,7 +471,7 @@ sub Timer_FW_Detail($$$$) {
my @timer_nr;
my $cnt_max = scalar(@names);
return $html if((!AttrVal($name, "room", undef) && $FW_room ne "") || ($Table_View_in_room eq "off" && $FW_room ne ""));
return $html if((!AttrVal($name, "room", undef) && $FW_detail eq "") || ($Table_View_in_room eq "off" && $FW_detail eq ""));
if ($Table_Style eq "on") {
### style via CSS for Checkbox ###