FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 16:05:19 +00:00
Code Issues Releases Wiki Activity

FHEMWEB.pm: optional type(set/get/attr) in widgetOverride (Forum #130891)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26861 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2022-12-16 08:57:05 +00:00
parent f489864982
commit bc6f2bb380
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fhem/FHEM/01_FHEMWEB.pm
View File

@ -51,7 +51,7 @@ sub FW_textfield($$$);
sub FW_textfieldv($$$$); sub FW_textfieldv($$$$);
sub FW_updateHashes(); sub FW_updateHashes();
sub FW_visibleDevices(;$); sub FW_visibleDevices(;$);
sub FW_widgetOverride($$); sub FW_widgetOverride($$;$);
sub FW_Read($$); sub FW_Read($$);
use vars qw($FW_dir); # base directory for web server use vars qw($FW_dir); # base directory for web server
@ -1578,9 +1578,9 @@ FW_doDetail($)
FW_pO FW_detailSelect($d, "set", FW_pO FW_detailSelect($d, "set",
FW_widgetOverride($d, getAllSets($d, $FW_chash))); FW_widgetOverride($d, getAllSets($d, $FW_chash), "set"));
FW_pO FW_detailSelect($d, "get", FW_pO FW_detailSelect($d, "get",
FW_widgetOverride($d, getAllGets($d, $FW_chash))); FW_widgetOverride($d, getAllGets($d, $FW_chash), "get"));
FW_makeTable("Internals", $d, $h); FW_makeTable("Internals", $d, $h);
FW_makeTable("Readings", $d, $h->{READINGS}); FW_makeTable("Readings", $d, $h->{READINGS});
@ -1594,7 +1594,7 @@ FW_doDetail($)
$attrList =~ s/\broom\b/room:$roomList/; $attrList =~ s/\broom\b/room:$roomList/;
$attrList =~ s/\bgroup\b/group:$groupList/; $attrList =~ s/\bgroup\b/group:$groupList/;
$attrList = FW_widgetOverride($d, $attrList); $attrList = FW_widgetOverride($d, $attrList, "attr");
$attrList =~ s/\\/\\\\/g; $attrList =~ s/\\/\\\\/g;
$attrList =~ s/'/\\'/g; $attrList =~ s/'/\\'/g;
FW_pO FW_detailSelect($d, "attr", $attrList, undef, \%attrTypeHash); FW_pO FW_detailSelect($d, "attr", $attrList, undef, \%attrTypeHash);
@ -1928,7 +1928,7 @@ FW_makeDeviceLine($$$$$)
my $cl2 = $cmdlist; $cl2 =~ s/ [^:]*//g; $cl2 =~ s/:/ /g; # Forum #74053 my $cl2 = $cmdlist; $cl2 =~ s/ [^:]*//g; $cl2 =~ s/:/ /g; # Forum #74053
$allSets = "$allSets $cl2"; $allSets = "$allSets $cl2";
} }
$allSets = FW_widgetOverride($d, $allSets); $allSets = FW_widgetOverride($d, $allSets, "set");
my $colSpan = ($usuallyAtEnd->{$d} ? ' colspan="2"' : ''); my $colSpan = ($usuallyAtEnd->{$d} ? ' colspan="2"' : '');
FW_pO "<td informId=\"$d\"$colSpan>$txt</td>"; FW_pO "<td informId=\"$d\"$colSpan>$txt</td>";
@ -3323,7 +3323,7 @@ FW_devState($$@)
my $cmdList = AttrVal($d, "webCmd", $defs{$d}{webCmd}); my $cmdList = AttrVal($d, "webCmd", $defs{$d}{webCmd});
$cmdList = "" if(!defined($cmdList)); $cmdList = "" if(!defined($cmdList));
my $allSets = FW_widgetOverride($d, getAllSets($d, $FW_chash)); my $allSets = FW_widgetOverride($d, getAllSets($d, $FW_chash), "set");
my $state = $defs{$d}{STATE}; my $state = $defs{$d}{STATE};
$state = "" if(!defined($state)); $state = "" if(!defined($state));
@ -3632,9 +3632,9 @@ FW_ActivateInform($;$)
} }
sub sub
FW_widgetOverride($$) FW_widgetOverride($$;$)
{ {
my ($d, $str) = @_; my ($d, $str, $type) = @_;
return $str if(!$str); return $str if(!$str);
@ -3646,6 +3646,10 @@ FW_widgetOverride($$)
push @list, split(" ", $fa) if($fa); push @list, split(" ", $fa) if($fa);
push @list, split(" ", $da) if($da); push @list, split(" ", $da) if($da);
foreach my $na (@list) { foreach my $na (@list) {
if($type && $na =~ m/^([^:]*)@(set|get|attr):(.*)/) {
next if($2 ne $type);
$na = "$1:$3";
}
my ($n,$a) = split(":", $na, 2); my ($n,$a) = split(":", $na, 2);
$str =~ s/\b($n)\b(:[^ ]*)?/$1:$a/g; $str =~ s/\b($n)\b(:[^ ]*)?/$1:$a/g;
} }
@ -4514,6 +4518,8 @@ FW_log($$)
<li>widgetOverride<br> <li>widgetOverride<br>
Space separated list of name:modifier pairs, to override the widget Space separated list of name:modifier pairs, to override the widget
for a set/get/attribute specified by the module author. for a set/get/attribute specified by the module author.
To specify the widget for a specific type, use the name@type:modifier
syntax, where type is one of set, get and attr.
Following is the list of known modifiers: Following is the list of known modifiers:
<ul> <ul>
<!-- INSERT_DOC_FROM: www/pgm2/fhemweb.*.js --> <!-- INSERT_DOC_FROM: www/pgm2/fhemweb.*.js -->
@ -5360,10 +5366,11 @@ FW_log($$)
<a id="FHEMWEB-attr-widgetOverride"></a> <a id="FHEMWEB-attr-widgetOverride"></a>
<li>widgetOverride<br> <li>widgetOverride<br>
Leerzeichen separierte Liste von Name/Modifier Paaren, mit dem man den Leerzeichen separierte Liste von Name:Modifier Paaren, mit dem man den
vom Modulautor f&uuml;r einen bestimmten Parameter (Set/Get/Attribut) vom Modulautor f&uuml;r einen bestimmten Parameter (Set/Get/Attribut)
vorgesehene Widgets &auml;ndern kann. Folgendes ist die Liste der vorgesehenes Widget &auml;ndern kann. Die Syntax f&uuml;r eine
bekannten Modifier: Typspezifische &Auml;nderung ist Name@Typ:Modifier, wobei Typ set, get
oder attr sein kann. Folgendes ist die Liste der bekannten Modifier:
<ul> <ul>
<!-- INSERT_DOC_FROM: www/pgm2/fhemweb.*.js --> <!-- INSERT_DOC_FROM: www/pgm2/fhemweb.*.js -->
</ul></li> </ul></li>