Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

95_FLOORPLAN: fixed devicecommands, fixed excess logentries during rereadcfg

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9295 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ulimaass 2015-09-24 16:30:29 +00:00
parent efb73d84a5
commit c56e7ad094
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fhem/FHEM/95_FLOORPLAN.pm
View File

@ -50,6 +50,7 @@
# added processing of global userattr fp_<name> and their value per device for rename, copy, delete (Jan 31, 2015) # added processing of global userattr fp_<name> and their value per device for rename, copy, delete (Jan 31, 2015)
# 0039: added style 8 for commands-popup provided by André (justme68) (Feb 17, 2015) # 0039: added style 8 for commands-popup provided by André (justme68) (Feb 17, 2015)
# 0040: fixed "no commands for IT devices", drag&drop won't switch device-status anymore (June 15, 2015) # 0040: fixed "no commands for IT devices", drag&drop won't switch device-status anymore (June 15, 2015)
# 0041: fixed eventmap, excess "delete"-messages during rereadconfig (Sept 24, 2015)
# #
################################################################ ################################################################
# #
@ -208,7 +209,7 @@ FP_define(){
sub sub
FP_undefine($$) { FP_undefine($$) {
my ($hash,$arg) = @_; my ($hash,$arg) = @_;
FP_copy_rename_delete('delete',$hash->{NAME},undef); FP_copy_rename_delete('delete',$hash->{NAME},undef) if ($reread_active != 1); # do not execute during rereadcfg
return undef; return undef;
} }
@ -585,8 +586,8 @@ FP_show(){
FW_pO "\n<div fp_style=\"$style\" fp_text=\"$text\" fp_text2=\"$t2\" fp_name=\"$FP_name\" class=\"fp_device_div\" style=\"position:absolute; top:".$top."px; left:".$left."px;\" id=\"div-$d\">"; FW_pO "\n<div fp_style=\"$style\" fp_text=\"$text\" fp_text2=\"$t2\" fp_name=\"$FP_name\" class=\"fp_device_div\" style=\"position:absolute; top:".$top."px; left:".$left."px;\" id=\"div-$d\">";
FW_pO "<form method=\"$FW_formmethod\" action=\"$FW_ME/floorplan/$FP_name/$d\" autocomplete=\"off\">"; FW_pO "<form method=\"$FW_formmethod\" action=\"$FW_ME/floorplan/$FP_name/$d\" autocomplete=\"off\">";
FW_pO " <table class=\"$type fp_$FP_name\" id=\"table-$d\" align=\"center\">"; # Main table per device FW_pO " <table class=\"$type fp_$FP_name\" id=\"table-$d\" align=\"center\">"; # Main table per device
my ($allSets, $cmdlist, $txt) = FW_devState($d, ""); my ($allSets, $cmdlist, $txt) = FW_devState($d, '');
$allSets = FW_widgetOverride($d, $allSets); $allSets = FW_widgetOverride($d, $allSets);
$txt = ReadingsVal($d, $text, "Undefined Reading $d-<b>$text</b>") if ($style == 3 || $style == 6); # Style3+6 = DeviceReading given in $text $txt = ReadingsVal($d, $text, "Undefined Reading $d-<b>$text</b>") if ($style == 3 || $style == 6); # Style3+6 = DeviceReading given in $text
my $cols = ($cmdlist ? (split(":", $cmdlist)) : 0); # Need command-count for colspan of devicename+state my $cols = ($cmdlist ? (split(":", $cmdlist)) : 0); # Need command-count for colspan of devicename+state
@ -654,14 +655,14 @@ FP_show(){
######################## ########################
# Commands per device # Commands per device
if($cmdlist && ( $style == 2 || $style == 5 || $style == 7 || $style == 8) ) { if($cmdlist && ( $style == 2 || $style == 5 || $style == 7 || $style == 8) ) {
my @cList = split(":", $cmdlist); my @a = split("[: ]", AttrVal($d, "cmdIcon", "")); #new
my @rList = map { ReplaceEventMap($d,$_,1) } @cList; Log 1, "ERROR: bad cmdIcon definition for $d" if(@a % 2); #new
my %cmdIcon = @a; #new
my $firstIdx = 0; my $firstIdx = 0;
FW_pO " <tr class=\"devicecommands\" id=\"$d-devicecommands\">"; FW_pO " <tr class=\"devicecommands\" id=\"$d-devicecommands\">";
my $oldMe = $FW_ME; my $oldMe = $FW_ME;
my $h = ""; my $h = "";
foreach my $cmd (sort @cList) { foreach my $cmd (split(":", $cmdlist)) {
# Special handling (slider, dropdown, timepicker, ...) # Special handling (slider, dropdown, timepicker, ...)
my $htmlTxt; my $htmlTxt;
my @c = split(' ', $cmd); my @c = split(' ', $cmd);
@ -688,15 +689,16 @@ FP_show(){
$h .= "<p><a href='$FW_ME$FW_subdir?$link$FW_CSRF'>$cmd</a></p>"; $h .= "<p><a href='$FW_ME$FW_subdir?$link$FW_CSRF'>$cmd</a></p>";
} }
} else { } else {
if(defined($htmlTxt && $htmlTxt ne '')) { if ($htmlTxt ne '') {
$htmlTxt =~ s/>desired-temp/>/; #for FHT $htmlTxt =~ s/>desired-temp/>/; #for FHT
$htmlTxt =~ s/>desiredTemperature/>/; #for MAX! $htmlTxt =~ s/>desiredTemperature/>/; #for MAX!
FW_pO $htmlTxt; FW_pO $htmlTxt;
} else {
my $nCmd = $cmdIcon{$cmd} ?
FW_makeImage($cmdIcon{$cmd},$cmd,"webCmd") : $cmd;
FW_pH "cmd.$d=set $d $cmd", $nCmd, 1, "col3";
}
# END # Special handling (slider, dropdown, timepicker, ...) # END # Special handling (slider, dropdown, timepicker, ...)
} else {
FW_pH "cmd.$d=set $d $cmd",
ReplaceEventMap($d,$cmd,1),1,"devicecommands";
}
} }
} }
$FW_ME = $oldMe; $FW_ME = $oldMe;