diff --git a/admin/app/controllers/settings/meter/offlinemeter.controller.js b/admin/app/controllers/settings/meter/offlinemeter.controller.js index 92268a5c..bea62770 100644 --- a/admin/app/controllers/settings/meter/offlinemeter.controller.js +++ b/admin/app/controllers/settings/meter/offlinemeter.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('OfflineMeterController', function($scope, $translate, $uibModal, OfflineMeterService, CategoryService, EnergyItemService, CostCenterService, toaster, SweetAlert) { +app.controller('OfflineMeterController', function( + $scope, + $window, + $translate, + $uibModal, + OfflineMeterService, + CategoryService, + EnergyItemService, + CostCenterService, + toaster, + SweetAlert) { + + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -66,7 +78,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal, offlinemeter.energy_item_id = undefined; } offlinemeter.cost_center_id = offlinemeter.cost_center.id; - OfflineMeterService.addOfflineMeter(offlinemeter, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + OfflineMeterService.addOfflineMeter(offlinemeter, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -116,7 +129,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal, modifiedOfflineMeter.energy_item_id = undefined; } modifiedOfflineMeter.cost_center_id = modifiedOfflineMeter.cost_center.id; - OfflineMeterService.editOfflineMeter(modifiedOfflineMeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + OfflineMeterService.editOfflineMeter(modifiedOfflineMeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -154,7 +168,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal, }, function(isConfirm) { if (isConfirm) { - OfflineMeterService.deleteOfflineMeter(offlinemeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + OfflineMeterService.deleteOfflineMeter(offlinemeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/meter/virtualmeter.controller.js b/admin/app/controllers/settings/meter/virtualmeter.controller.js index 8ec4a402..0f929711 100644 --- a/admin/app/controllers/settings/meter/virtualmeter.controller.js +++ b/admin/app/controllers/settings/meter/virtualmeter.controller.js @@ -1,6 +1,6 @@ 'use strict'; -app.controller('VirtualMeterController', function($scope, $uibModal, $translate, +app.controller('VirtualMeterController', function($scope, $window, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, @@ -9,6 +9,8 @@ app.controller('VirtualMeterController', function($scope, $uibModal, $translate, CostCenterService, toaster, SweetAlert) { + + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -96,7 +98,8 @@ $scope.getAllEnergyItems = function() { virtualmeter.energy_item_id = undefined; } virtualmeter.cost_center_id = virtualmeter.cost_center.id; - VirtualMeterService.addVirtualMeter(virtualmeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + VirtualMeterService.addVirtualMeter(virtualmeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -149,7 +152,8 @@ $scope.getAllEnergyItems = function() { modifiedVirtualMeter.energy_item_id = undefined; } modifiedVirtualMeter.cost_center_id = modifiedVirtualMeter.cost_center.id; - VirtualMeterService.editVirtualMeter(modifiedVirtualMeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + VirtualMeterService.editVirtualMeter(modifiedVirtualMeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -187,7 +191,8 @@ $scope.getAllEnergyItems = function() { }, function(isConfirm) { if (isConfirm) { - VirtualMeterService.deleteVirtualMeter(virtualmeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + VirtualMeterService.deleteVirtualMeter(virtualmeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/space.controller.js b/admin/app/controllers/settings/space/space.controller.js index 054f2bed..0e75215b 100644 --- a/admin/app/controllers/settings/space/space.controller.js +++ b/admin/app/controllers/settings/space/space.controller.js @@ -1,10 +1,20 @@ 'use strict'; -app.controller('SpaceController', function ($scope, $uibModal, SpaceService, CostCenterService, ContactService, toaster, $translate, SweetAlert) { +app.controller('SpaceController', function ( + $scope, + $window, + $uibModal, + SpaceService, + CostCenterService, + ContactService, + toaster, + $translate, + SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.currentSpace = {}; $scope.currentSpaceChildren = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function () { CostCenterService.getAllCostCenters(function (response) { @@ -141,7 +151,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos if (space.contact != null) { space.contact_id = space.contact.id; } - SpaceService.addSpace(space, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceService.addSpace(space, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -194,7 +205,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos } modifiedSpace.cost_center_id = modifiedSpace.cost_center.id; - SpaceService.editSpace(modifiedSpace, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceService.editSpace(modifiedSpace, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -231,7 +243,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos }, function (isConfirm) { if (isConfirm) { - SpaceService.deleteSpace(space, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceService.deleteSpace(space, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js index 5e00dbe1..202473e5 100644 --- a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js +++ b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js @@ -1,6 +1,8 @@ 'use strict'; -app.controller('SpaceCombinedEquipmentController', function($scope, $translate, +app.controller('SpaceCombinedEquipmentController', function($scope, + $window, + $translate, SpaceService, CombinedEquipmentService, SpaceCombinedEquipmentService, @@ -9,7 +11,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, $scope.currentSpaceID = 1; $scope.combinedequipments = []; $scope.spacecombinedequipments = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -69,7 +71,9 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, $scope.pairCombinedEquipment=function(dragEl,dropEl){ var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id; var spaceid=angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); - SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, function (response){ + 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({ type: "success", @@ -95,8 +99,9 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, } 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, function (response) { + SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spaceequipment.controller.js b/admin/app/controllers/settings/space/spaceequipment.controller.js index f536c873..687cd4db 100644 --- a/admin/app/controllers/settings/space/spaceequipment.controller.js +++ b/admin/app/controllers/settings/space/spaceequipment.controller.js @@ -1,11 +1,18 @@ 'use strict'; -app.controller('SpaceEquipmentController', function($scope, $translate, SpaceService, EquipmentService, SpaceEquipmentService, toaster,SweetAlert) { +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.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +72,8 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer $scope.pairEquipment=function(dragEl,dropEl){ var equipmentid=angular.element('#'+dragEl).scope().equipment.id; var spaceid=angular.element(spacetreewithequipment).jstree(true).get_top_selected(); - SpaceEquipmentService.addPair(spaceid,equipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceEquipmentService.addPair(spaceid,equipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -91,8 +99,9 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer } 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, function (response) { + SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacemeter.controller.js b/admin/app/controllers/settings/space/spacemeter.controller.js index 9ca31c96..10bb0f57 100644 --- a/admin/app/controllers/settings/space/spacemeter.controller.js +++ b/admin/app/controllers/settings/space/spacemeter.controller.js @@ -1,9 +1,18 @@ 'use strict'; -app.controller('SpaceMeterController', function($scope ,$timeout, $translate, SpaceService, MeterService, VirtualMeterService, OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { +app.controller('SpaceMeterController', function( + $scope , + $window, + $timeout, + $translate, + SpaceService, + MeterService, + VirtualMeterService, + OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; - $scope.spacemeters = []; + $scope.spacemeters = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -119,7 +128,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var spaceid=angular.element(spacetreewithmeter).jstree(true).get_top_selected(); - SpaceMeterService.addPair(spaceid,meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceMeterService.addPair(spaceid,meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -146,7 +156,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp var spacemeterid = angular.element('#' + dragEl).scope().spacemeter.id; var spaceid = angular.element(spacetreewithmeter).jstree(true).get_top_selected(); var metertype = angular.element('#' + dragEl).scope().spacemeter.metertype; - SpaceMeterService.deletePair(spaceid, spacemeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceMeterService.deletePair(spaceid, spacemeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacepoint.controller.js b/admin/app/controllers/settings/space/spacepoint.controller.js index c1b50d52..51ff441d 100644 --- a/admin/app/controllers/settings/space/spacepoint.controller.js +++ b/admin/app/controllers/settings/space/spacepoint.controller.js @@ -96,7 +96,8 @@ app.controller('SpacePointController', function ( $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var spaceid = $scope.currentSpaceID; - SpacePointService.addPair(spaceid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpacePointService.addPair(spaceid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -122,7 +123,8 @@ app.controller('SpacePointController', function ( } var spacepointid = angular.element('#' + dragEl).scope().spacepoint.id; var spaceid = $scope.currentSpaceID; - SpacePointService.deletePair(spaceid, spacepointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpacePointService.deletePair(spaceid, spacepointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacesensor.controller.js b/admin/app/controllers/settings/space/spacesensor.controller.js index efecb2db..9a3ddf82 100644 --- a/admin/app/controllers/settings/space/spacesensor.controller.js +++ b/admin/app/controllers/settings/space/spacesensor.controller.js @@ -1,10 +1,17 @@ 'use strict'; -app.controller('SpaceSensorController', function ($scope, $translate, SpaceService, SensorService, SpaceSensorService, toaster, SweetAlert) { +app.controller('SpaceSensorController', function ( + $scope, + $window, + $translate, + SpaceService, + SensorService, + SpaceSensorService, toaster, SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.sensors = []; $scope.spacesensors = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { @@ -63,7 +70,8 @@ app.controller('SpaceSensorController', function ($scope, $translate, SpaceServi $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var spaceid = $scope.currentSpaceID; - SpaceSensorService.addPair(spaceid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceSensorService.addPair(spaceid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -89,7 +97,8 @@ app.controller('SpaceSensorController', function ($scope, $translate, SpaceServi } var spacesensorid = angular.element('#' + dragEl).scope().spacesensor.id; var spaceid = $scope.currentSpaceID; - SpaceSensorService.deletePair(spaceid, spacesensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceSensorService.deletePair(spaceid, spacesensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spaceshopfloor.controller.js b/admin/app/controllers/settings/space/spaceshopfloor.controller.js index 1b698149..9bc5510a 100644 --- a/admin/app/controllers/settings/space/spaceshopfloor.controller.js +++ b/admin/app/controllers/settings/space/spaceshopfloor.controller.js @@ -1,11 +1,17 @@ 'use strict'; -app.controller('SpaceShopfloorController', function($scope, $translate, SpaceService, ShopfloorService, SpaceShopfloorService, toaster,SweetAlert) { +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.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +71,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer $scope.pairShopfloor=function(dragEl,dropEl){ var shopfloorid=angular.element('#'+dragEl).scope().shopfloor.id; var spaceid=angular.element(spacetreewithshopfloor).jstree(true).get_top_selected(); - SpaceShopfloorService.addPair(spaceid,shopfloorid, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceShopfloorService.addPair(spaceid,shopfloorid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -91,8 +98,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer } var spaceshopfloorid = angular.element('#' + dragEl).scope().spaceshopfloor.id; var spaceid = angular.element(spacetreewithshopfloor).jstree(true).get_top_selected(); - - SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacestore.controller.js b/admin/app/controllers/settings/space/spacestore.controller.js index b49396d7..bcc02928 100644 --- a/admin/app/controllers/settings/space/spacestore.controller.js +++ b/admin/app/controllers/settings/space/spacestore.controller.js @@ -1,11 +1,16 @@ 'use strict'; -app.controller('SpaceStoreController', function($scope, $translate, SpaceService, StoreService, SpaceStoreService, toaster,SweetAlert) { +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.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +70,8 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService $scope.pairStore=function(dragEl,dropEl){ var storeid=angular.element('#'+dragEl).scope().store.id; var spaceid=angular.element(spacetreewithstore).jstree(true).get_top_selected(); - SpaceStoreService.addPair(spaceid,storeid, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceStoreService.addPair(spaceid,storeid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -92,8 +98,9 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService } 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, function (response) { + SpaceStoreService.deletePair(spaceid, spacestoreid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacetenant.controller.js b/admin/app/controllers/settings/space/spacetenant.controller.js index 37f11561..d1c9de33 100644 --- a/admin/app/controllers/settings/space/spacetenant.controller.js +++ b/admin/app/controllers/settings/space/spacetenant.controller.js @@ -1,11 +1,17 @@ 'use strict'; -app.controller('SpaceTenantController', function($scope, $translate, SpaceService, TenantService, SpaceTenantService, toaster,SweetAlert) { +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.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +71,8 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic $scope.pairTenant=function(dragEl,dropEl){ var tenantid=angular.element('#'+dragEl).scope().tenant.id; var spaceid=angular.element(spacetreewithtenant).jstree(true).get_top_selected(); - SpaceTenantService.addPair(spaceid,tenantid, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceTenantService.addPair(spaceid,tenantid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -91,8 +98,9 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic } 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, function (response) { + SpaceTenantService.deletePair(spaceid, spacetenantid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/meter/offlinemeter.service.js b/admin/app/services/settings/meter/offlinemeter.service.js index 3fd91bd8..be1845d1 100644 --- a/admin/app/services/settings/meter/offlinemeter.service.js +++ b/admin/app/services/settings/meter/offlinemeter.service.js @@ -17,24 +17,24 @@ app.factory('OfflineMeterService', function($http) { callback(response); }); }, - addOfflineMeter: function(offlinemeter, callback) { - $http.post(getAPI()+'offlinemeters',{data:offlinemeter}) + addOfflineMeter: function(offlinemeter, headers, callback) { + $http.post(getAPI()+'offlinemeters',{data:offlinemeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editdOfflineMeter: function(offlinemeter, callback) { - $http.put(getAPI()+'offlinemeters/'+offlinemeter.id,{data:offlinemeter}) + editOfflineMeter: function(offlinemeter, headers, callback) { + $http.put(getAPI()+'offlinemeters/'+offlinemeter.id,{data:offlinemeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteOfflineMeter: function(offlinemeter, callback) { - $http.delete(getAPI()+'offlinemeters/'+offlinemeter.id) + deleteOfflineMeter: function(offlinemeter, headers, callback) { + $http.delete(getAPI()+'offlinemeters/'+offlinemeter.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/meter/virtualmeter.service.js b/admin/app/services/settings/meter/virtualmeter.service.js index afebe297..2cf6eeda 100644 --- a/admin/app/services/settings/meter/virtualmeter.service.js +++ b/admin/app/services/settings/meter/virtualmeter.service.js @@ -17,24 +17,24 @@ app.factory('VirtualMeterService', function($http) { callback(response); }); }, - addVirtualMeter: function(virtualmeter, callback) { - $http.post(getAPI()+'virtualmeters',{data:virtualmeter}) + addVirtualMeter: function(virtualmeter, headers, callback) { + $http.post(getAPI()+'virtualmeters',{data:virtualmeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editVirtualMeter: function(virtualmeter, callback) { - $http.put(getAPI()+'virtualmeters/'+virtualmeter.id,{data:virtualmeter}) + editVirtualMeter: function(virtualmeter, headers, callback) { + $http.put(getAPI()+'virtualmeters/'+virtualmeter.id,{data:virtualmeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteVirtualMeter: function(virtualmeter, callback) { - $http.delete(getAPI()+'virtualmeters/'+virtualmeter.id) + deleteVirtualMeter: function(virtualmeter, headers, callback) { + $http.delete(getAPI()+'virtualmeters/'+virtualmeter.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/space.service.js b/admin/app/services/settings/space/space.service.js index b3a440fa..35a32c25 100644 --- a/admin/app/services/settings/space/space.service.js +++ b/admin/app/services/settings/space/space.service.js @@ -33,24 +33,24 @@ app.factory('SpaceService', function($http) { callback(response); }); }, - addSpace: function(space, callback) { - $http.post(getAPI()+'spaces',{data:space}) + addSpace: function(space, headers, callback) { + $http.post(getAPI()+'spaces',{data:space}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editSpace: function(space, callback) { - $http.put(getAPI()+'spaces/'+space.id,{data:space}) + editSpace: function(space, headers, callback) { + $http.put(getAPI()+'spaces/'+space.id,{data:space}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteSpace: function(space, callback) { - $http.delete(getAPI()+'spaces/'+space.id) + deleteSpace: function(space, headers, callback) { + $http.delete(getAPI()+'spaces/'+space.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacecombinedequipment.service.js b/admin/app/services/settings/space/spacecombinedequipment.service.js index 842b7f4f..0dc0b248 100644 --- a/admin/app/services/settings/space/spacecombinedequipment.service.js +++ b/admin/app/services/settings/space/spacecombinedequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceCombinedEquipmentService', function($http) { return { - addPair: function(spaceID,combinedequipmentID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/combinedequipments',{data:{'combined_equipment_id':combinedequipmentID}}) + addPair: function(spaceID,combinedequipmentID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/combinedequipments',{data:{'combined_equipment_id':combinedequipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceCombinedEquipmentService', function($http) { }); }, - deletePair: function(spaceID, combinedequipmentID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/combinedequipments/'+combinedequipmentID) + deletePair: function(spaceID, combinedequipmentID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/combinedequipments/'+combinedequipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spaceequipment.service.js b/admin/app/services/settings/space/spaceequipment.service.js index beeb4bef..e825206a 100644 --- a/admin/app/services/settings/space/spaceequipment.service.js +++ b/admin/app/services/settings/space/spaceequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceEquipmentService', function($http) { return { - addPair: function(spaceID,equipmentID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/equipments',{data:{'equipment_id':equipmentID}}) + addPair: function(spaceID,equipmentID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/equipments',{data:{'equipment_id':equipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceEquipmentService', function($http) { }); }, - deletePair: function(spaceID, equipmentID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/equipments/'+equipmentID) + deletePair: function(spaceID, equipmentID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/equipments/'+equipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacemeter.service.js b/admin/app/services/settings/space/spacemeter.service.js index 3fdc935b..5c67fe51 100644 --- a/admin/app/services/settings/space/spacemeter.service.js +++ b/admin/app/services/settings/space/spacemeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('SpaceMeterService', function($http) { return { - addPair: function(spaceID,meterID, metertype,callback) { + addPair: function(spaceID,meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('SpaceMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'spaces/'+spaceID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'spaces/'+spaceID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('SpaceMeterService', function($http) { }); }, - deletePair: function(spaceID,meterID, metertype, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/'+metertype+'/'+meterID) + deletePair: function(spaceID,meterID, metertype, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacepoint.service.js b/admin/app/services/settings/space/spacepoint.service.js index 8bb5f592..dd530fc3 100644 --- a/admin/app/services/settings/space/spacepoint.service.js +++ b/admin/app/services/settings/space/spacepoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpacePointService', function($http) { return { - addPair: function(spaceID,pointID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/points',{data:{'point_id':pointID}}) + addPair: function(spaceID,pointID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpacePointService', function($http) { }); }, - deletePair: function(spaceID,pointID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/points/'+pointID) + deletePair: function(spaceID,pointID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacesensor.service.js b/admin/app/services/settings/space/spacesensor.service.js index ec757386..ab942e83 100644 --- a/admin/app/services/settings/space/spacesensor.service.js +++ b/admin/app/services/settings/space/spacesensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceSensorService', function($http) { return { - addPair: function(spaceID,sensorID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(spaceID,sensorID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceSensorService', function($http) { }); }, - deletePair: function(spaceID,sensorID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/sensors/'+sensorID) + deletePair: function(spaceID,sensorID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/sensors/'+sensorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spaceshopfloor.service.js b/admin/app/services/settings/space/spaceshopfloor.service.js index 36d61e16..750768aa 100644 --- a/admin/app/services/settings/space/spaceshopfloor.service.js +++ b/admin/app/services/settings/space/spaceshopfloor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceShopfloorService', function($http) { return { - addPair: function(spaceID,shopfloorID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/shopfloors',{data:{'shopfloor_id':shopfloorID}}) + addPair: function(spaceID,shopfloorID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/shopfloors',{data:{'shopfloor_id':shopfloorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceShopfloorService', function($http) { }); }, - deletePair: function(spaceID, shopfloorID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/shopfloors/'+shopfloorID) + deletePair: function(spaceID, shopfloorID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/shopfloors/'+shopfloorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacestore.service.js b/admin/app/services/settings/space/spacestore.service.js index 2878a8ff..8ce11034 100644 --- a/admin/app/services/settings/space/spacestore.service.js +++ b/admin/app/services/settings/space/spacestore.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceStoreService', function($http) { return { - addPair: function(spaceID,storeID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/stores',{data:{'store_id':storeID}}) + addPair: function(spaceID,storeID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/stores',{data:{'store_id':storeID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceStoreService', function($http) { }); }, - deletePair: function(spaceID, storeID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/stores/'+storeID) + deletePair: function(spaceID, storeID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/stores/'+storeID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacetenant.service.js b/admin/app/services/settings/space/spacetenant.service.js index ef52f646..15b93a73 100644 --- a/admin/app/services/settings/space/spacetenant.service.js +++ b/admin/app/services/settings/space/spacetenant.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceTenantService', function($http) { return { - addPair: function(spaceID,tenantID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/tenants',{data:{'tenant_id':tenantID}}) + addPair: function(spaceID,tenantID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/tenants',{data:{'tenant_id':tenantID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceTenantService', function($http) { }); }, - deletePair: function(spaceID, tenantID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/tenants/'+tenantID) + deletePair: function(spaceID, tenantID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/tenants/'+tenantID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index 2281a9d6..c882a507 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -91,6 +91,7 @@ class OfflineMeterCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -318,6 +319,7 @@ class OfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_OFFLINE_METER_ID') @@ -473,6 +475,7 @@ class OfflineMeterItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: diff --git a/myems-api/core/space.py b/myems-api/core/space.py index 3fa1f14d..c655f1b2 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -108,6 +108,7 @@ class SpaceCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') new_values = json.loads(raw_json) @@ -361,6 +362,7 @@ class SpaceItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -519,6 +521,7 @@ class SpaceItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -863,6 +866,7 @@ class SpaceCombinedEquipmentCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -937,6 +941,7 @@ class SpaceCombinedEquipmentItem: @staticmethod @user_logger def on_delete(req, resp, id_, eid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1032,6 +1037,7 @@ class SpaceEquipmentCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1106,6 +1112,7 @@ class SpaceEquipmentItem: @staticmethod @user_logger def on_delete(req, resp, id_, eid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1214,6 +1221,7 @@ class SpaceMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1288,6 +1296,7 @@ class SpaceMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1398,6 +1407,7 @@ class SpaceOfflineMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1472,6 +1482,7 @@ class SpaceOfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1580,6 +1591,7 @@ class SpacePointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1654,6 +1666,7 @@ class SpacePointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1749,6 +1762,7 @@ class SpaceSensorCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1823,6 +1837,7 @@ class SpaceSensorItem: @staticmethod @user_logger def on_delete(req, resp, id_, sid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1917,6 +1932,7 @@ class SpaceShopfloorCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1991,6 +2007,7 @@ class SpaceShopfloorItem: @staticmethod @user_logger def on_delete(req, resp, id_, sid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -2085,6 +2102,7 @@ class SpaceStoreCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -2159,6 +2177,7 @@ class SpaceStoreItem: @staticmethod @user_logger def on_delete(req, resp, id_, tid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -2253,6 +2272,7 @@ class SpaceTenantCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -2327,6 +2347,7 @@ class SpaceTenantItem: @staticmethod @user_logger def on_delete(req, resp, id_, tid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -2435,6 +2456,7 @@ class SpaceVirtualMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -2509,6 +2531,7 @@ class SpaceVirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index 261a11c2..78e720a3 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -142,6 +142,7 @@ class VirtualMeterCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -474,6 +475,7 @@ class VirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_VIRTUAL_METER_ID') @@ -638,6 +640,7 @@ class VirtualMeterItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: