Added event name to scheduler event for script 'End'

genielabs · Mar 19, 2019 · ade244e · ade244e
1 parent df67e55
commit ade244e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/BaseFiles/Common/html/cli.html b/BaseFiles/Common/html/cli.html
@@ -114,8 +114,7 @@
             zuix.field('output').html(html+row);
             //writeToScreen(row);
 
-            var scroll = zuix.field('output').get();
-            scroll.scrollTop = scroll.scrollHeight;
+            scrollToBottom();
         }
 
         function onError(evt)
@@ -129,6 +128,11 @@
             pre.style.wordWrap = "break-word";
             pre.innerHTML = message;
             zuix.field('output').append(pre);
+            scrollToBottom()
+        }
+        function scrollToBottom() {
+            var scroll = zuix.field('output').get();
+            scroll.scrollTop = scroll.scrollHeight;
         }
 
         window.addEventListener("load", init, false);

diff --git a/HomeGenie/Automation/Scheduler/SchedulerScriptingEngine.cs b/HomeGenie/Automation/Scheduler/SchedulerScriptingEngine.cs
@@ -150,17 +150,17 @@ public void StartScript()
                     if (result != null && result.Exception != null && result.Exception.GetType() != typeof(TargetException))
                         homegenie.RaiseEvent(this, Domains.HomeAutomation_HomeGenie, SourceModule.Scheduler,
                             eventItem.Name, Properties.SchedulerScriptStatus,
-                            "Error (" + result.Exception.Message.Replace('\n', ' ').Replace('\r', ' ') + ")");
+                            eventItem.Name + ":Error (" + result.Exception.Message.Replace('\n', ' ').Replace('\r', ' ') + ")");
                 }
                 catch (ThreadAbortException)
                 {
                     programThread = null;
                     isRunning = false;
                     homegenie.RaiseEvent(this, Domains.HomeAutomation_HomeGenie, SourceModule.Scheduler, eventItem.Name,
-                        Properties.SchedulerScriptStatus, "Interrupted");
+                        Properties.SchedulerScriptStatus, eventItem.Name + ":Interrupted");
                 }
                 homegenie.RaiseEvent(this, Domains.HomeAutomation_HomeGenie, SourceModule.Scheduler, eventItem.Name,
-                    Properties.SchedulerScriptStatus, "End");
+                    Properties.SchedulerScriptStatus, eventItem.Name + ":End");
             });
 
             try