diff --git a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js
index 202473e5..1761a6c8 100644
--- a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js
+++ b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js
@@ -1,19 +1,19 @@
 'use strict';
 
 app.controller('SpaceCombinedEquipmentController', function($scope,
-  $window,
-  $translate,
-  SpaceService,
-  CombinedEquipmentService,
-  SpaceCombinedEquipmentService,
-  toaster) {
-  $scope.spaces = [];
-  $scope.currentSpaceID = 1;
-  $scope.combinedequipments = [];
-  $scope.spacecombinedequipments = [];
-  $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
+    $window,
+    $translate,
+    SpaceService,
+    CombinedEquipmentService,
+    SpaceCombinedEquipmentService,
+    toaster) {
+    $scope.spaces = [];
+    $scope.currentSpaceID = 1;
+    $scope.combinedequipments = [];
+    $scope.spacecombinedequipments = [];
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 
-  $scope.getAllSpaces = function() {
+    $scope.getAllSpaces = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
           $scope.spaces = response.data;
@@ -45,7 +45,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope,
           $scope.getCombinedEquipmentsBySpaceID($scope.currentSpaceID);
       });
     });
-  };
+    };
 
 	$scope.getCombinedEquipmentsBySpaceID = function(id) {
     $scope.spacecombinedequipments=[];
@@ -72,7 +72,6 @@ app.controller('SpaceCombinedEquipmentController', function($scope,
 		var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id;
 		var spaceid=angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected();
         let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-
 		SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, headers, function (response){
 			if (angular.isDefined(response.status) && response.status === 201) {
 					toaster.pop({
@@ -100,7 +99,6 @@ app.controller('SpaceCombinedEquipmentController', function($scope,
         var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id;
         var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected();
         let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-
         SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, headers, function (response) {
             if (angular.isDefined(response.status) && response.status === 204) {
                 toaster.pop({
diff --git a/admin/app/controllers/settings/space/spaceequipment.controller.js b/admin/app/controllers/settings/space/spaceequipment.controller.js
index 687cd4db..799a90a0 100644
--- a/admin/app/controllers/settings/space/spaceequipment.controller.js
+++ b/admin/app/controllers/settings/space/spaceequipment.controller.js
@@ -1,20 +1,20 @@
 'use strict';
 
 app.controller('SpaceEquipmentController', function(
-  $scope,
-  $window,
-  $translate,
-  SpaceService,
-  EquipmentService,
-  SpaceEquipmentService,
-  toaster,SweetAlert) {
-  $scope.spaces = [];
-  $scope.currentSpaceID = 1;
-  $scope.equipments = [];
-  $scope.spaceequipments = [];
-  $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
+    $scope,
+    $window,
+    $translate,
+    SpaceService,
+    EquipmentService,
+    SpaceEquipmentService,
+    toaster,SweetAlert) {
+    $scope.spaces = [];
+    $scope.currentSpaceID = 1;
+    $scope.equipments = [];
+    $scope.spaceequipments = [];
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 
-  $scope.getAllSpaces = function() {
+    $scope.getAllSpaces = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
         $scope.spaces = response.data;
@@ -46,7 +46,7 @@ app.controller('SpaceEquipmentController', function(
           $scope.getEquipmentsBySpaceID($scope.currentSpaceID);
       });
     });
-  };
+    };
 
 	$scope.getEquipmentsBySpaceID = function(id) {
     $scope.spaceequipments=[];
@@ -100,7 +100,6 @@ app.controller('SpaceEquipmentController', function(
         var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id;
         var spaceid = angular.element(spacetreewithequipment).jstree(true).get_top_selected();
         let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-
         SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, headers, function (response) {
             if (angular.isDefined(response.status) && response.status === 204) {
                 toaster.pop({
diff --git a/admin/app/controllers/settings/space/spacemeter.controller.js b/admin/app/controllers/settings/space/spacemeter.controller.js
index 10bb0f57..05c4b73e 100644
--- a/admin/app/controllers/settings/space/spacemeter.controller.js
+++ b/admin/app/controllers/settings/space/spacemeter.controller.js
@@ -1,20 +1,20 @@
 'use strict';
 
 app.controller('SpaceMeterController', function(
-  $scope ,
-  $window,
-  $timeout,
-  $translate,
-  SpaceService,
-  MeterService,
-  VirtualMeterService,
-  OfflineMeterService, SpaceMeterService, toaster,SweetAlert) {
-  $scope.spaces = [];
-  $scope.currentSpaceID = 1;
-  $scope.spacemeters = [];
-  $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
+    $scope ,
+    $window,
+    $timeout,
+    $translate,
+    SpaceService,
+    MeterService,
+    VirtualMeterService,
+    OfflineMeterService, SpaceMeterService, toaster,SweetAlert) {
+    $scope.spaces = [];
+    $scope.currentSpaceID = 1;
+    $scope.spacemeters = [];
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 
-  $scope.getAllSpaces = function() {
+    $scope.getAllSpaces = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
         $scope.spaces = response.data;
@@ -47,7 +47,7 @@ app.controller('SpaceMeterController', function(
           $scope.getMetersBySpaceID($scope.currentSpaceID);
       });
     });
-  };
+    };
 
 	$scope.getMetersBySpaceID = function(id) {
 		var metertypes=['meters','virtualmeters','offlinemeters'];
@@ -177,12 +177,12 @@ app.controller('SpaceMeterController', function(
 		});
 	};
 
-  $scope.getAllSpaces();
-	$scope.getAllMeters();
-	$scope.getAllVirtualMeters();
-	$scope.getAllOfflineMeters();
+    $scope.getAllSpaces();
+    $scope.getAllMeters();
+    $scope.getAllVirtualMeters();
+    $scope.getAllOfflineMeters();
 
-  $scope.refreshSpaceTree = function() {
+    $scope.refreshSpaceTree = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
         $scope.spaces = response.data;
@@ -210,7 +210,7 @@ app.controller('SpaceMeterController', function(
       angular.element(spacetreewithmeter).jstree(true).settings.core.data = treedata['core']['data'];
       angular.element(spacetreewithmeter).jstree(true).refresh();
     });
-  };
+    };
 
 	$scope.$on('handleBroadcastSpaceChanged', function(event) {
     $scope.spacemeters = [];
diff --git a/admin/app/controllers/settings/space/spaceshopfloor.controller.js b/admin/app/controllers/settings/space/spaceshopfloor.controller.js
index 9bc5510a..c114d6af 100644
--- a/admin/app/controllers/settings/space/spaceshopfloor.controller.js
+++ b/admin/app/controllers/settings/space/spaceshopfloor.controller.js
@@ -1,19 +1,19 @@
 'use strict';
 
 app.controller('SpaceShopfloorController', function(
-  $scope,
-  $window,
-  $translate,
-  SpaceService,
-  ShopfloorService,
-  SpaceShopfloorService, toaster,SweetAlert) {
-  $scope.spaces = [];
-  $scope.currentSpaceID = 1;
-  $scope.shopfloors = [];
-  $scope.spaceshopfloors = [];
-  $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
+    $scope,
+    $window,
+    $translate,
+    SpaceService,
+    ShopfloorService,
+    SpaceShopfloorService, toaster,SweetAlert) {
+    $scope.spaces = [];
+    $scope.currentSpaceID = 1;
+    $scope.shopfloors = [];
+    $scope.spaceshopfloors = [];
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 
-  $scope.getAllSpaces = function() {
+    $scope.getAllSpaces = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
         $scope.spaces = response.data;
@@ -45,7 +45,7 @@ app.controller('SpaceShopfloorController', function(
           $scope.getShopfloorsBySpaceID($scope.currentSpaceID);
       });
     });
-  };
+    };
 
 	$scope.getShopfloorsBySpaceID = function(id) {
     $scope.spaceshopfloors=[];
@@ -119,7 +119,7 @@ app.controller('SpaceShopfloorController', function(
 		});
 	};
 
-  $scope.getAllSpaces();
+    $scope.getAllSpaces();
 	$scope.getAllShopfloors();
 
   $scope.refreshSpaceTree = function() {
diff --git a/admin/app/controllers/settings/space/spacestore.controller.js b/admin/app/controllers/settings/space/spacestore.controller.js
index bcc02928..41d26a9c 100644
--- a/admin/app/controllers/settings/space/spacestore.controller.js
+++ b/admin/app/controllers/settings/space/spacestore.controller.js
@@ -1,18 +1,18 @@
 'use strict';
 
 app.controller('SpaceStoreController', function(
-  $scope,
-  $window,
-  $translate,
-  SpaceService,
-  StoreService, SpaceStoreService, toaster,SweetAlert) {
-  $scope.spaces = [];
-  $scope.currentSpaceID = 1;
-  $scope.stores = [];
-  $scope.spacestores = [];
-  $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
+    $scope,
+    $window,
+    $translate,
+    SpaceService,
+    StoreService, SpaceStoreService, toaster,SweetAlert) {
+    $scope.spaces = [];
+    $scope.currentSpaceID = 1;
+    $scope.stores = [];
+    $scope.spacestores = [];
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 
-  $scope.getAllSpaces = function() {
+    $scope.getAllSpaces = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
         $scope.spaces = response.data;
@@ -44,7 +44,7 @@ app.controller('SpaceStoreController', function(
           $scope.getStoresBySpaceID($scope.currentSpaceID);
       });
     });
-  };
+    };
 
 	$scope.getStoresBySpaceID = function(id) {
     $scope.spacestores=[];
@@ -99,7 +99,6 @@ app.controller('SpaceStoreController', function(
         var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id;
         var spaceid = angular.element(spacetreewithstore).jstree(true).get_top_selected();
         let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-
         SpaceStoreService.deletePair(spaceid, spacestoreid, headers, function (response) {
             if (angular.isDefined(response.status) && response.status === 204) {
                 toaster.pop({
diff --git a/admin/app/controllers/settings/space/spacetenant.controller.js b/admin/app/controllers/settings/space/spacetenant.controller.js
index d1c9de33..3f76a07e 100644
--- a/admin/app/controllers/settings/space/spacetenant.controller.js
+++ b/admin/app/controllers/settings/space/spacetenant.controller.js
@@ -1,19 +1,19 @@
 'use strict';
 
 app.controller('SpaceTenantController', function(
-  $scope,
-  $window,
-  $translate,
-  SpaceService,
-  TenantService,
-  SpaceTenantService, toaster,SweetAlert) {
-  $scope.spaces = [];
-  $scope.currentSpaceID = 1;
-  $scope.tenants = [];
-  $scope.spacetenants = [];
-  $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
+    $scope,
+    $window,
+    $translate,
+    SpaceService,
+    TenantService,
+    SpaceTenantService, toaster,SweetAlert) {
+    $scope.spaces = [];
+    $scope.currentSpaceID = 1;
+    $scope.tenants = [];
+    $scope.spacetenants = [];
+    $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
 
-  $scope.getAllSpaces = function() {
+    $scope.getAllSpaces = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
         $scope.spaces = response.data;
@@ -45,7 +45,7 @@ app.controller('SpaceTenantController', function(
           $scope.getTenantsBySpaceID($scope.currentSpaceID);
       });
     });
-  };
+    };
 
 	$scope.getTenantsBySpaceID = function(id) {
     $scope.spacetenants=[];
@@ -99,7 +99,6 @@ app.controller('SpaceTenantController', function(
         var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id;
         var spaceid = angular.element(spacetreewithtenant).jstree(true).get_top_selected();
         let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
-
         SpaceTenantService.deletePair(spaceid, spacetenantid, headers, function (response) {
             if (angular.isDefined(response.status) && response.status === 204) {
                 toaster.pop({
@@ -120,10 +119,10 @@ app.controller('SpaceTenantController', function(
 		});
 	};
 
-  $scope.getAllSpaces();
-	$scope.getAllTenants();
+    $scope.getAllSpaces();
+    $scope.getAllTenants();
 
-  $scope.refreshSpaceTree = function() {
+    $scope.refreshSpaceTree = function() {
     SpaceService.getAllSpaces(function (response) {
       if (angular.isDefined(response.status) && response.status === 200) {
         $scope.spaces = response.data;
@@ -151,7 +150,7 @@ app.controller('SpaceTenantController', function(
       angular.element(spacetreewithtenant).jstree(true).settings.core.data = treedata['core']['data'];
       angular.element(spacetreewithtenant).jstree(true).refresh();
     });
-  };
+    };
 
 	$scope.$on('handleBroadcastSpaceChanged', function(event) {
     $scope.spacetenants = [];