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

Merge pull request 'patch-informationTable' (#101) from patch-informationTable into dev

Browse Source 
Reviewed-on: #101
This commit is contained in:
Marko Oldenburg
2022-03-04 07:03:20 +01:00
parent 6bf2b17d6f 4925e654ec
commit de5d6cbc6a
3 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/73_AutoShuttersControl.pm
View File

@@ -1462,7 +1462,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.21", "version": "v0.10.22",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

6
controls_AutoShuttersControl.txt
View File

@@ -1,10 +1,10 @@
UPD 2022-01-15_15:48:05 116177 FHEM/73_AutoShuttersControl.pm UPD 2022-03-04_06:58:36 116177 FHEM/73_AutoShuttersControl.pm
UPD 2022-02-01_09:11:59 75817 lib/FHEM/Automation/ShuttersControl.pm UPD 2022-03-04_06:55:50 76011 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-14_08:49:13 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2022-01-14_08:49:13 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-14_08:49:13 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2022-01-14_08:49:13 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-01-14_08:49:13 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2022-01-14_08:49:13 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2022-01-14_08:49:13 25452 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2022-01-14_08:49:13 25452 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2022-03-02_16:46:29 112109 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2022-03-02_16:50:08 112109 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2022-01-14_08:49:13 40603 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2022-01-14_08:49:13 40603 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2022-01-14_08:49:13 2209 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2022-01-14_08:49:13 2209 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2022-01-14_08:49:13 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2022-01-14_08:49:13 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

35
lib/FHEM/Automation/ShuttersControl.pm
View File

@@ -1582,8 +1582,8 @@ sub ShuttersInformation {
|| !defined( $shutters->getSunsetUnixTime ) ); || !defined( $shutters->getSunsetUnixTime ) );
my $ret = my $ret =
'<html><table><tr><h3>ASC Configuration and Information Summary</h3><td>'; '<html><table border rules=all border frame=box><tr><h3>ASC Configuration and Information Summary</h3><td>';
$ret .= '<table class="block wide">'; $ret .= '<table class="block wide" rules=all>';
$ret .= '<tr class="even">'; $ret .= '<tr class="even">';
$ret .= "<td><b>Shutters</b></td>"; $ret .= "<td><b>Shutters</b></td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
@@ -1618,43 +1618,44 @@ sub ShuttersInformation {
if ( $linecount % 2 == 0 ) { $ret .= '<tr class="even">'; } if ( $linecount % 2 == 0 ) { $ret .= '<tr class="even">'; }
else { $ret .= '<tr class="odd">'; } else { $ret .= '<tr class="odd">'; }
$ret .= "<td>$shuttersDev</td>"; $ret .= "<td>&nbsp;$shuttersDev&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" $ret .= "<td>&nbsp;"
. strftime( "%d.%m.%Y - %H:%M:%S", . strftime( "%d.%m.%Y - %H:%M:%S",
localtime( $shutters->getSunriseUnixTime ) ) localtime( $shutters->getSunriseUnixTime ) )
. "</td>"; . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" $ret .= "<td>&nbsp;"
. strftime( "%d.%m.%Y - %H:%M:%S", . strftime( "%d.%m.%Y - %H:%M:%S",
localtime( $shutters->getSunsetUnixTime ) ) localtime( $shutters->getSunsetUnixTime ) )
. "</td>"; . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getUp . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getUp . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getDown . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getDown . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getModeUp . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getModeUp . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getModeDown . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getModeDown . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getPartyMode . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getPartyMode . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getLockOut . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getLockOut . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" $ret .= "<td>"
. ::ReadingsVal( $shuttersDev, 'ASC_ShuttersLastDrive', 'none' ) . ::ReadingsVal( $shuttersDev, 'ASC_ShuttersLastDrive', 'none' )
. "</td>"; . "</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getStatus . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getStatus . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" . $shutters->getLastPos . "</td>"; $ret .= "<td>&nbsp;" . $shutters->getLastPos . "&nbsp;</td>";
$ret .= "<td> </td>"; $ret .= "<td> </td>";
$ret .= "<td>" $ret .=
"<td>&nbsp;"
. $shutters->getShadingStatus . ' - ' . $shutters->getShadingStatus . ' - '
. strftime( "%H:%M:%S", . strftime( "%H:%M:%S",
localtime( $shutters->getShadingStatusTimestamp ) ) localtime( $shutters->getShadingStatusTimestamp ) )
. "</td>"; . "&nbsp;</td>";
$ret .= '</tr>'; $ret .= '</tr>';
$linecount++; $linecount++;
} }