FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

22_HOMEMODE: v1.1.2 - fix showing details in detail view although if not set to do so, add missing substitution for placeholder %SENSORSBATTERY%, add max-width to homeinfopanel

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14376 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2017-05-25 19:41:04 +00:00
parent 74ceb25dbe
commit 5c667d8198
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/22_HOMEMODE.pm
View File

@ -16,7 +16,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use vars qw{%attr %defs %modules}; use vars qw{%attr %defs %modules};
my $HOMEMODE_version = "1.1.1"; my $HOMEMODE_version = "1.1.2";
my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night"; my $HOMEMODE_Daytimes = "05:00|morning 10:00|day 14:00|afternoon 18:00|evening 23:00|night";
my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter"; my $HOMEMODE_Seasons = "03.01|spring 06.01|summer 09.01|autumn 12.01|winter";
my $HOMEMODE_UserModes = "gotosleep,awoken,asleep"; my $HOMEMODE_UserModes = "gotosleep,awoken,asleep";
@ -338,7 +338,7 @@ sub HOMEMODE_Notify($$)
foreach my $device (devspec2array("TYPE=$prestype:FILTER=presence=(maybe.)?(absent|present|appeared|disappeared)")) foreach my $device (devspec2array("TYPE=$prestype:FILTER=presence=(maybe.)?(absent|present|appeared|disappeared)"))
{ {
next if (lc($device) !~ /$residentregex/); next if (lc($device) !~ /$residentregex/);
push @presentdevicespresent,$device if (ReadingsVal($device,"presence","absent") =~ /^(present|appeared|maybe.absent)$/); push @presentdevicespresent,$device if (ReadingsVal($device,"presence","") =~ /^(present|appeared|maybe.absent)$/);
} }
if (grep /^.*:\s(present|appeared)$/,@{$events}) if (grep /^.*:\s(present|appeared)$/,@{$events})
{ {
@ -1944,6 +1944,7 @@ sub HOMEMODE_replacePlaceholders($$;$)
$cmd =~ s/%PREVMOTION%/$pmotion/g; $cmd =~ s/%PREVMOTION%/$pmotion/g;
$cmd =~ s/%SEASON%/$season/g; $cmd =~ s/%SEASON%/$season/g;
$cmd =~ s/%SELF%/$name/g; $cmd =~ s/%SELF%/$name/g;
$cmd =~ s/%SENSORSBATTERY%/$sensorsbattery/g;
$cmd =~ s/%SENSORSCONTACT%/$sensorscontact/g; $cmd =~ s/%SENSORSCONTACT%/$sensorscontact/g;
$cmd =~ s/%SENSORSENERGY%/$sensorsenergy/g; $cmd =~ s/%SENSORSENERGY%/$sensorsenergy/g;
$cmd =~ s/%SENSORSMOTION%/$sensorsmotion/g; $cmd =~ s/%SENSORSMOTION%/$sensorsmotion/g;
@ -2938,7 +2939,7 @@ sub HOMEMODE_checkIP($;$)
sub HOMEMODE_Details($$$) sub HOMEMODE_Details($$$)
{ {
my ($FW_name,$name,$room) = @_; my ($FW_name,$name,$room) = @_;
return if ((AttrVal($name,"HomeAdvancedDetails","none") eq "none") || (!$room && AttrVal($name,"HomeAdvancedDetails","none") eq "room")); return if (AttrVal($name,"HomeAdvancedDetails","none") eq "none" || (AttrVal($name,"HomeAdvancedDetails","") eq "room" && $FW_detail eq $name));
my $hash = $defs{$name}; my $hash = $defs{$name};
my $html = "<div>"; my $html = "<div>";
$html .= "<style>.homehover{cursor:pointer}.homeinfo{display:none}.tar{text-align:right}.homeinfopanel{min-height:30px;padding:3px 10px}</style>"; $html .= "<style>.homehover{cursor:pointer}.homeinfo{display:none}.tar{text-align:right}.homeinfopanel{min-height:30px;padding:3px 10px}</style>";