change lot of stuff

js/controller/BoardController.js

@@ -1,47 +1,51 @@
-
-app.controller('BoardController', function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService) {
+app.controller('BoardController', function ($rootScope, $scope, $stateParams, StatusService, BoardService, StackService, CardService, LabelService, $state, $transitions) {
 
   $scope.sidebar = $rootScope.sidebar;
 
   $scope.id = $stateParams.boardId;
   $scope.status={},
-      $scope.newLabel={};
+  $scope.newLabel={};
   $scope.status.boardtab = $stateParams.detailTab;
+  $scope.state = $state.current;
+
+
+
 
   $scope.stackservice = StackService;
   $scope.boardservice = BoardService;
+  $scope.cardservice = CardService;
   $scope.statusservice = StatusService.getInstance();
   $scope.labelservice = LabelService;
   $scope.defaultColors = ['31CC7C', '317CCC', 'FF7A66', 'F1DB50', '7C31CC', 'CC317C', '3A3B3D', 'CACBCD'];
 
-
   // fetch data
   StackService.clear();
   $scope.statusservice.retainWaiting();
   $scope.statusservice.retainWaiting();
 
-  StackService.fetchAll($scope.id).then(function(data) {
-    console.log(data);
-
+  BoardService.fetchOne($scope.id).then(function(data) {
     $scope.statusservice.releaseWaiting();
   }, function(error) {
     $scope.statusservice.setError('Error occured', error);
   });
 
+  console.log($scope.state);
+
+    StackService.fetchAll($scope.id).then(function(data) {
+      $scope.statusservice.releaseWaiting();
+    }, function(error) {
+      $scope.statusservice.setError('Error occured', error);
+    });
+
+
+
+
+
   BoardService.searchUsers();
 
-  BoardService.fetchOne($scope.id).then(function(data) {
-    console.log(BoardService.getCurrent());
-    $scope.statusservice.releaseWaiting();
-  }, function(error) {
-    $scope.statusservice.setError('Error occured', error);
-  });
-
   $scope.newStack = { 'boardId': $scope.id};
   $scope.newCard = {};
 
-
-
   // Create a new Stack
   $scope.createStack = function () {
     StackService.create($scope.newStack).then(function (data) {
@@ -97,64 +101,6 @@ app.controller('BoardController', function ($rootScope, $scope, $stateParams, St
   $scope.updateAcl = function(acl) {
     BoardService.updateAcl(acl);
   }
-  // TODO: move to filter?
-  // Lighten Color of the board for background usage
-  $scope.rgblight = function (hex) {
-      var result = /^([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
-      var color = result ? {
-        r: parseInt(result[1], 16),
-        g: parseInt(result[2], 16),
-        b: parseInt(result[3], 16)
-      } : null;
-    if(result !== null) {
-      var rgba = "rgba(" + color.r + "," + color.g + "," + color.b + ",0.7)";
-      return rgba;
-    } else {
-        return "#"+hex;
-    }
-  };
-
-  // TODO: move to filter?
-  // RGB2HLS by Garry Tan
-  // http://axonflux.com/handy-rgb-to-hsl-and-rgb-to-hsv-color-model-c
-  $scope.textColor = function (hex) {
-    var result = /^([A-Fa-f\d]{2})([A-Fa-f\d]{2})([A-Fa-f\d]{2})$/i.exec(hex);
-    var color = result ? {
-      r: parseInt(result[1], 16),
-      g: parseInt(result[2], 16),
-      b: parseInt(result[3], 16)
-    } : null;
-    if(result !== null) {
-      r = color.r/255;
-      g = color.g/255;
-      b = color.b/255;
-      var max = Math.max(r, g, b), min = Math.min(r, g, b);
-      var h, s, l = (max + min) / 2;
-
-      if(max == min){
-        h = s = 0; // achromatic
-      }else{
-        var d = max - min;
-        s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
-        switch(max){
-          case r: h = (g - b) / d + (g < b ? 6 : 0); break;
-          case g: h = (b - r) / d + 2; break;
-          case b: h = (r - g) / d + 4; break;
-        }
-        h /= 6;
-      }
-      // TODO: Maybe just darken/lighten the color
-      if(l<0.5) {
-        return "#ffffff";
-      } else {
-        return "#000000";
-      }
-      //var rgba = "rgba(" + color.r + "," + color.g + "," + color.b + ",0.7)";
-      //return rgba;
-    } else {
-      return "#aa0000";
-    }
-  };