FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

change get ShuttersInformation, add SummaryFn

Browse Source
This commit is contained in:
Marko Oldenburg 2020-01-14 10:52:17 +01:00
parent 85d5ffefba
commit 42e4fdcc44
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
73_AutoShuttersControl.pm
View File

@ -323,6 +323,7 @@ sub Initialize($) {
. 'ASC_debug:1 ' . 'ASC_debug:1 '
. $readingFnAttributes; . $readingFnAttributes;
$hash->{NotifyOrderPrefix} = '51-'; # Order Nummer für NotifyFn $hash->{NotifyOrderPrefix} = '51-'; # Order Nummer für NotifyFn
$hash->{FW_detailFn} = 'FHEM::AutoShuttersControl::ShuttersInformation';
return FHEM::Meta::InitMod( __FILE__, $hash ); return FHEM::Meta::InitMod( __FILE__, $hash );
} }
@ -680,20 +681,13 @@ sub Get($$@) {
my ( $cmd, @args ) = @aa; my ( $cmd, @args ) = @aa;
if ( lc $cmd eq 'showshuttersinformations' ) { if ( lc $cmd eq 'shownotifydevsinformations' ) {
return "usage: $cmd" if ( @args != 0 );
my $ret = GetShuttersInformation($hash);
return $ret;
}
elsif ( lc $cmd eq 'shownotifydevsinformations' ) {
return "usage: $cmd" if ( @args != 0 ); return "usage: $cmd" if ( @args != 0 );
my $ret = GetMonitoredDevs($hash); my $ret = GetMonitoredDevs($hash);
return $ret; return $ret;
} }
else { else {
my $list = ""; my $list = "";
$list .= " showShuttersInformations:noArg"
if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' );
$list .= " showNotifyDevsInformations:noArg" $list .= " showNotifyDevsInformations:noArg"
if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out'
and AttrVal( $name, 'ASC_expert', 0 ) == 1 ); and AttrVal( $name, 'ASC_expert', 0 ) == 1 );
@ -3197,9 +3191,12 @@ sub CreateNewNotifyDev($) {
$hash->{NOTIFYDEV} = $hash->{NOTIFYDEV} . $shuttersList; $hash->{NOTIFYDEV} = $hash->{NOTIFYDEV} . $shuttersList;
} }
sub GetShuttersInformation($) { sub ShuttersInformation($@) {
my $hash = shift;
my $ret = '<html><table><tr><td>'; my ($FW_wname, $d, $room, $pageHash) = @_;
my $hash = $defs{$d};
my $ret = '<html><table><tr><h3>ASC Configuration Summary</h3><td>';
$ret .= '<table class="block wide">'; $ret .= '<table class="block wide">';
$ret .= '<tr class="even">'; $ret .= '<tr class="even">';
$ret .= "<td><b>Shutters</b></td>"; $ret .= "<td><b>Shutters</b></td>";
@ -3275,7 +3272,8 @@ sub GetShuttersInformation($) {
$linecount++; $linecount++;
} }
$ret .= '</table></td></tr>'; $ret .= '</table></td></tr>';
$ret .= '</table></html>'; $ret .= '</table></html><br /><br />';
return $ret; return $ret;
} }
@ -7897,7 +7895,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.13", "version": "v0.8.14",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],