From a7fb7b33eaff352d0135c17f0f0740a8ff5f12a5 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Wed, 12 Jan 2022 10:41:23 -0800
Subject: [PATCH] fix event save on child node, fix command filter condition,
 add SideMenuAfterList

---
 definitions/en_CA.js               | 9 ++++++---
 libs/dropInEvents/mqtt.js          | 2 +-
 libs/events/utils.js               | 7 +++++--
 web/pages/blocks/home/menuSide.ejs | 1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/definitions/en_CA.js b/definitions/en_CA.js
index d777185e..33d0afc4 100644
--- a/definitions/en_CA.js
+++ b/definitions/en_CA.js
@@ -2869,7 +2869,6 @@ module.exports = function(s,config,lang){
                       "field": lang["Timeout Reset on Next Event"],
                       "description": "If there is an overlap in trigger record should it reset.",
                       "default": "1",
-                      "example": "",
                       "fieldType": "select",
                       "form-group-class": "h_det_input h_det_1",
                       "form-group-class-pre-layer": "h_rec_mtd_input h_rec_mtd_hot h_rec_mtd_sip",
@@ -2888,9 +2887,7 @@ module.exports = function(s,config,lang){
                        hidden: true,
                       "name": "detail=detector_delete_motionless_videos",
                       "field": lang['Delete Motionless Video'],
-                      "description": "",
                       "default": "0",
-                      "example": "",
                       "form-group-class": "h_det_input h_det_1",
                       "form-group-class-pre-layer": "h_rec_mtd_input h_rec_mtd_del",
                       "fieldType": "select",
@@ -7732,6 +7729,12 @@ module.exports = function(s,config,lang){
                          ]
                      }
                  ]
+              },
+              "SideMenuAfterList": {
+                 "name": "SideMenuAfterList",
+                 "noHeader": true,
+                 "noDefaultSectionClasses": true,
+                 "info": []
               }
            }
        },
diff --git a/libs/dropInEvents/mqtt.js b/libs/dropInEvents/mqtt.js
index f7eacfee..4c77a402 100644
--- a/libs/dropInEvents/mqtt.js
+++ b/libs/dropInEvents/mqtt.js
@@ -219,7 +219,7 @@ module.exports = (s,config,lang,app,io) => {
                {
                   "id": "mqttclient_list",
                   "fieldType": "div",
-              },
+               },
                {
                   "fieldType": "script",
                   "src": "assets/js/bs5.mqtt.js",
diff --git a/libs/events/utils.js b/libs/events/utils.js
index 0522c0ef..c854f3ed 100644
--- a/libs/events/utils.js
+++ b/libs/events/utils.js
@@ -402,7 +402,7 @@ module.exports = (s,config,lang,app,io) => {
                     ke: d.ke,
                     mid: d.id,
                     details: detailString,
-                    time: eventTime,
+                    time: s.formattedTime(eventTime),
                 }
             })
         }
@@ -439,7 +439,10 @@ module.exports = (s,config,lang,app,io) => {
             })
         }
 
-        if(filter.command && monitorDetails.detector_command_enable === '1' && !s.group[d.ke].activeMonitors[d.id].detector_command){
+        if(
+            filter.command ||
+            (monitorDetails.detector_command_enable === '1' && !s.group[d.ke].activeMonitors[d.id].detector_command)
+        ){
             s.group[d.ke].activeMonitors[d.id].detector_command = s.createTimeout('detector_command',s.group[d.ke].activeMonitors[d.id],monitorDetails.detector_command_timeout,10)
             var detector_command = addEventDetailsToString(d,monitorDetails.detector_command)
             if(detector_command === '')return
diff --git a/web/pages/blocks/home/menuSide.ejs b/web/pages/blocks/home/menuSide.ejs
index 55008de3..44b31fd8 100644
--- a/web/pages/blocks/home/menuSide.ejs
+++ b/web/pages/blocks/home/menuSide.ejs
@@ -65,6 +65,7 @@
                  </div>
               </div>
           </div>
+          <% drawBlock(define.SideMenu.blocks.SideMenuAfterList) %>
           <% if(showMonitors){ %>
               <div>
                   <div class="form-group px-3">