From 0e5779874010cd8730ee4f788ff4420f70dd2ad2 Mon Sep 17 00:00:00 2001
From: lucas_nz <lucas_nz@outlook.com>
Date: Sat, 29 Aug 2020 21:29:07 +1200
Subject: when click notification in montage, filter event view to only display
 events since last notification click

---
 www/js/EventDateTimeFilterCtrl.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'www/js/EventDateTimeFilterCtrl.js')

diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
index e2d7b22e..689b800d 100644
--- a/www/js/EventDateTimeFilterCtrl.js
+++ b/www/js/EventDateTimeFilterCtrl.js
@@ -63,6 +63,7 @@ angular.module('zmApp.controllers')
         $rootScope.toTime = "";
         $rootScope.fromString = "";
         $rootScope.toString = "";
+        $rootScope.monitorsFilter = '';
 
         // if you come here via the events pullup
         // you are looking at a specific monitor ID
@@ -100,6 +101,8 @@ angular.module('zmApp.controllers')
       // don't root.
       //--------------------------------------------------------------------------
       $scope.saveFilters = function () {
+        // only reset date/time if at least one of them is set.
+        if ($rootScope.fromDate || $rootScope.toDate || $rootScope.fromTime || $rootScope.toTime) {
         if (!$rootScope.fromDate) {
           //console.log("RESET fromDate");
           $rootScope.fromDate = new Date();
@@ -131,11 +134,21 @@ angular.module('zmApp.controllers')
           $rootScope.fromDate = $rootScope.toDate;
           $rootScope.toDate = t;
         }
-
-        $rootScope.isEventFilterOn = true;
+        
         $rootScope.fromString = moment($rootScope.fromDate).format("YYYY-MM-DD") + " " + moment($rootScope.fromTime).format("HH:mm:ss");
 
         $rootScope.toString = moment($rootScope.toDate).format("YYYY-MM-DD") + " " + moment($rootScope.toTime).format("HH:mm:ss");
+        }
+        else {
+            $rootScope.fromDate = null;
+            $rootScope.toDate = null;
+            $rootScope.fromTime = null;
+            $rootScope.toTime = null;
+            $rootScope.fromString = null;
+            $rootScope.toString = null;
+        }
+
+        $rootScope.isEventFilterOn = true;
 
         //console.log("CONCAT DATES " + temp);
         //
-- 
cgit v1.2.3


From 956e88ec354019b9f7c68e0cd7f2fefd9921dfdc Mon Sep 17 00:00:00 2001
From: lucas_nz <lucas_nz@outlook.com>
Date: Sat, 5 Sep 2020 11:42:53 +1200
Subject: indent for readability

---
 www/js/EventDateTimeFilterCtrl.js | 60 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

(limited to 'www/js/EventDateTimeFilterCtrl.js')

diff --git a/www/js/EventDateTimeFilterCtrl.js b/www/js/EventDateTimeFilterCtrl.js
index 689b800d..2de8dd15 100644
--- a/www/js/EventDateTimeFilterCtrl.js
+++ b/www/js/EventDateTimeFilterCtrl.js
@@ -103,41 +103,41 @@ angular.module('zmApp.controllers')
       $scope.saveFilters = function () {
         // only reset date/time if at least one of them is set.
         if ($rootScope.fromDate || $rootScope.toDate || $rootScope.fromTime || $rootScope.toTime) {
-        if (!$rootScope.fromDate) {
-          //console.log("RESET fromDate");
-          $rootScope.fromDate = new Date();
-          NVR.debug("DateTimeFilter: resetting from date");
-        }
+            if (!$rootScope.fromDate) {
+              //console.log("RESET fromDate");
+              $rootScope.fromDate = new Date();
+              NVR.debug("DateTimeFilter: resetting from date");
+            }
 
-        if (!$rootScope.toDate) {
-          // console.log("RESET toDate");
-          $rootScope.toDate = new Date();
-          NVR.debug("DateTimeFilter: resetting to date");
-        }
+            if (!$rootScope.toDate) {
+              // console.log("RESET toDate");
+              $rootScope.toDate = new Date();
+              NVR.debug("DateTimeFilter: resetting to date");
+            }
 
-        if (!$rootScope.fromTime) {
-          // console.log("RESET fromTime");
-          $rootScope.fromTime = new Date(99, 5, 24, 0, 0, 0, 0); //moment().format("hh:mm:ss");
-          NVR.debug("DateTimeFilter: resetting from time");
-        }
+            if (!$rootScope.fromTime) {
+              // console.log("RESET fromTime");
+              $rootScope.fromTime = new Date(99, 5, 24, 0, 0, 0, 0); //moment().format("hh:mm:ss");
+              NVR.debug("DateTimeFilter: resetting from time");
+            }
 
-        if (!$rootScope.toTime) {
-          //console.log("RESET toTime");
-          $rootScope.toTime = new Date(99, 5, 24, 23, 59, 59, 0);
-          //$rootScope.toTime = "01:01:02"; //moment().format("hh:mm:ss");
-          NVR.debug("DateTimeFilter: resetting to time");
-        }
+            if (!$rootScope.toTime) {
+              //console.log("RESET toTime");
+              $rootScope.toTime = new Date(99, 5, 24, 23, 59, 59, 0);
+              //$rootScope.toTime = "01:01:02"; //moment().format("hh:mm:ss");
+              NVR.debug("DateTimeFilter: resetting to time");
+            }
 
-        if ($rootScope.fromDate > $rootScope.toDate) {
-          NVR.log("From date > To Date, swapping");
-          var t = $rootScope.fromDate;
-          $rootScope.fromDate = $rootScope.toDate;
-          $rootScope.toDate = t;
-        }
-        
-        $rootScope.fromString = moment($rootScope.fromDate).format("YYYY-MM-DD") + " " + moment($rootScope.fromTime).format("HH:mm:ss");
+            if ($rootScope.fromDate > $rootScope.toDate) {
+              NVR.log("From date > To Date, swapping");
+              var t = $rootScope.fromDate;
+              $rootScope.fromDate = $rootScope.toDate;
+              $rootScope.toDate = t;
+            }
+            
+            $rootScope.fromString = moment($rootScope.fromDate).format("YYYY-MM-DD") + " " + moment($rootScope.fromTime).format("HH:mm:ss");
 
-        $rootScope.toString = moment($rootScope.toDate).format("YYYY-MM-DD") + " " + moment($rootScope.toTime).format("HH:mm:ss");
+            $rootScope.toString = moment($rootScope.toDate).format("YYYY-MM-DD") + " " + moment($rootScope.toTime).format("HH:mm:ss");
         }
         else {
             $rootScope.fromDate = null;
-- 
cgit v1.2.3