Merge pull request #16 from yodlr/units

improved units states

Author: Ross Kukulinski

site/js/coregi-controllers.js

@@ -25,24 +25,53 @@ coregiControllers.controller('MachinesCtrl',  ['$rootScope', '$scope', 'coregiSe
 
 coregiControllers.controller('UnitsCtrl',  ['$rootScope', '$scope', 'coregiService',
   function($rootScope, $scope, coregiService) {
+    var changedUnits = {};
 
     $scope.$watchCollection(coregiService.getUnitsList, function(unitsList) {
       if(unitsList) {
         $scope.unitsList = unitsList;
+
+        for(var c in changedUnits) {
+          var found = false;
+          for(var i in $scope.unitsList) {
+            if(changedUnits[c].unit == $scope.unitsList[i].unit) {
+              found = true;
+              break;
+            }
+          }
+          if(!found) {
+            delete changedUnits[c];
+          }
+        }
+
+        for(var u in $scope.unitsList) {
+          if(changedUnits[$scope.unitsList[u].unit]) {
+            if($scope.unitsList[u].active === changedUnits[$scope.unitsList[u].unit].active) {
+              $scope.unitsList[u].active = 'busy';
+              delete changedUnits[$scope.unitsList[u].unit];
+            }
+          }
+        }
       }
     });
 
     $scope.start = function start(unit) {
       if(unit.active === 'active') {
         coregiService.stopUnit(unit);
+        changedUnits[unit.unit] = angular.copy(unit);
+        unit.active = 'busy';
       }
       else {
         coregiService.startUnit(unit);
+        changedUnits[unit.unit] = angular.copy(unit);
+        unit.active = 'busy';
       }
     };
 
     $scope.destroy = function destroy(unit) {
       coregiService.destroyUnit(unit);
+      changedUnits[unit.unit] = angular.copy(unit);
+      unit.active = 'busy';
     };
 
   }

site/js/coregi-services.js

@@ -115,27 +115,18 @@ coregiServices.factory('coregiService', ['$rootScope', '$resource', '$timeout',
       getKeysBranchList: function getKeysBranchList() {
         return keysBranchList;
       },
-      startUnit: function startUnit(unit, callback) {
+      startUnit: function startUnit(unit) {
         unitsService.start(unit, function(data) {
-          if(callback) {
-            callback(null, data);
-          }
         });
       },
       stopUnit: function stopUnit(unit) {
         unitsService.stop(unit, function(data) {
-          if(callback) {
-            callback(null, data);
-          }
         });
       },
       destroyUnit: function destroyUnit(unit) {
         unitsService.destroy(unit, function(data) {
-          if(callback) {
-            callback(null, data);
-          }
         });
       }
     };
   }
-]);
+]);

site/partials/units.html

@@ -34,7 +34,7 @@
                 <td>
                   <div class="btn-group" role="group">
                     <a class="btn btn-default btn-xs" role="button" ng-click="start(unit)">
-                      <span class="glyphicon" aria-hidden="true" ng-class="{'glyphicon-stop': unit.active == 'active', 'glyphicon-play': unit.active != 'active'}"></span>
+                      <span class="glyphicon" aria-hidden="true" ng-class="{'glyphicon-stop': unit.active == 'active', 'glyphicon-play': unit.active == 'inactive', 'glyphicon-exclamation-sign': unit.active == 'failed', 'glyphicon-time': unit.active == 'busy' || unit.active == 'activating' || unit.active == 'deactivating'}"></span>
                     </a>
                     <a class="btn btn-default btn-xs" role="button" ng-click="destroy(unit)">
                       <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>