- Updated ZWaveLib (fixes node addding functionality bug on first nod…

…e added) - Fixed MqttClientHelper.cs connect/disconnect handling issues - Added WithTls option to MqttClientHelper.cs - Added MqttClientOptionsBuilder action callback to Connect method to allow specifying of advanced client options - Made MQTTnet library directly available to C# programs - Updated Interconnection/ MQTT network app - Other minor UI fixes
genielabs · Jun 13, 2020 · 758efed · 758efed
1 parent ebdd155
commit 758efed
Show file tree

Hide file tree

Showing 10 changed files with 330 additions and 214 deletions.
diff --git a/BaseFiles/Common/html/css/my.css b/BaseFiles/Common/html/css/my.css
@@ -240,6 +240,10 @@ input[type=number] {
     max-width: 90%;
 }
 
+#automation_group_module_edit-popup {
+    width: 400px;
+}
+
 .hg-event-popup {
     position: fixed;
     background-color: black;
@@ -684,6 +688,10 @@ div.ui-page-theme-a div.ui-body-inherit img.auto-invert, div.ui-bar-inherit img.
 .hg-scheduler-table-row {
 }
 
+#groups_panel {
+    width: 300px;
+}
+
 #module_programs_featurelist {
     max-height: 40px; overflow: hidden;
     vertical-align: middle;
@@ -808,10 +816,13 @@ div.ui-page-theme-a .ui-icon-microphone:after {
 /**** media queries ****/
 
 /** Small Mobile **/
-@media only screen and (max-width: 480px), only screen and (max-device-width: 480px) {
+@media only screen and (max-width: 420px), only screen and (max-device-width: 420px) {
     .hg-event-popup {
         display: none;
     }
+    #automation_group_module_edit-popup {
+        width: 360px;
+    }
 }
 
 

diff --git a/BaseFiles/Common/html/pages/configure/programengine/_programslist.js b/BaseFiles/Common/html/pages/configure/programengine/_programslist.js
@@ -253,6 +253,7 @@ HG.WebApp.ProgramsList = HG.WebApp.ProgramsList || new function () { var $$ = th
             for (var p = 0; p < arr.length; p++) {
                 var mp = arr[p];
                 if (typeof mp.FieldType != 'undefined' && mp.FieldType != null && mp.FieldType.trim() != '') {
+                    mp.Index = pc;
                     var context = {
                         parent: fieldparams,
                         program: cp,
@@ -633,7 +634,7 @@ HG.WebApp.ProgramsList = HG.WebApp.ProgramsList || new function () { var $$ = th
                 //
                 $('#automation_programname').val(currentProgram.Name);
                 $('#automation_programdescription').val(currentProgram.Description);
-                
+
                 $('#automation_program_autorestartenabled').prop('checked', currentProgram.AutoRestartEnabled);
                 $('#automation_program_autorestartenabled').checkboxradio();
                 $('#automation_program_autorestartenabled').checkboxradio('refresh');
@@ -745,7 +746,7 @@ HG.WebApp.ProgramsList = HG.WebApp.ProgramsList || new function () { var $$ = th
                 transition: 'slideDown'
             });
     };
-    
+
     $$.ToggleProgramIsEnabled = function (paddr) {
         var cp = HG.WebApp.Utility.GetProgramByAddress(paddr);
         cp.IsEnabled = !cp.IsEnabled;

diff --git a/BaseFiles/Common/html/pages/control/_control.js b/BaseFiles/Common/html/pages/control/_control.js
@@ -575,7 +575,7 @@ HG.WebApp.Control = HG.WebApp.Control || new function() { var $$ = this;
         //$$.field('#control_groupsmenu', true).find("li:gt(0)").remove();
         $$.field('#control_groupsmenu', true).empty();
         for (i = 0; i < HG.WebApp.Data.Groups.length; i++) {
-            var indicators = '<div class="ui-body-inherit ui-body-a" style="margin-top:6px;border:0"><div style="white-space:normal;max-width:230px" id="control_groupindicators_' + i + '"></div>';
+            var indicators = '<div class="ui-body-inherit ui-body-a" style="margin-top:6px;border:0"><div style="white-space:normal;max-width:290px" id="control_groupindicators_' + i + '"></div>';
             var item = $('<li data-context-idx="' + i + '" style="height:auto;cursor:pointer;font-size:12pt"><strong>' + HG.WebApp.Data.Groups[i].Name + '</strong>'+indicators+'</li>');
             item.on('click', function(){
                 var idx = $(this).attr('data-context-idx');

diff --git a/BaseFiles/Common/modules.xml b/BaseFiles/Common/modules.xml
@@ -1156,13 +1156,6 @@
         <FieldType>text</FieldType>
         <UpdateTime>2019-01-16T02:57:30.679447Z</UpdateTime>
       </ModuleParameter>
-      <ModuleParameter>
-        <Name>ConfigureOptions.Password</Name>
-        <Value />
-        <Description>6. Password (optional)</Description>
-        <FieldType>text</FieldType>
-        <UpdateTime>2019-01-16T02:57:26.248044Z</UpdateTime>
-      </ModuleParameter>
       <ModuleParameter>
         <Name>ConfigureOptions.ServerAddress</Name>
         <Value />
@@ -1177,26 +1170,40 @@
         <FieldType>text</FieldType>
         <UpdateTime>2019-01-16T02:57:30.679903Z</UpdateTime>
       </ModuleParameter>
+      <ModuleParameter>
+        <Name>ConfigureOptions.TLS</Name>
+        <Value/>
+        <Description>3. Connect using WebSockets</Description>
+        <FieldType>checkbox</FieldType>
+        <UpdateTime>2019-01-16T02:57:30.680659Z</UpdateTime>
+      </ModuleParameter>
+      <ModuleParameter>
+        <Name>ConfigureOptions.WebSockets</Name>
+        <Value/>
+        <Description>4. Connect using TLS/SSL</Description>
+        <FieldType>checkbox</FieldType>
+        <UpdateTime>2019-01-16T02:57:30.680659Z</UpdateTime>
+      </ModuleParameter>
       <ModuleParameter>
         <Name>ConfigureOptions.ServerTopic</Name>
         <Value>j4pi82PQEHeb4jgboRapLw==</Value>
-        <Description>4. Topic</Description>
+        <Description>5. Topic</Description>
         <FieldType>text</FieldType>
         <UpdateTime>2019-01-16T02:57:30.680294Z</UpdateTime>
       </ModuleParameter>
       <ModuleParameter>
         <Name>ConfigureOptions.Username</Name>
         <Value />
-        <Description>5. Username (optional)</Description>
+        <Description>6. Username (optional)</Description>
         <FieldType>text</FieldType>
         <UpdateTime>2019-01-16T02:57:26.248042Z</UpdateTime>
       </ModuleParameter>
       <ModuleParameter>
-        <Name>ConfigureOptions.WebSockets</Name>
-        <Value/>
-        <Description>3. Connect using WebSockets</Description>
-        <FieldType>checkbox</FieldType>
-        <UpdateTime>2019-01-16T02:57:30.680659Z</UpdateTime>
+        <Name>ConfigureOptions.Password</Name>
+        <Value />
+        <Description>7. Password (optional)</Description>
+        <FieldType>text</FieldType>
+        <UpdateTime>2019-01-16T02:57:26.248044Z</UpdateTime>
       </ModuleParameter>
       <ModuleParameter>
         <Name>Program.Notification</Name>