Monitor view now calls zmdc APIs and checks if monitor is running/not running/pending

1 files changed, 39 insertions, 33 deletions

diff --git a/www/templates/monitors.html b/www/templates/monitors.html
index 6ef5d954..7b6b00b3 100644
--- a/www/templates/monitors.html
+++ b/www/templates/monitors.html
@@ -1,52 +1,58 @@
 <ion-view view-title="Monitors" cache="false">
-    
-     <ion-nav-buttons side="left">
-          <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
-        </ion-nav-buttons> 
-    
-    
+
+    <ion-nav-buttons side="left">
+        <button class="button button-icon button-clear ion-navicon" ng-click="openMenu()"></button>
+    </ion-nav-buttons>
+
+
     <ion-content>
-        <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
-        <div class="list card" ng-repeat="monitor in monitors">
-            <!-- <a href="#/app/events" ng-click="toggleLeft()"> -->
-            <div class="item" ng-style="{'background-color': monitor.Monitor.Enabled=='1'?'white':'white'}">
-                <div ng-if="monitor.Monitor.Enabled == '1'">
-                    <span class='item item-icon-left item-icon-right'>
+        <div ng-controller="ModalCtrl">
+            <ion-refresher pulling-text="Pull to reload Monitors..." spinner="bubbles" on-refresh="doRefresh()"></ion-refresher>
+            <div class="list card" ng-repeat="monitor in monitors">
+                <!-- <a href="#/app/events" ng-click="toggleLeft()"> -->
+                <div class="item" ng-style="{'background-color': monitor.Monitor.Enabled=='1'?'white':'white'}">
+                    <div ng-if="monitor.Monitor.Enabled == '1'">
+                        <span class='item item-icon-left item-icon-right'>
                 <i class="icon ion-ios-monitor-outline"></i>
                  <b>{{monitor.Monitor.Name}}</b>
-                <i class="icon ion-checkmark-circled" style="color:green;"></i>
+
+
+                <i class="icon {{monitor.Monitor.char}}" style="color:{{monitor.Monitor.color}};"></i>
+
                 </span>
-                </div>
+                    </div>
 
 
-                <div ng-if="monitor.Monitor.Enabled != '1'">
-                    <span class='item item-icon-left item-icon-right'>
+                    <div ng-if="monitor.Monitor.Enabled != '1'">
+                        <span class='item item-icon-left item-icon-right'>
                     <i class="icon ion-ios-monitor-outline"></i>
                      <b>{{monitor.Monitor.Name}}</b>
-                    <i class="icon ion-checkmark-circled" style="color:grey;"></i>
+                    <i class="icon {{monitor.Monitor.char}}" style="color:grey;"></i>
                 </span>
 
-                </div>
+                    </div>
 
 
-                <p>Mode :{{monitor.Monitor.Function}}</br>
-                    <!-- Current State: {{monitor.STATE}}</br> 
+                    <p>Mode :{{monitor.Monitor.Function}}</br>
+                        <!-- Current State: {{monitor.STATE}}</br>
             Events: {{monitor.NUMEVENTS}}</br> -->
-                    Resolution: {{monitor.Monitor.Width}}*{{monitor.Monitor.Height}}</br>
-                    Max FPS: {{monitor.Monitor.MaxFPS}}
-                    <br/> Alarm Max FPS:{{monitor.Monitor.AlarmMaxFPS}}
-                    <br/> Alarm Frame Count: {{monitor.Monitor.AlarmFrameCount}}
-                    <br/>
-                </p>
-
-                <div style="float:right;">
-                    <a class="button button-small icon icon-left icon ion-gear-a" href="" ng-click="changeConfig(monitor.Monitor.Name, monitor.Monitor.Id,monitor.Monitor.Enabled,monitor.Monitor.Function);">Configuration</a>
-                    <a class="button button-small icon icon-left ion-calendar" href="#/events/{{monitor.Monitor.Id}}">Events</a>
-                    <a class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)"  >Live View</a>
-                </div>
+                        Resolution: {{monitor.Monitor.Width}}*{{monitor.Monitor.Height}}</br>
+                        Max FPS: {{monitor.Monitor.MaxFPS}}
+                        <br/> Alarm Max FPS:{{monitor.Monitor.AlarmMaxFPS}}
+                        <br/> Alarm Frame Count: {{monitor.Monitor.AlarmFrameCount}}
+                        <br/> Status: {{monitor.Monitor.isRunningText}}
+                        <br/><br/>
+                    </p>
 
+                    <div style="float:right;">
+                        <a class="button button-small icon icon-left icon ion-gear-a" href="" ng-click="changeConfig(monitor.Monitor.Name, monitor.Monitor.Id,monitor.Monitor.Enabled,monitor.Monitor.Function);">Configuration</a>
+                        <a class="button button-small icon icon-left ion-calendar" href="#/events/{{monitor.Monitor.Id}}">Events</a>
+                        <a class="button button-small icon icon-left ion-ios-eye" ng-click="openModal(monitor.Monitor.Id, monitor.Monitor.Controllable)">Live View</a>
+                    </div>
+
+                </div>
             </div>
+            <!-- </a> -->
         </div>
-        <!-- </a> -->
     </ion-content>
 </ion-view>