seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/100/head
13621160019@163.com 2021-12-10 19:30:36 +08:00
parent fb93dad115 af7157fff9
commit c479e31fb0
25 changed files with 260 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
admin/app/controllers/settings/meter/offlinemeter.controller.js
View File

@ -1,6 +1,18 @@
'use strict'; '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() { $scope.getAllCostCenters = function() {
CostCenterService.getAllCostCenters(function (response) { CostCenterService.getAllCostCenters(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { 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.energy_item_id = undefined;
} }
offlinemeter.cost_center_id = offlinemeter.cost_center.id; 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -116,7 +129,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal,
modifiedOfflineMeter.energy_item_id = undefined; modifiedOfflineMeter.energy_item_id = undefined;
} }
modifiedOfflineMeter.cost_center_id = modifiedOfflineMeter.cost_center.id; 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) { if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -154,7 +168,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal,
}, },
function(isConfirm) { function(isConfirm) {
if (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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

13
admin/app/controllers/settings/meter/virtualmeter.controller.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
app.controller('VirtualMeterController', function($scope, $uibModal, $translate, app.controller('VirtualMeterController', function($scope, $window, $uibModal, $translate,
MeterService, MeterService,
VirtualMeterService, VirtualMeterService,
OfflineMeterService, OfflineMeterService,
@ -9,6 +9,8 @@ app.controller('VirtualMeterController', function($scope, $uibModal, $translate,
CostCenterService, CostCenterService,
toaster, toaster,
SweetAlert) { SweetAlert) {
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllCostCenters = function() { $scope.getAllCostCenters = function() {
CostCenterService.getAllCostCenters(function (response) { CostCenterService.getAllCostCenters(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
@ -96,7 +98,8 @@ $scope.getAllEnergyItems = function() {
virtualmeter.energy_item_id = undefined; virtualmeter.energy_item_id = undefined;
} }
virtualmeter.cost_center_id = virtualmeter.cost_center.id; 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -149,7 +152,8 @@ $scope.getAllEnergyItems = function() {
modifiedVirtualMeter.energy_item_id = undefined; modifiedVirtualMeter.energy_item_id = undefined;
} }
modifiedVirtualMeter.cost_center_id = modifiedVirtualMeter.cost_center.id; 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) { if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -187,7 +191,8 @@ $scope.getAllEnergyItems = function() {
}, },
function(isConfirm) { function(isConfirm) {
if (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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

21
admin/app/controllers/settings/space/space.controller.js
View File

@ -1,10 +1,20 @@
'use strict'; '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.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.currentSpace = {}; $scope.currentSpace = {};
$scope.currentSpaceChildren = []; $scope.currentSpaceChildren = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllCostCenters = function () { $scope.getAllCostCenters = function () {
CostCenterService.getAllCostCenters(function (response) { CostCenterService.getAllCostCenters(function (response) {
@ -141,7 +151,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos
if (space.contact != null) { if (space.contact != null) {
space.contact_id = space.contact.id; 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -194,7 +205,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos
} }
modifiedSpace.cost_center_id = modifiedSpace.cost_center.id; 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) { if (angular.isDefined(response.status) && response.status === 200) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -231,7 +243,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos
}, },
function (isConfirm) { function (isConfirm) {
if (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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

33
admin/app/controllers/settings/space/spacecombinedequipment.controller.js
View File

@ -1,17 +1,19 @@
'use strict'; 'use strict';
app.controller('SpaceCombinedEquipmentController', function($scope, $translate, app.controller('SpaceCombinedEquipmentController', function($scope,
SpaceService, $window,
CombinedEquipmentService, $translate,
SpaceCombinedEquipmentService, SpaceService,
toaster) { CombinedEquipmentService,
$scope.spaces = []; SpaceCombinedEquipmentService,
$scope.currentSpaceID = 1; toaster) {
$scope.combinedequipments = []; $scope.spaces = [];
$scope.spacecombinedequipments = []; $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) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -43,7 +45,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate,
$scope.getCombinedEquipmentsBySpaceID($scope.currentSpaceID); $scope.getCombinedEquipmentsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getCombinedEquipmentsBySpaceID = function(id) { $scope.getCombinedEquipmentsBySpaceID = function(id) {
$scope.spacecombinedequipments=[]; $scope.spacecombinedequipments=[];
@ -69,7 +71,8 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate,
$scope.pairCombinedEquipment=function(dragEl,dropEl){ $scope.pairCombinedEquipment=function(dragEl,dropEl){
var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id; var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id;
var spaceid=angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -95,8 +98,8 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate,
} }
var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id; var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id;
var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

30
admin/app/controllers/settings/space/spaceequipment.controller.js
View File

@ -1,13 +1,20 @@
'use strict'; 'use strict';
app.controller('SpaceEquipmentController', function($scope, $translate, SpaceService, EquipmentService, SpaceEquipmentService, toaster,SweetAlert) { app.controller('SpaceEquipmentController', function(
$scope.spaces = []; $scope,
$scope.currentSpaceID = 1; $window,
$scope.equipments = []; $translate,
$scope.spaceequipments = []; 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) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -39,7 +46,7 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer
$scope.getEquipmentsBySpaceID($scope.currentSpaceID); $scope.getEquipmentsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getEquipmentsBySpaceID = function(id) { $scope.getEquipmentsBySpaceID = function(id) {
$scope.spaceequipments=[]; $scope.spaceequipments=[];
@ -65,7 +72,8 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer
$scope.pairEquipment=function(dragEl,dropEl){ $scope.pairEquipment=function(dragEl,dropEl){
var equipmentid=angular.element('#'+dragEl).scope().equipment.id; var equipmentid=angular.element('#'+dragEl).scope().equipment.id;
var spaceid=angular.element(spacetreewithequipment).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -91,8 +99,8 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer
} }
var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id; var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id;
var spaceid = angular.element(spacetreewithequipment).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

39
admin/app/controllers/settings/space/spacemeter.controller.js
View File

@ -1,11 +1,20 @@
'use strict'; 'use strict';
app.controller('SpaceMeterController', function($scope ,$timeout, $translate, SpaceService, MeterService, VirtualMeterService, OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { app.controller('SpaceMeterController', function(
$scope.spaces = []; $scope ,
$scope.currentSpaceID = 1; $window,
$scope.spacemeters = []; $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) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -38,7 +47,7 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp
$scope.getMetersBySpaceID($scope.currentSpaceID); $scope.getMetersBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getMetersBySpaceID = function(id) { $scope.getMetersBySpaceID = function(id) {
var metertypes=['meters','virtualmeters','offlinemeters']; var metertypes=['meters','virtualmeters','offlinemeters'];
@ -119,7 +128,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp
$scope.pairMeter=function(dragEl,dropEl){ $scope.pairMeter=function(dragEl,dropEl){
var meterid=angular.element('#'+dragEl).scope().meter.id; var meterid=angular.element('#'+dragEl).scope().meter.id;
var spaceid=angular.element(spacetreewithmeter).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -146,7 +156,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp
var spacemeterid = angular.element('#' + dragEl).scope().spacemeter.id; var spacemeterid = angular.element('#' + dragEl).scope().spacemeter.id;
var spaceid = angular.element(spacetreewithmeter).jstree(true).get_top_selected(); var spaceid = angular.element(spacetreewithmeter).jstree(true).get_top_selected();
var metertype = angular.element('#' + dragEl).scope().spacemeter.metertype; 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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -166,12 +177,12 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp
}); });
}; };
$scope.getAllSpaces(); $scope.getAllSpaces();
$scope.getAllMeters(); $scope.getAllMeters();
$scope.getAllVirtualMeters(); $scope.getAllVirtualMeters();
$scope.getAllOfflineMeters(); $scope.getAllOfflineMeters();
$scope.refreshSpaceTree = function() { $scope.refreshSpaceTree = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -199,7 +210,7 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp
angular.element(spacetreewithmeter).jstree(true).settings.core.data = treedata['core']['data']; angular.element(spacetreewithmeter).jstree(true).settings.core.data = treedata['core']['data'];
angular.element(spacetreewithmeter).jstree(true).refresh(); angular.element(spacetreewithmeter).jstree(true).refresh();
}); });
}; };
$scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.$on('handleBroadcastSpaceChanged', function(event) {
$scope.spacemeters = []; $scope.spacemeters = [];

6
admin/app/controllers/settings/space/spacepoint.controller.js
View File

@ -96,7 +96,8 @@ app.controller('SpacePointController', function (
$scope.pairPoint = function (dragEl, dropEl) { $scope.pairPoint = function (dragEl, dropEl) {
var pointid = angular.element('#' + dragEl).scope().point.id; var pointid = angular.element('#' + dragEl).scope().point.id;
var spaceid = $scope.currentSpaceID; 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -122,7 +123,8 @@ app.controller('SpacePointController', function (
} }
var spacepointid = angular.element('#' + dragEl).scope().spacepoint.id; var spacepointid = angular.element('#' + dragEl).scope().spacepoint.id;
var spaceid = $scope.currentSpaceID; 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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

15
admin/app/controllers/settings/space/spacesensor.controller.js
View File

@ -1,10 +1,17 @@
'use strict'; '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.spaces = [];
$scope.currentSpaceID = 1; $scope.currentSpaceID = 1;
$scope.sensors = []; $scope.sensors = [];
$scope.spacesensors = []; $scope.spacesensors = [];
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
$scope.getAllSensors = function () { $scope.getAllSensors = function () {
SensorService.getAllSensors(function (response) { SensorService.getAllSensors(function (response) {
@ -63,7 +70,8 @@ app.controller('SpaceSensorController', function ($scope, $translate, SpaceServi
$scope.pairSensor = function (dragEl, dropEl) { $scope.pairSensor = function (dragEl, dropEl) {
var sensorid = angular.element('#' + dragEl).scope().sensor.id; var sensorid = angular.element('#' + dragEl).scope().sensor.id;
var spaceid = $scope.currentSpaceID; 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -89,7 +97,8 @@ app.controller('SpaceSensorController', function ($scope, $translate, SpaceServi
} }
var spacesensorid = angular.element('#' + dragEl).scope().spacesensor.id; var spacesensorid = angular.element('#' + dragEl).scope().spacesensor.id;
var spaceid = $scope.currentSpaceID; 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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

31
admin/app/controllers/settings/space/spaceshopfloor.controller.js
View File

@ -1,13 +1,19 @@
'use strict'; 'use strict';
app.controller('SpaceShopfloorController', function($scope, $translate, SpaceService, ShopfloorService, SpaceShopfloorService, toaster,SweetAlert) { app.controller('SpaceShopfloorController', function(
$scope.spaces = []; $scope,
$scope.currentSpaceID = 1; $window,
$scope.shopfloors = []; $translate,
$scope.spaceshopfloors = []; 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) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -39,7 +45,7 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer
$scope.getShopfloorsBySpaceID($scope.currentSpaceID); $scope.getShopfloorsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getShopfloorsBySpaceID = function(id) { $scope.getShopfloorsBySpaceID = function(id) {
$scope.spaceshopfloors=[]; $scope.spaceshopfloors=[];
@ -65,7 +71,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer
$scope.pairShopfloor=function(dragEl,dropEl){ $scope.pairShopfloor=function(dragEl,dropEl){
var shopfloorid=angular.element('#'+dragEl).scope().shopfloor.id; var shopfloorid=angular.element('#'+dragEl).scope().shopfloor.id;
var spaceid=angular.element(spacetreewithshopfloor).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -91,8 +98,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer
} }
var spaceshopfloorid = angular.element('#' + dragEl).scope().spaceshopfloor.id; var spaceshopfloorid = angular.element('#' + dragEl).scope().spaceshopfloor.id;
var spaceid = angular.element(spacetreewithshopfloor).jstree(true).get_top_selected(); var spaceid = angular.element(spacetreewithshopfloor).jstree(true).get_top_selected();
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, function (response) { SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, headers, function (response) {
if (angular.isDefined(response.status) && response.status === 204) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -112,7 +119,7 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer
}); });
}; };
$scope.getAllSpaces(); $scope.getAllSpaces();
$scope.getAllShopfloors(); $scope.getAllShopfloors();
$scope.refreshSpaceTree = function() { $scope.refreshSpaceTree = function() {

28
admin/app/controllers/settings/space/spacestore.controller.js
View File

@ -1,13 +1,18 @@
'use strict'; 'use strict';
app.controller('SpaceStoreController', function($scope, $translate, SpaceService, StoreService, SpaceStoreService, toaster,SweetAlert) { app.controller('SpaceStoreController', function(
$scope.spaces = []; $scope,
$scope.currentSpaceID = 1; $window,
$scope.stores = []; $translate,
$scope.spacestores = []; 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) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -39,7 +44,7 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService
$scope.getStoresBySpaceID($scope.currentSpaceID); $scope.getStoresBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getStoresBySpaceID = function(id) { $scope.getStoresBySpaceID = function(id) {
$scope.spacestores=[]; $scope.spacestores=[];
@ -65,7 +70,8 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService
$scope.pairStore=function(dragEl,dropEl){ $scope.pairStore=function(dragEl,dropEl){
var storeid=angular.element('#'+dragEl).scope().store.id; var storeid=angular.element('#'+dragEl).scope().store.id;
var spaceid=angular.element(spacetreewithstore).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -92,8 +98,8 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService
} }
var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id; var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id;
var spaceid = angular.element(spacetreewithstore).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",

37
admin/app/controllers/settings/space/spacetenant.controller.js
View File

@ -1,13 +1,19 @@
'use strict'; 'use strict';
app.controller('SpaceTenantController', function($scope, $translate, SpaceService, TenantService, SpaceTenantService, toaster,SweetAlert) { app.controller('SpaceTenantController', function(
$scope.spaces = []; $scope,
$scope.currentSpaceID = 1; $window,
$scope.tenants = []; $translate,
$scope.spacetenants = []; 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) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -39,7 +45,7 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic
$scope.getTenantsBySpaceID($scope.currentSpaceID); $scope.getTenantsBySpaceID($scope.currentSpaceID);
}); });
}); });
}; };
$scope.getTenantsBySpaceID = function(id) { $scope.getTenantsBySpaceID = function(id) {
$scope.spacetenants=[]; $scope.spacetenants=[];
@ -65,7 +71,8 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic
$scope.pairTenant=function(dragEl,dropEl){ $scope.pairTenant=function(dragEl,dropEl){
var tenantid=angular.element('#'+dragEl).scope().tenant.id; var tenantid=angular.element('#'+dragEl).scope().tenant.id;
var spaceid=angular.element(spacetreewithtenant).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 201) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -91,8 +98,8 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic
} }
var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id; var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id;
var spaceid = angular.element(spacetreewithtenant).jstree(true).get_top_selected(); 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) { if (angular.isDefined(response.status) && response.status === 204) {
toaster.pop({ toaster.pop({
type: "success", type: "success",
@ -112,10 +119,10 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic
}); });
}; };
$scope.getAllSpaces(); $scope.getAllSpaces();
$scope.getAllTenants(); $scope.getAllTenants();
$scope.refreshSpaceTree = function() { $scope.refreshSpaceTree = function() {
SpaceService.getAllSpaces(function (response) { SpaceService.getAllSpaces(function (response) {
if (angular.isDefined(response.status) && response.status === 200) { if (angular.isDefined(response.status) && response.status === 200) {
$scope.spaces = response.data; $scope.spaces = response.data;
@ -143,7 +150,7 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic
angular.element(spacetreewithtenant).jstree(true).settings.core.data = treedata['core']['data']; angular.element(spacetreewithtenant).jstree(true).settings.core.data = treedata['core']['data'];
angular.element(spacetreewithtenant).jstree(true).refresh(); angular.element(spacetreewithtenant).jstree(true).refresh();
}); });
}; };
$scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.$on('handleBroadcastSpaceChanged', function(event) {
$scope.spacetenants = []; $scope.spacetenants = [];

12
admin/app/services/settings/meter/offlinemeter.service.js
View File

@ -17,24 +17,24 @@ app.factory('OfflineMeterService', function($http) {
callback(response); callback(response);
}); });
}, },
addOfflineMeter: function(offlinemeter, callback) { addOfflineMeter: function(offlinemeter, headers, callback) {
$http.post(getAPI()+'offlinemeters',{data:offlinemeter}) $http.post(getAPI()+'offlinemeters',{data:offlinemeter}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
editdOfflineMeter: function(offlinemeter, callback) { editOfflineMeter: function(offlinemeter, headers, callback) {
$http.put(getAPI()+'offlinemeters/'+offlinemeter.id,{data:offlinemeter}) $http.put(getAPI()+'offlinemeters/'+offlinemeter.id,{data:offlinemeter}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
deleteOfflineMeter: function(offlinemeter, callback) { deleteOfflineMeter: function(offlinemeter, headers, callback) {
$http.delete(getAPI()+'offlinemeters/'+offlinemeter.id) $http.delete(getAPI()+'offlinemeters/'+offlinemeter.id, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

12
admin/app/services/settings/meter/virtualmeter.service.js
View File

@ -17,24 +17,24 @@ app.factory('VirtualMeterService', function($http) {
callback(response); callback(response);
}); });
}, },
addVirtualMeter: function(virtualmeter, callback) { addVirtualMeter: function(virtualmeter, headers, callback) {
$http.post(getAPI()+'virtualmeters',{data:virtualmeter}) $http.post(getAPI()+'virtualmeters',{data:virtualmeter}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
editVirtualMeter: function(virtualmeter, callback) { editVirtualMeter: function(virtualmeter, headers, callback) {
$http.put(getAPI()+'virtualmeters/'+virtualmeter.id,{data:virtualmeter}) $http.put(getAPI()+'virtualmeters/'+virtualmeter.id,{data:virtualmeter}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
deleteVirtualMeter: function(virtualmeter, callback) { deleteVirtualMeter: function(virtualmeter, headers, callback) {
$http.delete(getAPI()+'virtualmeters/'+virtualmeter.id) $http.delete(getAPI()+'virtualmeters/'+virtualmeter.id, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

12
admin/app/services/settings/space/space.service.js
View File

@ -33,24 +33,24 @@ app.factory('SpaceService', function($http) {
callback(response); callback(response);
}); });
}, },
addSpace: function(space, callback) { addSpace: function(space, headers, callback) {
$http.post(getAPI()+'spaces',{data:space}) $http.post(getAPI()+'spaces',{data:space}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
editSpace: function(space, callback) { editSpace: function(space, headers, callback) {
$http.put(getAPI()+'spaces/'+space.id,{data:space}) $http.put(getAPI()+'spaces/'+space.id,{data:space}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
callback(response); callback(response);
}); });
}, },
deleteSpace: function(space, callback) { deleteSpace: function(space, headers, callback) {
$http.delete(getAPI()+'spaces/'+space.id) $http.delete(getAPI()+'spaces/'+space.id, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spacecombinedequipment.service.js
View File

@ -1,8 +1,8 @@
'use strict'; 'use strict';
app.factory('SpaceCombinedEquipmentService', function($http) { app.factory('SpaceCombinedEquipmentService', function($http) {
return { return {
addPair: function(spaceID,combinedequipmentID,callback) { addPair: function(spaceID,combinedequipmentID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/combinedequipments',{data:{'combined_equipment_id':combinedequipmentID}}) $http.post(getAPI()+'spaces/'+spaceID+'/combinedequipments',{data:{'combined_equipment_id':combinedequipmentID}}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -10,8 +10,8 @@ app.factory('SpaceCombinedEquipmentService', function($http) {
}); });
}, },
deletePair: function(spaceID, combinedequipmentID, callback) { deletePair: function(spaceID, combinedequipmentID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/combinedequipments/'+combinedequipmentID) $http.delete(getAPI()+'spaces/'+spaceID+'/combinedequipments/'+combinedequipmentID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spaceequipment.service.js
View File

@ -1,8 +1,8 @@
'use strict'; 'use strict';
app.factory('SpaceEquipmentService', function($http) { app.factory('SpaceEquipmentService', function($http) {
return { return {
addPair: function(spaceID,equipmentID,callback) { addPair: function(spaceID,equipmentID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/equipments',{data:{'equipment_id':equipmentID}}) $http.post(getAPI()+'spaces/'+spaceID+'/equipments',{data:{'equipment_id':equipmentID}}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -10,8 +10,8 @@ app.factory('SpaceEquipmentService', function($http) {
}); });
}, },
deletePair: function(spaceID, equipmentID, callback) { deletePair: function(spaceID, equipmentID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/equipments/'+equipmentID) $http.delete(getAPI()+'spaces/'+spaceID+'/equipments/'+equipmentID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spacemeter.service.js
View File

@ -1,7 +1,7 @@
'use strict'; 'use strict';
app.factory('SpaceMeterService', function($http) { app.factory('SpaceMeterService', function($http) {
return { return {
addPair: function(spaceID,meterID, metertype,callback) { addPair: function(spaceID,meterID, metertype, headers, callback) {
var meter={}; var meter={};
if(metertype=='meters'){ if(metertype=='meters'){
meter={'meter_id':meterID}; meter={'meter_id':meterID};
@ -11,7 +11,7 @@ app.factory('SpaceMeterService', function($http) {
meter={'offline_meter_id':meterID}; 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) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -19,8 +19,8 @@ app.factory('SpaceMeterService', function($http) {
}); });
}, },
deletePair: function(spaceID,meterID, metertype, callback) { deletePair: function(spaceID,meterID, metertype, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/'+metertype+'/'+meterID) $http.delete(getAPI()+'spaces/'+spaceID+'/'+metertype+'/'+meterID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spacepoint.service.js
View File

@ -1,8 +1,8 @@
'use strict'; 'use strict';
app.factory('SpacePointService', function($http) { app.factory('SpacePointService', function($http) {
return { return {
addPair: function(spaceID,pointID,callback) { addPair: function(spaceID,pointID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/points',{data:{'point_id':pointID}}) $http.post(getAPI()+'spaces/'+spaceID+'/points',{data:{'point_id':pointID}}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -10,8 +10,8 @@ app.factory('SpacePointService', function($http) {
}); });
}, },
deletePair: function(spaceID,pointID, callback) { deletePair: function(spaceID,pointID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/points/'+pointID) $http.delete(getAPI()+'spaces/'+spaceID+'/points/'+pointID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spacesensor.service.js
View File

@ -1,8 +1,8 @@
'use strict'; 'use strict';
app.factory('SpaceSensorService', function($http) { app.factory('SpaceSensorService', function($http) {
return { return {
addPair: function(spaceID,sensorID,callback) { addPair: function(spaceID,sensorID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/sensors',{data:{'sensor_id':sensorID}}) $http.post(getAPI()+'spaces/'+spaceID+'/sensors',{data:{'sensor_id':sensorID}}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -10,8 +10,8 @@ app.factory('SpaceSensorService', function($http) {
}); });
}, },
deletePair: function(spaceID,sensorID, callback) { deletePair: function(spaceID,sensorID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/sensors/'+sensorID) $http.delete(getAPI()+'spaces/'+spaceID+'/sensors/'+sensorID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spaceshopfloor.service.js
View File

@ -1,8 +1,8 @@
'use strict'; 'use strict';
app.factory('SpaceShopfloorService', function($http) { app.factory('SpaceShopfloorService', function($http) {
return { return {
addPair: function(spaceID,shopfloorID,callback) { addPair: function(spaceID,shopfloorID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/shopfloors',{data:{'shopfloor_id':shopfloorID}}) $http.post(getAPI()+'spaces/'+spaceID+'/shopfloors',{data:{'shopfloor_id':shopfloorID}}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -10,8 +10,8 @@ app.factory('SpaceShopfloorService', function($http) {
}); });
}, },
deletePair: function(spaceID, shopfloorID, callback) { deletePair: function(spaceID, shopfloorID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/shopfloors/'+shopfloorID) $http.delete(getAPI()+'spaces/'+spaceID+'/shopfloors/'+shopfloorID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spacestore.service.js
View File

@ -1,8 +1,8 @@
'use strict'; 'use strict';
app.factory('SpaceStoreService', function($http) { app.factory('SpaceStoreService', function($http) {
return { return {
addPair: function(spaceID,storeID,callback) { addPair: function(spaceID,storeID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/stores',{data:{'store_id':storeID}}) $http.post(getAPI()+'spaces/'+spaceID+'/stores',{data:{'store_id':storeID}}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -10,8 +10,8 @@ app.factory('SpaceStoreService', function($http) {
}); });
}, },
deletePair: function(spaceID, storeID, callback) { deletePair: function(spaceID, storeID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/stores/'+storeID) $http.delete(getAPI()+'spaces/'+spaceID+'/stores/'+storeID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

8
admin/app/services/settings/space/spacetenant.service.js
View File

@ -1,8 +1,8 @@
'use strict'; 'use strict';
app.factory('SpaceTenantService', function($http) { app.factory('SpaceTenantService', function($http) {
return { return {
addPair: function(spaceID,tenantID,callback) { addPair: function(spaceID,tenantID, headers, callback) {
$http.post(getAPI()+'spaces/'+spaceID+'/tenants',{data:{'tenant_id':tenantID}}) $http.post(getAPI()+'spaces/'+spaceID+'/tenants',{data:{'tenant_id':tenantID}}, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {
@ -10,8 +10,8 @@ app.factory('SpaceTenantService', function($http) {
}); });
}, },
deletePair: function(spaceID, tenantID, callback) { deletePair: function(spaceID, tenantID, headers, callback) {
$http.delete(getAPI()+'spaces/'+spaceID+'/tenants/'+tenantID) $http.delete(getAPI()+'spaces/'+spaceID+'/tenants/'+tenantID, {headers})
.then(function (response) { .then(function (response) {
callback(response); callback(response);
}, function (response) { }, function (response) {

3
myems-api/core/offlinemeter.py
View File

@ -91,6 +91,7 @@ class OfflineMeterCollection:
@user_logger @user_logger
def on_post(req, resp): def on_post(req, resp):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -318,6 +319,7 @@ class OfflineMeterItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_): def on_delete(req, resp, id_):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_OFFLINE_METER_ID') description='API.INVALID_OFFLINE_METER_ID')
@ -473,6 +475,7 @@ class OfflineMeterItem:
@user_logger @user_logger
def on_put(req, resp, id_): def on_put(req, resp, id_):
"""Handles PUT requests""" """Handles PUT requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:

23
myems-api/core/space.py
View File

@ -108,6 +108,7 @@ class SpaceCollection:
@user_logger @user_logger
def on_post(req, resp): def on_post(req, resp):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
new_values = json.loads(raw_json) new_values = json.loads(raw_json)
@ -361,6 +362,7 @@ class SpaceItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_): def on_delete(req, resp, id_):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -519,6 +521,7 @@ class SpaceItem:
@user_logger @user_logger
def on_put(req, resp, id_): def on_put(req, resp, id_):
"""Handles PUT requests""" """Handles PUT requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -863,6 +866,7 @@ class SpaceCombinedEquipmentCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -937,6 +941,7 @@ class SpaceCombinedEquipmentItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, eid): def on_delete(req, resp, id_, eid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -1032,6 +1037,7 @@ class SpaceEquipmentCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -1106,6 +1112,7 @@ class SpaceEquipmentItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, eid): def on_delete(req, resp, id_, eid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -1214,6 +1221,7 @@ class SpaceMeterCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -1288,6 +1296,7 @@ class SpaceMeterItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, mid): def on_delete(req, resp, id_, mid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -1398,6 +1407,7 @@ class SpaceOfflineMeterCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -1472,6 +1482,7 @@ class SpaceOfflineMeterItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, mid): def on_delete(req, resp, id_, mid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -1580,6 +1591,7 @@ class SpacePointCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -1654,6 +1666,7 @@ class SpacePointItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, pid): def on_delete(req, resp, id_, pid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -1749,6 +1762,7 @@ class SpaceSensorCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -1823,6 +1837,7 @@ class SpaceSensorItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, sid): def on_delete(req, resp, id_, sid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -1917,6 +1932,7 @@ class SpaceShopfloorCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -1991,6 +2007,7 @@ class SpaceShopfloorItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, sid): def on_delete(req, resp, id_, sid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -2085,6 +2102,7 @@ class SpaceStoreCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -2159,6 +2177,7 @@ class SpaceStoreItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, tid): def on_delete(req, resp, id_, tid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -2253,6 +2272,7 @@ class SpaceTenantCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -2327,6 +2347,7 @@ class SpaceTenantItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, tid): def on_delete(req, resp, id_, tid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')
@ -2435,6 +2456,7 @@ class SpaceVirtualMeterCollection:
@user_logger @user_logger
def on_post(req, resp, id_): def on_post(req, resp, id_):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -2509,6 +2531,7 @@ class SpaceVirtualMeterItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_, mid): def on_delete(req, resp, id_, mid):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SPACE_ID') description='API.INVALID_SPACE_ID')

3
myems-api/core/virtualmeter.py
View File

@ -142,6 +142,7 @@ class VirtualMeterCollection:
@user_logger @user_logger
def on_post(req, resp): def on_post(req, resp):
"""Handles POST requests""" """Handles POST requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex:
@ -474,6 +475,7 @@ class VirtualMeterItem:
@staticmethod @staticmethod
@user_logger @user_logger
def on_delete(req, resp, id_): def on_delete(req, resp, id_):
access_control(req)
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_VIRTUAL_METER_ID') description='API.INVALID_VIRTUAL_METER_ID')
@ -638,6 +640,7 @@ class VirtualMeterItem:
@user_logger @user_logger
def on_put(req, resp, id_): def on_put(req, resp, id_):
"""Handles PUT requests""" """Handles PUT requests"""
access_control(req)
try: try:
raw_json = req.stream.read().decode('utf-8') raw_json = req.stream.read().decode('utf-8')
except Exception as ex: except Exception as ex: