FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 07:16:03 +00:00
Code Issues Releases Wiki Activity

88_Timer: fix FILTER

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21514 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
HomeAuto_User 2020-03-25 17:30:43 +00:00
parent 85fc892ae5
commit beb504b5a6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/88_Timer.pm
View File

@ -282,6 +282,7 @@ sub Timer_Get($$$@) {
my $list = "loadTimers:no,yes"; my $list = "loadTimers:no,yes";
my $cmd2 = $a[0]; my $cmd2 = $a[0];
my $Timer_cnt_name = -1; my $Timer_cnt_name = -1;
my $room = AttrVal($name, "room", "Unsorted");
if ($cmd eq "loadTimers") { if ($cmd eq "loadTimers") {
if ($cmd2 eq "no") { if ($cmd2 eq "no") {
@ -382,7 +383,7 @@ sub Timer_Get($$$@) {
Timer_PawList($hash); # list, Probably associated with Timer_PawList($hash); # list, Probably associated with
readingsSingleUpdate($hash, "state" , "Timers loaded", 1); readingsSingleUpdate($hash, "state" , "Timers loaded", 1);
FW_directNotify("FILTER=(room=)?$name", "#FHEMWEB:WEB", "location.reload('true')", ""); FW_directNotify("FILTER=(room=$room|$name)", "#FHEMWEB:WEB", "location.reload('true')", "");
Timer_Check($hash); Timer_Check($hash);
return undef; return undef;
@ -720,6 +721,7 @@ sub FW_pushed_savebutton {
my $cnt_names = scalar(@selected_buttons); my $cnt_names = scalar(@selected_buttons);
my $devicefound = 0; # to check device exists my $devicefound = 0; # to check device exists
my $reload = 0; my $reload = 0;
my $room = AttrVal($name, "room", "Unsorted");
my $timestamp = TimeNow(); # Time now -> 2016-02-16 19:34:24 my $timestamp = TimeNow(); # Time now -> 2016-02-16 19:34:24
my @timestamp_values = split(/-|\s|:/ , $timestamp); # Time now splitted my @timestamp_values = split(/-|\s|:/ , $timestamp); # Time now splitted
@ -817,12 +819,12 @@ sub FW_pushed_savebutton {
## popup user message (jump to javascript) ## ## popup user message (jump to javascript) ##
if ($popup != 0) { if ($popup != 0) {
FW_directNotify("FILTER=(room=)?$name", "#FHEMWEB:WEB", "show_popup(".$selected_buttons[0].")", ""); FW_directNotify("FILTER=(room=$room|$name)", "#FHEMWEB:WEB", "show_popup(".$selected_buttons[0].")", "");
$reload = 0 if ($reload != 0); # reset, need to right running $reload = 0 if ($reload != 0); # reset, need to right running
} }
## refresh site, need for userattr & right view checkboxes ## ## refresh site, need for userattr & right view checkboxes ##
FW_directNotify("FILTER=(room=)?$name", "#FHEMWEB:WEB", "location.reload('true')", "") if ($reload != 0); FW_directNotify("FILTER=(room=$room|$name)", "#FHEMWEB:WEB", "location.reload('true')", "") if ($reload != 0);
Timer_Check($hash) if ($selected_buttons[16] eq "1" && ReadingsVal($name, "internalTimer", "stop") eq "stop"); Timer_Check($hash) if ($selected_buttons[16] eq "1" && ReadingsVal($name, "internalTimer", "stop") eq "stop");