Merge pull request 'dev' (#102) from dev into main

Reviewed-on: https://git.cooltux.net/FHEM/mod-AutoShuttersControl/pulls/102
fhem · Mar 4, 2022 · cca6e90 · cca6e90
2 parents 97caf64 + de5d6cb
commit cca6e90
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/FHEM/73_AutoShuttersControl.pm b/FHEM/73_AutoShuttersControl.pm
@@ -1462,7 +1462,7 @@ __END__
   ],
   "release_status": "stable",
   "license": "GPL_2",
-  "version": "v0.10.21",
+  "version": "v0.10.22",
   "author": [
     "Marko Oldenburg <[email protected]>"
   ],

diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt
@@ -1,10 +1,10 @@
-UPD 2022-01-15_15:48:05 116177 FHEM/73_AutoShuttersControl.pm
-UPD 2022-02-01_09:11:59 75817 lib/FHEM/Automation/ShuttersControl.pm
+UPD 2022-03-04_06:58:36 116177 FHEM/73_AutoShuttersControl.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 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 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 2209 lib/FHEM/Automation/ShuttersControl/Window.pm
 UPD 2022-01-14_08:49:13 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

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