show mid

ZoneMinder · Jun 5, 2019 · bd78aac · bd78aac
1 parent 06adf37
commit bd78aac
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version": "1.3.057",
+  "version":"1.3.060",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -185,4 +185,4 @@
       ]
     }
   }
-}
+}
diff --git a/www/js/NVR.js b/www/js/NVR.js
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers')
         DO NOT TOUCH zmAppVersion
         It is changed by sync_version.sh
       */
-      var zmAppVersion = "1.3.057";
+      var zmAppVersion = "1.3.060";
       var isBackground = false;
       var justResumed = false;
       var timeSinceResumed = -1;

diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
@@ -1022,7 +1022,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
 
   function noop() {
 
-  };
+  }
 
   //-------------------------------------------------
   // This function draws the graph

diff --git a/www/templates/events.html b/www/templates/events.html
@@ -74,6 +74,7 @@
 
               <i class="ion-images"></i> {{event.Event.Frames}} &nbsp;
               <i class="ion-ios-bell-outline"></i> {{event.Event.AlarmFrames}} &nbsp;
+              <i class="ion-monitor"></i> {{event.Event.MonitorId}} &nbsp;
               <br />
               <span style="font-size:80%; color:rgb(110,110,110)">
                 {{humanize(event.Event.Length)}}
@@ -289,7 +290,7 @@ <h1 class="title" ion-pull-up-trigger>
         <div ng-repeat="hour in hours|filter:{ monitor: '!'+'(Unknown)'}" id="hour-{{$index}}">
           <span style="color:black">
             <a class="item item-icon-right" href="" ng-click="showEvents('1', 'hour',hour.mid);">
-              <b>{{hour.monitor}}</b> {{hour.events}}
+              <b>{{hour.monitor}} ({{hour.mid}})</b> {{hour.events}}
               <span translate="kEvents"></span>
               <i class="icon ion-android-arrow-dropright"></i>
             </a>
@@ -303,7 +304,7 @@ <h1 class="title" ion-pull-up-trigger>
         <div ng-repeat="day in days|filter:{ monitor: '!'+'(Unknown)'}" id="day-{{$index}}">
           <span style="color:black">
             <a class="item item-icon-right" href="" ng-click="showEvents('1', 'day',day.mid);">
-              <b>{{day.monitor}}</b> {{day.events}}
+              <b>{{day.monitor}} ({{day.mid}})</b> {{day.events}}
               <span translate="kEvents"></span>
               <i class="icon ion-android-arrow-dropright"></i>
             </a>
@@ -317,7 +318,7 @@ <h1 class="title" ion-pull-up-trigger>
         <div ng-repeat="week in weeks|filter:{ monitor: '!'+'(Unknown)'}" id="week-{{$index}}">
           <span style="color:black">
             <a class="item item-icon-right" href="" ng-click="showEvents('1', 'week',week.mid);">
-              <b>{{week.monitor}}</b> {{week.events}}
+              <b>{{week.monitor}} ({{week.mid}})</b> {{week.events}}
               <span translate="kEvents"></span>
               <i class="icon ion-android-arrow-dropright"></i>
             </a>