From 73c0670d322c3adf316dbdb92f4ab0ea522eeaa5 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Wed, 5 Jun 2019 11:12:53 -0400
Subject: show mid

---
 www/js/NVR.js             | 2 +-
 www/js/TimelineCtrl.js    | 2 +-
 www/templates/events.html | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'www')

diff --git a/www/js/NVR.js b/www/js/NVR.js
index 8166a1de..80f50a66 100644
--- 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
index 524f1dcc..4eae804b 100644
--- 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
index cb75e6c0..88c101f0 100644
--- 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 @@
         <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 @@
         <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 @@
         <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>
-- 
cgit v1.2.3