mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

98_HMtemplate:update visibility of used templates during usage

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14373 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876
2017-05-25 17:53:13 +00:00
parent 1d1de6b0d6
commit c03813a407
1 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/FHEM/98_HMtemplate.pm
View File

@@ -81,7 +81,7 @@ sub HMtemplate_Attr(@) {#######################################################
my ($cmd,$name,$attrName,$attrVal) = @_; my ($cmd,$name,$attrName,$attrVal) = @_;
my @hashL; my @hashL;
my $hash = $defs{$name}; my $hash = $defs{$name};
return "$attrName not an option in this state" if($modules{HMtemplate}{AttrList}!~ m/$attrName/); #return "$attrName not an option in this state" if($modules{HMtemplate}{AttrList}!~ m/$attrName/);
if ($attrName =~ m/^Reg_/){ if ($attrName =~ m/^Reg_/){
if (!$init_done){ if (!$init_done){
return "remove attr $attrName after restart - start again with template definition"; return "remove attr $attrName after restart - start again with template definition";
@@ -188,6 +188,10 @@ sub HMtemplate_Attr(@) {#######################################################
if ($cmd eq "set"){ if ($cmd eq "set"){
} }
} }
elsif($attrName eq "tpl_description"){# used with select option
if ($cmd eq "set"){
}
}
return; return;
} }
@@ -243,6 +247,7 @@ sub HMtemplate_SetFn($@) {#####################################################
$cmd = "?" if(!$cmd);# by default print options $cmd = "?" if(!$cmd);# by default print options
$cmd .=" " if ($cmd ne "?" && !(grep /$cmd/,@{$HtState{${$eSt}}{cmd}})); $cmd .=" " if ($cmd ne "?" && !(grep /$cmd/,@{$HtState{${$eSt}}{cmd}}));
HMtemplate_setUsageReading($hash);
if ($cmd eq "delete" ) {##actionImmediate: delete template-------------- if ($cmd eq "delete" ) {##actionImmediate: delete template--------------
my ($tName) = @a; my ($tName) = @a;
return "$tName is not defined" if (! defined $culHmTpl->{$tName}); return "$tName is not defined" if (! defined $culHmTpl->{$tName});
@@ -339,7 +344,6 @@ sub HMtemplate_SetFn($@) {#####################################################
} }
} }
elsif ($cmd eq "apply" ) {# elsif ($cmd eq "apply" ) {#
my @p = split(" ",$culHmTpl->{$hash->{tpl_Name}}{p});## get params in correct order my @p = split(" ",$culHmTpl->{$hash->{tpl_Name}}{p});## get params in correct order
$_ = $attr{$name}{"tpl_param_$_"} foreach (@p); $_ = $attr{$name}{"tpl_param_$_"} foreach (@p);
return HMinfo_templateSet( $attr{$name}{tpl_entity} return HMinfo_templateSet( $attr{$name}{tpl_entity}
@@ -348,7 +352,6 @@ sub HMtemplate_SetFn($@) {#####################################################
:$attr{$name}{tpl_ePeer}.":".AttrVal($name,"tpl_eType","both"))# type either long/short/both :$attr{$name}{tpl_ePeer}.":".AttrVal($name,"tpl_eType","both"))# type either long/short/both
,@p ,@p
); );
return;
} }
elsif ($cmd eq "edit" ) {# elsif ($cmd eq "edit" ) {#
my ($templ) = @a; my ($templ) = @a;
@@ -507,6 +510,21 @@ sub HMtemplate_sourceList($){
return HMtemplate_noDup(@list); return HMtemplate_noDup(@list);
} }
sub HMtemplate_setUsageReading($){
my ($hash) = @_;
delete $hash->{READINGS}{$_} foreach (grep /^usage_/,keys %{$hash->{READINGS}});
if (eval "defined(&HMinfo_templateUsg)" && $hash->{tpl_Name}){
my $tu = HMinfo_templateUsg("","",$hash->{tpl_Name});
$tu =~ s/\|$hash->{tpl_Name}//g;
$tu =~ s/.\|/|/g;
my $usgCnt = 1;
readingsBeginUpdate($hash);
readingsBulkUpdate($hash,"usage_".$usgCnt++,$_) foreach(split("\n",$tu));
readingsEndUpdate($hash,1);
}
}
1; 1;
=pod =pod
=item command =item command
@@ -538,7 +556,7 @@ sub HMtemplate_sourceList($){
</li> </li>
<li><B><a href="#HMtemplate_tpl_source">tpl_source</a></B>select the entity which will be used as master for the template <li><B><a href="#HMtemplate_tpl_source">tpl_source</a></B>select the entity which will be used as master for the template
</li> </li>
<li><B><a href="#HMtemplate_tpl_peer">tpl_peer</a></B>select the peer of the entity which will be used as master for the template. This is onle necessary for types that require peers. <li><B><a href="#HMtemplate_tpl_peer">tpl_peer</a></B>select the peer of the entity which will be used as master for the template. This is only necessary for types that require peers.
</li> </li>
<li><B><a href="#HMtemplate_tpl_params">tpl_params</a></B>if the template shall have parameter those need to be defined next. <br> <li><B><a href="#HMtemplate_tpl_params">tpl_params</a></B>if the template shall have parameter those need to be defined next. <br>
parameter will allow to use one template with selected registers to be defined upon appling to the entity. parameter will allow to use one template with selected registers to be defined upon appling to the entity.
@@ -575,6 +593,8 @@ sub HMtemplate_sourceList($){
</ul> </ul>
=end html
=begin html_DE =begin html_DE
<a name="HMtemplate"></a> <a name="HMtemplate"></a>