started events

Author: qscripter

bower.json

@@ -13,7 +13,8 @@
     "toastr": "~2.1.1",
     "moment": "~2.10.3",
     "animate.css": "~3.3.0",
-    "angular": "~1.4.0"
+    "angular": "~1.4.0",
+    "lodash": "~3.9.3"
   },
   "devDependencies": {
     "angular-mocks": "~1.4.0"

src/app/components/hyperdecks/hyperdeck.service.js

@@ -10,7 +10,8 @@ function service($http) {
   var svc = {
     getAll: getAll,
     setRemote: setRemote,
-    sendTransportCommand: sendTransportCommand
+    sendTransportCommand: sendTransportCommand,
+    getEvents: getEvents
   };
 
   var endpoint = '/api/hyperdecks';
@@ -33,6 +34,14 @@ function service($http) {
     });
   }
 
+  function getEvents(id) {
+    return $http.get('/api/events', {
+      params: {
+        hyperDeck: id
+      }
+    }).then(returnData);
+  }
+
   function returnData(response) {
     return response.data;
   }

src/app/components/hyperdecks/hyperdecks.controller.js

@@ -13,9 +13,11 @@ function controller(hyperdecks, Hyperdeck) {
 
   vm.updateRemote = updateRemote;
   vm.sendTransportCommand = sendTransportCommand;
+  vm.getEvents = getEvents;
 
   function init() {
     vm.hyperdecks = hyperdecks;
+    _.map(vm.hyperdecks, getEvents);
   }
 
   function updateRemote(hyperdeck) {
@@ -25,5 +27,11 @@ function controller(hyperdecks, Hyperdeck) {
   function sendTransportCommand(id, command) {
     Hyperdeck.sendTransportCommand(id, command);
   }
+
+  function getEvents(hyperdeck) {
+    Hyperdeck.getEvents(hyperdeck._id).then(function (events) {
+      hyperdeck.events = events;
+    });
+  }
 }
 })();

src/app/components/hyperdecks/hyperdecks.html

@@ -64,38 +64,48 @@ <h3>Control</h3>
           </button>
         </div>
       <h3>Status</h3>
-      <form class="form-horizontal">
-        <div class="form-group">
-          <label class="col-sm-2 control-label">Description</label>
-          <div class="col-sm-4">
-            <p class="form-control-static">{{hyperdeck.description}}</p>
-          </div>
-        </div>
-        <div class="form-group">
-          <label class="col-sm-2 control-label">Connection Status</label>
-          <div class="col-sm-4">
-            <p class="form-control-static">{{hyperdeck.connectionStatus}}</p>
-          </div>
-        </div>
-        <div class="form-group">
-          <label class="col-sm-2 control-label">IP Address</label>
-          <div class="col-sm-4">
-            <p class="form-control-static">{{hyperdeck.ipAddress}}</p>
-          </div>
-        </div>
-        <div class="form-group">
-          <label class="col-sm-2 control-label">Active</label>
-          <div class="col-sm-4">
-            <p class="form-control-static">{{hyperdeck.active}}</p>
-          </div>
+      <div class="row">
+        <div class="col-md-4">
+          <form class="form-horizontal">
+            <div class="form-group">
+              <label class="col-sm-6 control-label">Description</label>
+              <div class="col-sm-6">
+                <p class="form-control-static">{{hyperdeck.description}}</p>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-6 control-label">Connection Status</label>
+              <div class="col-sm-6">
+                <p class="form-control-static">{{hyperdeck.connectionStatus}}</p>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-6 control-label">IP Address</label>
+              <div class="col-sm-6">
+                <p class="form-control-static">{{hyperdeck.ipAddress}}</p>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-6 control-label">Active</label>
+              <div class="col-sm-6">
+                <p class="form-control-static">{{hyperdeck.active}}</p>
+              </div>
+            </div>
+            <div class="form-group">
+              <label class="col-sm-6 control-label">Remote Enabled</label>
+              <div class="col-sm-6">
+                <p class="form-control-static">{{hyperdeck.remoteEnabled}}</p>
+              </div>
+            </div>
+          </form>
         </div>
-        <div class="form-group">
-          <label class="col-sm-2 control-label">Remote Enabled</label>
-          <div class="col-sm-4">
-            <p class="form-control-static">{{hyperdeck.remoteEnabled}}</p>
+        <div class="col-md-6 events">
+          <div ng-repeat="event in hyperdeck.events">
+            event
           </div>
         </div>
-      </form>
+      </div>
+
     </div>
   </div>
 </div>