FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 12:46:03 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: change ShuttersInformation fn add table frame and whitespace-character to ShuttersInformation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25770 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2022-03-04 06:10:08 +00:00
parent 8a6385f21f
commit f212573e36
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- change: 73_AutoShuttersControl: change ShuttersInformation fn
add table frame and whitespace-character to ShuttersInformation
- feature: configDB: statefile versioning added - feature: configDB: statefile versioning added
- bugfix: 73_AutoShuttersControl: fix Comfort drive then target pos 0 - bugfix: 73_AutoShuttersControl: fix Comfort drive then target pos 0
- bugfix: 70_ESCVP21net: added cyclicConnect attr - bugfix: 70_ESCVP21net: added cyclicConnect attr

2
fhem/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>"
], ],

35
fhem/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++;
} }