diff --git a/.gitignore b/.gitignore index 31b9053f..23755ad8 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,26 @@ Thumbs.db # Folder config file Desktop.ini + + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +pip-wheel-metadata/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + diff --git a/CHANGELOG.md b/CHANGELOG.md index 302a1138..85776ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,63 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. +## [v1.6.0] - 2021-12-31 +### Added +- added energy output and input to combined equipment efficiency report +- added energy output and input to equipment efficiency report +- added offline meter billing procedure to aggregation service +- added virtual meter billing procedure to aggregation service +- added PUT actions to text/wechat/email messages in api +- added POST actions to create new email/wechat/text messages +- added locl/unlock user who faied login some times to admin and api +- added bind-mount upload file folder to containers of myems-api and admin + +### Changed +- updated dependencies in web ui +- updated react-countup to v6.1.0 in web ui +- updated Meter RealtimeChart in web ui +- updated web for latest Node.js version +- updated get messages by date range in admin and api +- updated get emailmessages api in postman and readme +- updated config.py in myems-aggregation service + +### Fixed +- None + +### Removed +- None. + +## [v1.5.1] - 2021-12-18 +### Added +- Added lock/unlock user function if user failed login with wrong password. + +### Changed +- Updated email message api and view with start/end datetime parameters. +- Changed all datatype JSON columns to datatype LONGTEXT in database. + +### Fixed +- None. + +### Removed +- None. + +## [v1.5.0] - 2021-12-12 +### Added +- Added energy model database +- Added access control to all core entities in api and admin ui. + +### Changed +- Updated notification(web message) in web and api +- Updated command of myems-api service in docker-compose. +- Updated Dockerfile of myems-api. +- Updated virtual meter procedure in normalization service. + +### Fixed +- None. + +### Removed +- None. + ## [v1.4.0] - 2021-11-14 ### Added - added installation on docker to myems-modbus-tcp. @@ -571,7 +628,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. -[Unreleased]: https://github.com/MyEMS/myems/compare/v1.4.0...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.6.0...HEAD +[v1.6.0]: https://github.com/MyEMS/myems/compare/v1.5.1...v1.6.0 +[v1.5.1]: https://github.com/MyEMS/myems/compare/v1.5.0...v1.5.1 +[v1.5.0]: https://github.com/MyEMS/myems/compare/v1.4.0...v1.5.0 [v1.4.0]: https://github.com/MyEMS/myems/compare/v1.3.4...v1.4.0 [v1.3.4]: https://github.com/MyEMS/myems/compare/v1.3.3...v1.3.4 [v1.3.3]: https://github.com/MyEMS/myems/compare/v1.3.2...v1.3.3 diff --git a/README.md b/README.md index 7bf62b7e..7efc1ad0 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,10 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可 | 功能 |社区版 | 说明 | | :--- | :----- | :----- | -| 开源 | ✔️ | | +| 开源 | ✔️ | MIT License | | 价格 | 免费 | | -| 更换品牌名称与标志LOGO | ❌ | | -| Modbus TCP 协议 | ✔️ | 采集数据 https://modbus.org/ | +| 更换品牌名称与标志LOGO | ❌ | | +| Modbus TCP 协议 | ✔️ | 采集数据 https://modbus.org/ | | 数据点数量 | 无限制 | 实际数量受限于服务器资源上限| | 计量表数量 | 无限制 | 实际数量受限于服务器资源上限| | 空间数量 | 无限制 | 实际数量受限于服务器资源上限| @@ -121,10 +121,10 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可 | 组合设备数据/批量分析 | ✔️ | 按空间层级筛选、空间向下递归查询、按报告期查询全部能耗分类数据、导出Excel | | 能流图分析 | ✔️ | 表示能源流动状况、节点显示用能单位、链接显示本月能源总量 | | 配电系统分析 | ✔️ | 高中低压配电系统、实时数据、配电系统图 | -| RESTful API | ✔️ | 基于Python开发，提供系统配置、能源报告、Excel导出接口 | +| RESTful API | ✔️ | 基于Python开发，提供系统配置、能源报告、Excel导出接口 | | Web UI | ✔️ | 基于ReactJS开发，用于能源数据分析 | | Admin UI | ✔️ | 基于AngularJS (version 1.x)开发，用于系统配置管理 | -| 在线社区技术支持 | ✔️ | | +| 在线社区技术支持 | ✔️ | | ## MyEMS企业版功能 @@ -142,7 +142,7 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可 [4]. [Gitlab](https://gitlab.com/myems/myems) https://gitlab.com/myems/myems -[5]. [CODE CHINA](https://codechina.csdn.net/myems/myems) https://codechina.csdn.net/myems/myems +[5]. [GitCode](https://gitcode.net/myems/myems) https://gitcode.net/myems/myems ## MyEMS安装(社区版) @@ -211,7 +211,7 @@ administrator@myems.io ### Docker-Compose 快速部署 -详见 [Docker Compose 快速部署](docker-compose.md) +详见 [Docker Compose 快速部署](docker-compose-cn.md) @@ -219,3 +219,6 @@ administrator@myems.io [社区版路线图](https://github.com/orgs/MyEMS/projects) +## QQ交流群 + +![QQ群1](/docs/images/qq-group-1.png) \ No newline at end of file diff --git a/README_DE.md b/README_DE.md index 3f4b43e6..da4c9619 100644 --- a/README_DE.md +++ b/README_DE.md @@ -40,18 +40,18 @@ MyEMS wird von einem erfahrenen Entwicklungsteam entwickelt und gewartet, und de | Eigenschaften | Gemeinschaftsausgabe | Erläuterung | | :--- | :----: | :----: | -| Open Source | ✔️ | | -| Pricing | Free | | -| Change Name and Logo | ️❌ | | -| Modbus TCP | ✔️ | | -| Number of Data Points | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Meters | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Spaces | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Equipments | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Tenants | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Stores | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Shop Floors | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Combined Equipments Number | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Open Source | ✔️ | MIT License | +| Pricing | Free | | +| Change Name and Logo | ️❌ | | +| Modbus TCP | ✔️ | | +| Number of Data Points | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Meters | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Spaces | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Equipments | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Tenants | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Stores | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Shop Floors | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Combined Equipments Number | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | | Docker | ✔️ | https://hub.docker.com/u/myems | | MySQL | ✔️ | http://mysql.com/ | | MariaDB | ✔️ | https://mariadb.org/ | @@ -62,7 +62,7 @@ MyEMS wird von einem erfahrenen Entwicklungsteam entwickelt und gewartet, und de | Private Cloud | ✔️ | | | Data Comparison | ✔️ | Jahr für Jahr, Monat für Monat, Freier Vergleich, Kein Vergleich | | Excel Exporter | ✔️ | Echte Excel-Datei, keine CSV-Datei, Tabellen, Liniendiagramme, Säulendiagramme, Kreisdiagramme | -| Meter/Energy Data | ✔️ | | +| Meter/Energy Data | ✔️ | Cascade select Space, Multiple Compare Types, Multiple Period Types, Reporting Period Total Consumption, Base Period Total Consumption, Reporting Period Ton of Standard Coal, Reporting Period Ton of Carbon Dioxide Emissions, Reporting Period Trend, Related Parameters Data, Detailed Data, Export to Excel | | Meter/Cost Data | ✔️ | | | Meter/Trend Data | ✔️ | | | Meter/Realtime Data | ✔️ | | @@ -139,7 +139,7 @@ Sehen [Funktionen der MyEMS Enterprise Edition](./enterprise-edition-de.md) [4]. [Gitlab](https://gitlab.com/myems/myems) https://gitlab.com/myems/myems -[5]. [CODE CHINA](https://codechina.csdn.net/myems/myems) https://codechina.csdn.net/myems/myems +[5]. [GitCode](https://gitcode.net/myems/myems) https://gitcode.net/myems/myems ## MyEMS Installation (Community Edition) @@ -209,8 +209,12 @@ administrator@myems.io ### Docker Compose Schnelle Bereitstellung -Sehen [Docker Compose Schnelle Bereitstellung](docker-compose.md) +Sehen [Docker Compose Schnelle Bereitstellung](docker-compose-de.md) ## MyEMS Straßenkarte [Community Edition Straßenkarte](https://github.com/orgs/MyEMS/projects) + +## QQ Group + +![QQ Group 1](/docs/images/qq-group-1.png) \ No newline at end of file diff --git a/README_EN.md b/README_EN.md index 9a5f1417..b2126839 100644 --- a/README_EN.md +++ b/README_EN.md @@ -40,7 +40,7 @@ MyEMS is being developed and maintained by an experienced development team, and | Features | Community Edition | Explanation | | :--- | :----: | :----: | -| Open Source | ✔️ | | +| Open Source | ✔️ | MIT License | | Pricing | Free | | | Change Name and Logo | ❌️ | | | Modbus TCP | ✔️ | | @@ -62,7 +62,7 @@ MyEMS is being developed and maintained by an experienced development team, and | Private Cloud | ✔️ | | | Data Comparison | ✔️ | Year-on-Year, Month-on-Month, Free Comparison, None Comparison | | Excel Exporter | ✔️ | Real Excel file, not CSV file. Tables, Line Charts, Column Charts, Pie Charts | -| Meter/Energy Data | ✔️ | | +| Meter/Energy Data | ✔️ | Cascade select Space, Multiple Compare Types, Multiple Period Types, Reporting Period Total Consumption, Base Period Total Consumption, Reporting Period Ton of Standard Coal, Reporting Period Ton of Carbon Dioxide Emissions, Reporting Period Trend, Related Parameters Data, Detailed Data, Export to Excel | | Meter/Cost Data | ✔️ | | | Meter/Trend Data | ✔️ | | | Meter/Realtime Data | ✔️ | | @@ -142,7 +142,7 @@ See [Features of MyEMS Enterprise Edition](./enterprise-edition-en.md) [4]. [Gitlab](https://gitlab.com/myems/myems) https://gitlab.com/myems/myems -[5]. [CODE CHINA](https://codechina.csdn.net/myems/myems) https://codechina.csdn.net/myems/myems +[5]. [GitCode](https://gitcode.net/myems/myems) https://gitcode.net/myems/myems ## MyEMS Installation (Community Edition) @@ -211,8 +211,12 @@ administrator@myems.io ### Docker Compose Repaid Deployment -See [Docker Compose Repaid Deployment](docker-compose.md) +See [Docker Compose Repaid Deployment](docker-compose-en.md) ## MyEMS Roadmap [Community Edition Roadmap](https://github.com/orgs/MyEMS/projects) + +## QQ Group + +![QQ Group 1](/docs/images/qq-group-1.png) \ No newline at end of file diff --git a/admin/Dockerfile b/admin/Dockerfile index 3ae1a605..a9301477 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,9 +1,12 @@ -FROM nginx:1.21.1 +FROM nginx:latest -# remove the config +# remove the default config RUN rm /etc/nginx/conf.d/default.conf && \ - rm /etc/nginx/nginx.conf && \ - mkdir -p /var/www/html/admin + rm /etc/nginx/nginx.conf + +# create new root folder +# todo: share upload folder in admin with myems-api container on Docker +RUN mkdir -p /var/www/html/admin # copy the config and web codes COPY nginx.conf /etc/nginx/ diff --git a/admin/README.md b/admin/README.md index e3e92fc9..774c0b10 100644 --- a/admin/README.md +++ b/admin/README.md @@ -14,24 +14,51 @@ nginx-1.18.0 or later In this section, you will install myems-admin on Docker. +* replace ~~127.0.0.1:8000~~ in nginx.conf with actual **HOST** ip and port of myems-api +```bash +cd myems/admin +nano nginx.conf +``` + +```bash + proxy_pass http://127.0.0.1:8000/; +``` + * Build a Docker image ```bash cd myems/admin docker build -t myems/myems-admin . ``` * Run a Docker container +If run on Windows host, bind-mount a share upload file folder at c:\upload to the container ```bash -docker run -d -p 8001:8001 --restart always --name myems-admin myems/myems-admin +docker run -d -p 8001:8001 -v c:\upload:/var/www/html/admin/upload --restart always --name myems-admin myems/myems-admin +``` +If run on Linux host, bind-mount a share upload file folder at /upload to the container +```bash +docker run -d -p 8001:8001 -v /upload:/var/www/html/admin/upload --restart always --name myems-admin myems/myems-admin ``` -d Run container in background and print container ID -p Publish a container's port(s) to the host, 8001:8001 (Host:Container) binds port 8001 (right) of the container to TCP port 8001 (left) of the host machine. +-v If you use -v or --volume to bind-mount a file or directory that does not yet exist on the Docker host, -v creates the endpoint for you. It is always created as a directory. + --restart Restart policy to apply when a container exits --name Assign a name to the container +If you want to immigrate the image to another computer, +* Export image to tarball file +```bash +docker save --output myems-admin.tar myems/myems-admin +``` +* Copy the tarball file to another computer, and then load image from tarball file +```bash +docker load --input .\myems-admin.tar +``` + ## Option 2: Install on NGINX Server * Install NGINX Server @@ -141,6 +168,8 @@ sudo nano /var/www/html/admin/app/api.js ## References -1. https://myems.io -2. https://dev.mysql.com/doc/connector-python/en/ -3. https://nginx.org/ \ No newline at end of file +[1]. https://myems.io + +[2]. https://dev.mysql.com/doc/connector-python/en/ + +[3]. https://nginx.org/ \ No newline at end of file diff --git a/admin/app/config.router.js b/admin/app/config.router.js index 4aa78934..b71ca90e 100644 --- a/admin/app/config.router.js +++ b/admin/app/config.router.js @@ -49,7 +49,7 @@ app serie: true, files: [ 'app/services/login/login.service.js', - 'app/services/fdd/webmessageanalysis.service.js', + 'app/services/fdd/webmessage.service.js', 'app/services/users/user/user.service.js', 'app/controllers/users/user/user.controller.js', 'app/controllers/login/login.controller.js' @@ -141,7 +141,7 @@ app }, { serie: true, files: [ - 'app/services/fdd/textmessageanalysis.service.js', + 'app/services/fdd/textmessage.service.js', 'app/controllers/fdd/textmessage/textmessage.controller.js', 'app/controllers/fdd/textmessage/textmessagemaster.controller.js', 'app/controllers/fdd/textmessage/textmessageoption.controller.js' @@ -185,7 +185,7 @@ app }, { serie: true, files: [ - 'app/services/fdd/emailmessageanalysis.service.js', + 'app/services/fdd/emailmessage.service.js', 'app/controllers/fdd/emailmessage/emailmessage.controller.js', 'app/controllers/fdd/emailmessage/emailmessagemaster.controller.js', 'app/controllers/fdd/emailmessage/emailmessageoption.controller.js' @@ -229,7 +229,7 @@ app }, { serie: true, files: [ - 'app/services/fdd/webmessageanalysis.service.js', + 'app/services/fdd/webmessage.service.js', 'app/controllers/fdd/webmessage/webmessage.controller.js', 'app/controllers/fdd/webmessage/webmessagemaster.controller.js', 'app/controllers/fdd/webmessage/webmessageoption.controller.js' @@ -273,7 +273,7 @@ app }, { serie: true, files: [ - 'app/services/fdd/wechatmessageanalysis.service.js', + 'app/services/fdd/wechatmessage.service.js', 'app/controllers/fdd/wechatmessage/wechatmessage.controller.js', 'app/controllers/fdd/wechatmessage/wechatmessagemaster.controller.js', 'app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js' @@ -299,7 +299,7 @@ app serie: true, files: [ 'app/services/login/login.service.js', - 'app/services/fdd/webmessageanalysis.service.js', + 'app/services/fdd/webmessage.service.js', 'app/services/users/user/user.service.js', 'app/controllers/users/user/user.controller.js', 'app/controllers/login/login.controller.js' @@ -1108,7 +1108,7 @@ app serie: true, files: [ 'app/services/login/login.service.js', - 'app/services/fdd/webmessageanalysis.service.js', + 'app/services/fdd/webmessage.service.js', 'app/services/users/user/user.service.js', 'app/controllers/users/user/user.controller.js', 'app/controllers/login/login.controller.js' @@ -1213,7 +1213,7 @@ app serie: true, files: [ 'app/services/login/login.service.js', - 'app/services/fdd/webmessageanalysis.service.js', + 'app/services/fdd/webmessage.service.js', 'app/services/users/user/user.service.js', 'app/controllers/users/user/user.controller.js', 'app/controllers/login/login.controller.js' diff --git a/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js index 6ffeeedc..102de47e 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js @@ -1,9 +1,14 @@ 'use strict'; -app.controller('EmailMessageController', function($scope, $timeout,$translate, - EmailMessageAnalysisService, - toaster, SweetAlert) { - +app.controller('EmailMessageController', function( + $scope, + $window, + $timeout, + $translate, + EmailMessageService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastEmailMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -34,7 +39,8 @@ app.controller('EmailMessageController', function($scope, $timeout,$translate, }, function(isConfirm) { if (isConfirm) { - EmailMessageAnalysisService.deleteEmailMessage(emailmessage, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EmailMessageService.deleteEmailMessage(emailmessage, headers, function(response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -50,11 +56,11 @@ app.controller('EmailMessageController', function($scope, $timeout,$translate, body: $translate.instant(response.data.description), showCloseButton: true, }); - } }); } - }); + } + ); }; }); \ No newline at end of file diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 69eb0b6a..b5d12b1a 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -1,44 +1,47 @@ 'use strict'; -app.controller('EmailMessageOptionController', function($scope, $timeout, - EmailMessageAnalysisService) { +app.controller('EmailMessageOptionController', function( + $scope, + $window, + $timeout, + EmailMessageService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { - var datestart,dateend; + var startdatetime, enddatetime; var query = { - datestart: $scope.daterange.startDate.format().slice(0, 10), - dateend: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 19), + enddatetime: $scope.daterange.endDate.format().slice(0, 19) }; + $scope.$emit('handleEmitEmailMessageOptionChanged', { load: true, period:$scope.currentPeriod }); - - EmailMessageAnalysisService.getAnalysisResult(query, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EmailMessageService.getResult(query, headers, function(response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.$emit('handleEmitEmailMessageOptionChanged', response.data); } diff --git a/admin/app/controllers/fdd/rule/rule.controller.js b/admin/app/controllers/fdd/rule/rule.controller.js index 9719b295..d85c5be8 100644 --- a/admin/app/controllers/fdd/rule/rule.controller.js +++ b/admin/app/controllers/fdd/rule/rule.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('RuleController', function($scope, $uibModal, $translate, RuleService, toaster, SweetAlert) { +app.controller('RuleController', function( + $scope, + $window, + $uibModal, + $translate, + RuleService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.initExpression = [{ "sample_object_id": 1, @@ -13,7 +21,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer $scope.initMessageTemplate = 'This a sample template. Use %s for substitution. You can use multiple %s s in the template.'; $scope.getAllRules = function() { - RuleService.getAllRules(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.getAllRules(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.rules = response.data; } else { @@ -40,7 +49,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer } }); modalInstance.result.then(function(rule) { - RuleService.addRule(rule, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.addRule(rule, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -79,7 +89,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer }); modalInstance.result.then(function(modifiedRule) { - RuleService.editRule(modifiedRule, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.editRule(modifiedRule, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -117,7 +128,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer }, function(isConfirm) { if (isConfirm) { - RuleService.deleteRule(rule, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.deleteRule(rule, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/fdd/textmessage/textmessage.controller.js b/admin/app/controllers/fdd/textmessage/textmessage.controller.js index 4a0ee551..815334fa 100644 --- a/admin/app/controllers/fdd/textmessage/textmessage.controller.js +++ b/admin/app/controllers/fdd/textmessage/textmessage.controller.js @@ -1,8 +1,14 @@ 'use strict'; -app.controller('TextMessageController', function($scope,$timeout,$translate, - TextMessageAnalysisService,SweetAlert,toaster) { - +app.controller('TextMessageController', function( + $scope, + $window, + $timeout, + $translate, + TextMessageService, + SweetAlert, + toaster) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastTextMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -32,7 +38,8 @@ app.controller('TextMessageController', function($scope,$timeout,$translate, }, function(isConfirm) { if (isConfirm) { - TextMessageAnalysisService.deleteTextMessage(textmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TextMessageService.deleteTextMessage(textmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -52,7 +59,7 @@ app.controller('TextMessageController', function($scope,$timeout,$translate, } }); } - }); + } + ); }; - }); diff --git a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js index 2d9873c1..8c6deaeb 100644 --- a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js +++ b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js @@ -1,44 +1,47 @@ 'use strict'; -app.controller('TextMessageOptionController', function($scope, $timeout, - TextMessageAnalysisService) { +app.controller('TextMessageOptionController', function( + $scope, + $window, + $timeout, + TextMessageService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { - var datestart,dateend; + var startdatetime, enddatetime; var query = { - datestart: $scope.daterange.startDate.format().slice(0, 10), - dateend: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 19), + enddatetime: $scope.daterange.endDate.format().slice(0, 19) }; $scope.$emit('handleEmitTextMessageOptionChanged', { load: true, period:$scope.currentPeriod }); - - TextMessageAnalysisService.getAnalysisResult(query, function (response) { + console.log(query) + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TextMessageService.getResult(query, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.$emit('handleEmitTextMessageOptionChanged', response.data); } diff --git a/admin/app/controllers/fdd/webmessage/webmessage.controller.js b/admin/app/controllers/fdd/webmessage/webmessage.controller.js index 9cf4e0f3..51a31096 100644 --- a/admin/app/controllers/fdd/webmessage/webmessage.controller.js +++ b/admin/app/controllers/fdd/webmessage/webmessage.controller.js @@ -1,6 +1,15 @@ 'use strict'; -app.controller('WebMessageController', function($scope, $timeout, $translate, $uibModal, WebMessageAnalysisService, toaster, SweetAlert) { +app.controller('WebMessageController', function( + $scope, + $window, + $timeout, + $translate, + $uibModal, + WebMessageService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastWebMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -32,7 +41,8 @@ app.controller('WebMessageController', function($scope, $timeout, $translate, $u modalInstance.result.then(function(modifiedWebmessage) { modifiedWebmessage.status = "acknowledged"; - WebMessageAnalysisService.editWebMessage(modifiedWebmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageService.editWebMessage(modifiedWebmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -70,7 +80,8 @@ app.controller('WebMessageController', function($scope, $timeout, $translate, $u }, function(isConfirm) { if (isConfirm) { - WebMessageAnalysisService.deleteWebMessage(webmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageService.deleteWebMessage(webmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js index 2301def8..cf6e63d7 100644 --- a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js +++ b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js @@ -1,45 +1,50 @@ 'use strict'; -app.controller('WebMessageOptionController', function($scope, $timeout, - WebMessageAnalysisService) { +app.controller('WebMessageOptionController', function( + $scope, + $window, + $timeout, + WebMessageService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { + var startdatetime, enddatetime; var query = { - datestart: $scope.daterange.startDate.format().slice(0, 10), - dateend: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 19), + enddatetime: $scope.daterange.endDate.format().slice(0, 19) }; $scope.$emit('handleEmitWebMessageOptionChanged', { load: true, period:$scope.currentPeriod }); - WebMessageAnalysisService.getAnalysisResult(query, function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.$emit('handleEmitWebMessageOptionChanged', response.data); - } + console.log(query) + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageService.getResult(query, headers, function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + $scope.$emit('handleEmitWebMessageOptionChanged', response.data); + } }); }; diff --git a/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js b/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js index 0da845ce..70a787ec 100644 --- a/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js +++ b/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('WechatMessageController', function($scope, $timeout,$translate, WechatMessageAnalysisService, toaster, SweetAlert) { - +app.controller('WechatMessageController', function( + $scope, + $window, + $timeout, + $translate, + WechatMessageService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastWechatMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -31,7 +38,8 @@ app.controller('WechatMessageController', function($scope, $timeout,$translate, }, function(isConfirm) { if (isConfirm) { - WechatMessageAnalysisService.deleteWechatMessage(wechatmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WechatMessageService.deleteWechatMessage(wechatmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -51,6 +59,7 @@ app.controller('WechatMessageController', function($scope, $timeout,$translate, } }); } - }); + } + ); }; }); diff --git a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js index 8f8b3ce5..fd8a7624 100644 --- a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js +++ b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js @@ -1,42 +1,47 @@ 'use strict'; -app.controller('WechatMessageOptionController', function($scope, $timeout, - WechatMessageAnalysisService) { +app.controller('WechatMessageOptionController', function( + $scope, + $window, + $timeout, + WechatMessageService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { + var startdatetime, enddatetime; var query = { - datestart: $scope.daterange.startDate.format().slice(0, 10), - dateend: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 19), + enddatetime: $scope.daterange.endDate.format().slice(0, 19) }; $scope.$emit('handleEmitWechatMessageOptionChanged', { load: true, period:$scope.currentPeriod }); - WechatMessageAnalysisService.getAnalysisResult(query, function (response) { + console.log(query) + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WechatMessageService.getResult(query, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.$emit('handleEmitWechatMessageOptionChanged', response.data); } diff --git a/admin/app/controllers/login/login.controller.js b/admin/app/controllers/login/login.controller.js index 86e702b9..b02bc78e 100644 --- a/admin/app/controllers/login/login.controller.js +++ b/admin/app/controllers/login/login.controller.js @@ -10,7 +10,7 @@ app.controller('LoginController', function ( $interval, LoginService, UserService, - WebMessageAnalysisService, + WebMessageService, toaster) { $scope.dataLoading = false; @@ -200,11 +200,14 @@ app.controller('LoginController', function ( // web message alarm section start $scope.webmessages = []; $scope.getWebMessage = function () { - WebMessageAnalysisService.getStatusNewResult(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.webmessages = response.data; - } - }); + if ($scope.cur_user != null && $scope.cur_user.uuid != null && $scope.cur_user.token != null) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageService.getStatusNewResult(headers, function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + $scope.webmessages = response.data; + } + }); + } }; // web message alarm section end diff --git a/admin/app/controllers/settings/category/energycategory.controller.js b/admin/app/controllers/settings/category/energycategory.controller.js index fcc0db00..def966a5 100644 --- a/admin/app/controllers/settings/category/energycategory.controller.js +++ b/admin/app/controllers/settings/category/energycategory.controller.js @@ -1,7 +1,13 @@ 'use strict'; -app.controller('EnergyCategoryController', function($scope, $translate,$uibModal, CategoryService,toaster,SweetAlert) { - +app.controller('EnergyCategoryController', function($scope, + $window, + $translate, + $uibModal, + CategoryService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCategories = function() { CategoryService.getAllCategories(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -10,7 +16,6 @@ app.controller('EnergyCategoryController', function($scope, $translate,$uibModal $scope.categories = []; } }); - }; $scope.addCategory = function() { diff --git a/admin/app/controllers/settings/category/energyitem.controller.js b/admin/app/controllers/settings/category/energyitem.controller.js index e6abad0b..eb754823 100644 --- a/admin/app/controllers/settings/category/energyitem.controller.js +++ b/admin/app/controllers/settings/category/energyitem.controller.js @@ -1,6 +1,15 @@ 'use strict'; -app.controller('EnergyItemController', function($scope, $translate,$uibModal, CategoryService, EnergyItemService, toaster,SweetAlert) { +app.controller('EnergyItemController', function( + $scope, + $window, + $translate, + $uibModal, + CategoryService, + EnergyItemService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCategories = function() { CategoryService.getAllCategories(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -38,7 +47,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca } }); modalInstance.result.then(function(energyItem) { - EnergyItemService.addEnergyItem(energyItem, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyItemService.addEnergyItem(energyItem, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -78,7 +88,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca }); modalInstance.result.then(function (modifiedEnergyItem) { - EnergyItemService.editEnergyItem(modifiedEnergyItem, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyItemService.editEnergyItem(modifiedEnergyItem, headers, function (response){ if(angular.isDefined(response.status) && response.status === 200){ toaster.pop({ type: "success", @@ -114,7 +125,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - EnergyItemService.deleteEnergyItem(energyItem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyItemService.deleteEnergyItem(energyItem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js index 64f39335..15cc7134 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js @@ -1,7 +1,15 @@ 'use strict'; -app.controller('CombinedEquipmentController', function ($scope, $translate, $uibModal, CombinedEquipmentService, CostCenterService, toaster, SweetAlert) { - +app.controller('CombinedEquipmentController', function ( + $scope, + $window, + $translate, + $uibModal, + CombinedEquipmentService, + CostCenterService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCombinedEquipments = function () { CombinedEquipmentService.getAllCombinedEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -36,7 +44,8 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib }); modalInstance.result.then(function (combinedequipment) { combinedequipment.cost_center_id = combinedequipment.cost_center.id; - CombinedEquipmentService.addCombinedEquipment(combinedequipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentService.addCombinedEquipment(combinedequipment, headers,function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -76,8 +85,9 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib }); modalInstance.result.then(function (modifiedCombinedEquipment) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; modifiedCombinedEquipment.cost_center_id = modifiedCombinedEquipment.cost_center.id; - CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, function (response) { + CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -115,7 +125,8 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib }, function (isConfirm) { if (isConfirm) { - CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js index 8448257d..fb8a9ccb 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js @@ -1,6 +1,15 @@ 'use strict'; -app.controller('CombinedEquipmentEquipmentController', function ($scope, $translate, CombinedEquipmentService, EquipmentService, CombinedEquipmentEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentEquipmentController', function ( + $scope, + $window, + $translate, + CombinedEquipmentService, + EquipmentService, + CombinedEquipmentEquipmentService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = {selected:undefined}; $scope.getAllEquipments = function () { @@ -42,7 +51,8 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $transl $scope.pairEquipment = function (dragEl, dropEl) { var equipmentid = angular.element('#' + dragEl).scope().equipment.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; - CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -69,7 +79,8 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $transl } var combinedequipmentequipmentid = angular.element('#' + dragEl).scope().combinedequipmentequipment.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; - CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js index 96a4097c..b9ba9b39 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js @@ -1,6 +1,19 @@ 'use strict'; -app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentMeterService, CombinedEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentMeterController', function ( + $scope, + $window, + $timeout, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + CombinedEquipmentMeterService, + CombinedEquipmentService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = { selected: undefined }; $scope.getAllCombinedEquipments = function (id) { @@ -111,7 +124,8 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $ modalInstance.result.then(function (is_output) { var meterid = angular.element('#' + dragEl).scope().meter.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; - CombinedEquipmentMeterService.addPair(combinedequipmentid, meterid, $scope.currentMeterType, is_output, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentMeterService.addPair(combinedequipmentid, meterid, $scope.currentMeterType, is_output, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -141,7 +155,8 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $ var combinedequipmentmeterid = angular.element('#' + dragEl).scope().combinedequipmentmeter.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; var metertype = angular.element('#' + dragEl).scope().combinedequipmentmeter.metertype; - CombinedEquipmentMeterService.deletePair(combinedequipmentid, combinedequipmentmeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentMeterService.deletePair(combinedequipmentid, combinedequipmentmeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js index c52bef8f..7e73ecdf 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js @@ -1,6 +1,19 @@ 'use strict'; -app.controller('CombinedEquipmentParameterController', function ($scope, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentParameterService, CombinedEquipmentService, PointService, toaster, SweetAlert) { +app.controller('CombinedEquipmentParameterController', function ( + $scope, + $window, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + CombinedEquipmentParameterService, + CombinedEquipmentService, + PointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = { selected: undefined }; $scope.is_show_add_parameter = false; $scope.combinedequipments = []; @@ -36,7 +49,6 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod }; $scope.addCombinedEquipmentParameter = function () { - var modalInstance = $uibModal.open({ templateUrl: 'views/settings/combinedequipment/combinedequipmentparameter.model.html', controller: 'ModalAddCombinedEquipmentParameterCtrl', @@ -61,8 +73,8 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod if (combinedequipmentparameter.denominator_meter != null) { combinedequipmentparameter.denominator_meter_uuid = combinedequipmentparameter.denominator_meter.uuid; } - - CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -111,7 +123,8 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod if (modifiedCombinedEquipmentParameter.denominator_meter != null) { modifiedCombinedEquipmentParameter.denominator_meter_uuid = modifiedCombinedEquipmentParameter.denominator_meter.uuid; } - CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -148,7 +161,8 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod }, function (isConfirm) { if (isConfirm) { - CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -250,7 +264,8 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod }; $scope.getAllPoints = function () { - PointService.getAllPoints(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getAllPoints(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/contact/contact.controller.js b/admin/app/controllers/settings/contact/contact.controller.js index 02aa61ac..1dadf16c 100644 --- a/admin/app/controllers/settings/contact/contact.controller.js +++ b/admin/app/controllers/settings/contact/contact.controller.js @@ -1,8 +1,15 @@ 'use strict'; -app.controller('ContactController', function($scope, $translate,$uibModal, ContactService,toaster,SweetAlert) { - +app.controller('ContactController', function( + $scope, + $window, + $translate, + $uibModal, + ContactService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllContacts = function() { ContactService.getAllContacts(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -28,7 +35,8 @@ app.controller('ContactController', function($scope, $translate,$uibModal, Conta } }); modalInstance.result.then(function(contact) { - ContactService.addContact(contact, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ContactService.addContact(contact, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -67,7 +75,8 @@ app.controller('ContactController', function($scope, $translate,$uibModal, Conta }); modalInstance.result.then(function (modifiedContact) { - ContactService.editContact(modifiedContact, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ContactService.editContact(modifiedContact, headers, function (response) { if(angular.isDefined(response.status) && response.status === 200){ toaster.pop({ type: "success", @@ -103,7 +112,8 @@ app.controller('ContactController', function($scope, $translate,$uibModal, Conta closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - ContactService.deleteContact(contact, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ContactService.deleteContact(contact, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/costcenter/costcenter.controller.js b/admin/app/controllers/settings/costcenter/costcenter.controller.js index 3dac6dae..3610e611 100644 --- a/admin/app/controllers/settings/costcenter/costcenter.controller.js +++ b/admin/app/controllers/settings/costcenter/costcenter.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('CostCenterController', function($scope, $translate,$uibModal, CostCenterService,toaster,SweetAlert) { - +app.controller('CostCenterController', function( + $scope, + $window, + $translate, + $uibModal, + 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) { @@ -19,7 +26,8 @@ app.controller('CostCenterController', function($scope, $translate,$uibModal, Co windowClass: "animated fadeIn", }); modalInstance.result.then(function(costcenter) { - CostCenterService.addCostCenter(costcenter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterService.addCostCenter(costcenter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -59,7 +67,8 @@ app.controller('CostCenterController', function($scope, $translate,$uibModal, Co }); modalInstance.result.then(function (modifiedCostCenter) { - CostCenterService.editCostCenter(modifiedCostCenter, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterService.editCostCenter(modifiedCostCenter, headers, function (response){ if(angular.isDefined(response.status) && response.status === 200){ toaster.pop({ type: "success", @@ -96,7 +105,8 @@ app.controller('CostCenterController', function($scope, $translate,$uibModal, Co closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - CostCenterService.deleteCostCenter(costcenter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterService.deleteCostCenter(costcenter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/costcenter/costcentertariff.controller.js b/admin/app/controllers/settings/costcenter/costcentertariff.controller.js index 242a58f8..67efe1b8 100644 --- a/admin/app/controllers/settings/costcenter/costcentertariff.controller.js +++ b/admin/app/controllers/settings/costcenter/costcentertariff.controller.js @@ -1,11 +1,14 @@ 'use strict'; -app.controller('CostCenterTariffController', function ($scope, $translate, - CostCenterService, - TariffService, - CostCenterTariffService, - toaster) { - +app.controller('CostCenterTariffController', function ( + $scope, + $window, + $translate, + CostCenterService, + TariffService, + CostCenterTariffService, + toaster) { + $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) { @@ -51,7 +54,8 @@ app.controller('CostCenterTariffController', function ($scope, $translate, $scope.pairTariff = function (dragEl, dropEl) { var tariffid = angular.element('#' + dragEl).scope().tariff.id; var costcenterid = $scope.currentCostCenter.id; - CostCenterTariffService.addPair(costcenterid, tariffid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterTariffService.addPair(costcenterid, tariffid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -77,7 +81,8 @@ app.controller('CostCenterTariffController', function ($scope, $translate, } var costcentertariffid = angular.element('#' + dragEl).scope().costcentertariff.id; var costcenterid = $scope.currentCostCenter.id; - CostCenterTariffService.deletePair(costcenterid, costcentertariffid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterTariffService.deletePair(costcenterid, costcentertariffid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/datasource/datasource.controller.js b/admin/app/controllers/settings/datasource/datasource.controller.js index 45e5df29..bb26dec2 100644 --- a/admin/app/controllers/settings/datasource/datasource.controller.js +++ b/admin/app/controllers/settings/datasource/datasource.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('DataSourceController', function($scope, +app.controller('DataSourceController', function( + $scope, $window, $uibModal, $translate, diff --git a/admin/app/controllers/settings/datasource/point.controller.js b/admin/app/controllers/settings/datasource/point.controller.js index 83ec5913..e8753b58 100644 --- a/admin/app/controllers/settings/datasource/point.controller.js +++ b/admin/app/controllers/settings/datasource/point.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('PointController', function($scope, +app.controller('PointController', function( + $scope, $window, $uibModal, $translate, @@ -182,12 +183,16 @@ app.controller('ModalAddPointCtrl', function($scope, $uibModalInstance) { $scope.cancel = function() { $uibModalInstance.dismiss('cancel'); }; + + $scope.$watch("point.object_type",function () { + $scope.point.is_virtual = false; + }); }); app.controller('ModalEditPointCtrl', function($scope, $uibModalInstance, params) { $scope.operation = "SETTING.EDIT_POINT"; $scope.point = params.point; - + $scope.is_edit = true; $scope.ok = function() { $uibModalInstance.close($scope.point); }; diff --git a/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js b/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js index 7f21a276..526c5413 100644 --- a/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js @@ -1,10 +1,18 @@ 'use strict'; -app.controller('DistributionCircuitController', function($scope, $translate, $uibModal, DistributionSystemService, DistributionCircuitService, toaster,SweetAlert) { +app.controller('DistributionCircuitController', function( + $scope, + $window, + $translate, + $uibModal, + DistributionSystemService, + DistributionCircuitService, + toaster, + SweetAlert) { $scope.distributionsystems = []; $scope.distributioncircuits = []; $scope.currentDistributionSystem = null; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllDistributionSystems = function() { DistributionSystemService.getAllDistributionSystems(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -48,7 +56,8 @@ app.controller('DistributionCircuitController', function($scope, $translate, $ui }); modalInstance.result.then(function(distributioncircuit) { distributioncircuit.distribution_system_id = $scope.currentDistributionSystem.id; - DistributionCircuitService.addDistributionCircuit(distributioncircuit, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitService.addDistributionCircuit(distributioncircuit, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -88,7 +97,8 @@ app.controller('DistributionCircuitController', function($scope, $translate, $ui modalInstance.result.then(function(modifiedDistributionCircuit) { modifiedDistributionCircuit.distribution_system_id = $scope.currentDistributionSystem.id; - DistributionCircuitService.editDistributionCircuit(modifiedDistributionCircuit, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitService.editDistributionCircuit(modifiedDistributionCircuit, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -126,7 +136,8 @@ app.controller('DistributionCircuitController', function($scope, $translate, $ui }, function(isConfirm) { if (isConfirm) { - DistributionCircuitService.deleteDistributionCircuit(distributioncircuit.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitService.deleteDistributionCircuit(distributioncircuit.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js index 8b5f8aaf..96e4abe8 100644 --- a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js @@ -1,9 +1,21 @@ 'use strict'; -app.controller('DistributionCircuitPointController', function ($scope, $timeout, $translate, DistributionCircuitService, DataSourceService, PointService, DistributionCircuitPointService, toaster, SweetAlert) { +app.controller('DistributionCircuitPointController', function ( + $scope, + $window, + $timeout, + $translate, + DistributionCircuitService, + DataSourceService, + PointService, + DistributionCircuitPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentDistributionCircuit = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +29,8 @@ app.controller('DistributionCircuitPointController', function ($scope, $timeout, }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -36,11 +49,11 @@ app.controller('DistributionCircuitPointController', function ($scope, $timeout, }); }; - $scope.changeDistributionCircuit=function(item,model){ - $scope.currentDistributionCircuit=item; - $scope.currentDistributionCircuit.selected=model; - $scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id); - }; + $scope.changeDistributionCircuit=function(item,model){ + $scope.currentDistributionCircuit=item; + $scope.currentDistributionCircuit.selected=model; + $scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id); + }; $scope.changeDataSource = function (item, model) { $scope.currentDataSource = model; @@ -67,7 +80,8 @@ app.controller('DistributionCircuitPointController', function ($scope, $timeout, $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var distributioncircuitid = $scope.currentDistributionCircuit.id; - DistributionCircuitPointService.addPair(distributioncircuitid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitPointService.addPair(distributioncircuitid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -93,7 +107,8 @@ app.controller('DistributionCircuitPointController', function ($scope, $timeout, } var distributioncircuitpointid = angular.element('#' + dragEl).scope().distributioncircuitpoint.id; var distributioncircuitid = $scope.currentDistributionCircuit.id; - DistributionCircuitPointService.deletePair(distributioncircuitid, distributioncircuitpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitPointService.deletePair(distributioncircuitid, distributioncircuitpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js b/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js index 57c8f4fd..d87e8265 100644 --- a/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('DistributionSystemController', function($scope, $translate, $uibModal, DistributionSystemService, toaster,SweetAlert) { - +app.controller('DistributionSystemController', function( + $scope, + $window, + $translate, + $uibModal, + DistributionSystemService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllDistributionSystems = function() { DistributionSystemService.getAllDistributionSystems(function(response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -19,7 +26,8 @@ app.controller('DistributionSystemController', function($scope, $translate, $uib windowClass: "animated fadeIn", }); modalInstance.result.then(function(distributionsystem) { - DistributionSystemService.addDistributionSystem(distributionsystem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionSystemService.addDistributionSystem(distributionsystem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -58,7 +66,8 @@ app.controller('DistributionSystemController', function($scope, $translate, $uib }); modalInstance.result.then(function(modifiedDistributionSystem) { - DistributionSystemService.editDistributionSystem(modifiedDistributionSystem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionSystemService.editDistributionSystem(modifiedDistributionSystem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -95,7 +104,8 @@ app.controller('DistributionSystemController', function($scope, $translate, $uib closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - DistributionSystemService.deleteDistributionSystem(distributionsystem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionSystemService.deleteDistributionSystem(distributionsystem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js index dd8f81fe..f17b5639 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibModal, EnergyFlowDiagramService, toaster,SweetAlert) { - +app.controller('EnergyFlowDiagramController', function( + $scope, + $window, + $translate, + $uibModal, + EnergyFlowDiagramService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEnergyFlowDiagrams = function() { EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -19,7 +26,8 @@ app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibM windowClass: "animated fadeIn", }); modalInstance.result.then(function(energyflowdiagram) { - EnergyFlowDiagramService.addEnergyFlowDiagram(energyflowdiagram, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramService.addEnergyFlowDiagram(energyflowdiagram, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -58,7 +66,8 @@ app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibM }); modalInstance.result.then(function(modifiedEnergyFlowDiagram) { - EnergyFlowDiagramService.editEnergyFlowDiagram(modifiedEnergyFlowDiagram, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramService.editEnergyFlowDiagram(modifiedEnergyFlowDiagram, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -95,7 +104,8 @@ app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibM closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - EnergyFlowDiagramService.deleteEnergyFlowDiagram(energyflowdiagram, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramService.deleteEnergyFlowDiagram(energyflowdiagram, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js index 2849bd9d..2355d33f 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EnergyFlowDiagramLinkService, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) { +app.controller('EnergyFlowDiagramLinkController', function( + $scope, + $window, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + EnergyFlowDiagramLinkService, + EnergyFlowDiagramService, + EnergyFlowDiagramNodeService, + toaster, + SweetAlert) { $scope.currentEnergyFlowDiagram = {selected:undefined}; $scope.is_show_add_link = false; $scope.energyflowdiagrams = []; @@ -10,7 +22,7 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr $scope.offlinemeters = []; $scope.virtualmeters = []; $scope.mergedMeters = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEnergyFlowDiagrams = function() { EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -77,8 +89,8 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr if (energyflowdiagramlink.meter != null) { energyflowdiagramlink.meter_uuid = energyflowdiagramlink.meter.uuid; } - - EnergyFlowDiagramLinkService.addEnergyFlowDiagramLink(energyflowdiagramid, energyflowdiagramlink, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramLinkService.addEnergyFlowDiagramLink(energyflowdiagramid, energyflowdiagramlink, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -128,7 +140,8 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr if (modifiedEnergyFlowDiagramLink.meter != null) { modifiedEnergyFlowDiagramLink.meter_uuid = modifiedEnergyFlowDiagramLink.meter.uuid; } - EnergyFlowDiagramLinkService.editEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramLink, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramLinkService.editEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramLink, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -166,7 +179,8 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr }, function(isConfirm) { if (isConfirm) { - EnergyFlowDiagramLinkService.deleteEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, energyflowdiagramlink.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramLinkService.deleteEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, energyflowdiagramlink.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -265,15 +279,14 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr app.controller('ModalAddEnergyFlowDiagramLinkCtrl', function($scope, $uibModalInstance, params) { $scope.operation = "ENERGY_FLOW_DIAGRAM.ADD_LINK"; - $scope.energyflowdiagramlink = { - source_node: {id: null, name: null}, - target_node: {id: null, name: null}, - meter: {id: null, uuid: null, name: null, type: null}, - }; - $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; - $scope.mergedmeters = params.mergedmeters; + $scope.energyflowdiagramlink = { + source_node: {id: null, name: null}, + target_node: {id: null, name: null}, + meter: {id: null, uuid: null, name: null, type: null}, + }; + $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; + $scope.mergedmeters = params.mergedmeters; $scope.ok = function() { - $uibModalInstance.close($scope.energyflowdiagramlink); }; @@ -285,8 +298,8 @@ app.controller('ModalAddEnergyFlowDiagramLinkCtrl', function($scope, $uibModalIn app.controller('ModalEditEnergyFlowDiagramLinkCtrl', function($scope, $uibModalInstance, params) { $scope.operation = "ENERGY_FLOW_DIAGRAM.EDIT_LINK"; $scope.energyflowdiagramlink = params.energyflowdiagramlink; - $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; - $scope.mergedmeters = params.mergedmeters; + $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; + $scope.mergedmeters = params.mergedmeters; $scope.ok = function() { $uibModalInstance.close($scope.energyflowdiagramlink); }; diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js index fae5cfe7..bae48548 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js @@ -1,10 +1,18 @@ 'use strict'; -app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $uibModal, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) { +app.controller('EnergyFlowDiagramNodeController', function( + $scope, + $window, + $translate, + $uibModal, + EnergyFlowDiagramService, + EnergyFlowDiagramNodeService, + toaster, + SweetAlert) { $scope.energyflowdiagrams = []; $scope.energyflowdiagramnodes = []; $scope.currentEnergyFlowDiagram = null; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEnergyFlowDiagrams = function() { EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -48,8 +56,8 @@ app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $ }); modalInstance.result.then(function(energyflowdiagramnode) { var energyflowdiagramid = $scope.currentEnergyFlowDiagram.id; - - EnergyFlowDiagramNodeService.addEnergyFlowDiagramNode(energyflowdiagramid, energyflowdiagramnode, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramNodeService.addEnergyFlowDiagramNode(energyflowdiagramid, energyflowdiagramnode, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -88,7 +96,8 @@ app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $ }); modalInstance.result.then(function(modifiedEnergyFlowDiagramNode) { - EnergyFlowDiagramNodeService.editEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramNode, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramNodeService.editEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramNode, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -126,7 +135,8 @@ app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $ }, function(isConfirm) { if (isConfirm) { - EnergyFlowDiagramNodeService.deleteEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, energyflowdiagramnode.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramNodeService.deleteEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, energyflowdiagramnode.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/equipment/equipment.controller.js b/admin/app/controllers/settings/equipment/equipment.controller.js index 09145784..8d6fcf60 100644 --- a/admin/app/controllers/settings/equipment/equipment.controller.js +++ b/admin/app/controllers/settings/equipment/equipment.controller.js @@ -1,7 +1,15 @@ 'use strict'; -app.controller('EquipmentController', function($scope, $translate, $uibModal, EquipmentService, CostCenterService, toaster,SweetAlert) { - +app.controller('EquipmentController', function( + $scope, + $window, + $translate, + $uibModal, + EquipmentService, + CostCenterService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEquipments = function() { EquipmentService.getAllEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -36,7 +44,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq }); modalInstance.result.then(function(equipment) { equipment.cost_center_id = equipment.cost_center.id; - EquipmentService.addEquipment(equipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentService.addEquipment(equipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -77,7 +86,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq modalInstance.result.then(function(modifiedEquipment) { modifiedEquipment.cost_center_id = modifiedEquipment.cost_center.id; - EquipmentService.editEquipment(modifiedEquipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentService.editEquipment(modifiedEquipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -114,7 +124,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - EquipmentService.deleteEquipment(equipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentService.deleteEquipment(equipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js index d980d6e4..9c48c577 100644 --- a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js @@ -1,9 +1,22 @@ 'use strict'; -app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentMeterService, EquipmentService, toaster,SweetAlert) { +app.controller('EquipmentMeterController', function( + $scope, + $window, + $timeout, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + EquipmentMeterService, + EquipmentService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentEquipment = {selected:undefined}; - $scope.getAllEquipments = function(id) { + $scope.getAllEquipments = function(id) { EquipmentService.getAllEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.equipments = response.data; @@ -111,7 +124,8 @@ app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $ modalInstance.result.then(function (is_output) { var meterid=angular.element('#'+dragEl).scope().meter.id; var equipmentid=$scope.currentEquipment.id; - EquipmentMeterService.addPair(equipmentid, meterid, $scope.currentMeterType, is_output, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentMeterService.addPair(equipmentid, meterid, $scope.currentMeterType, is_output, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -140,7 +154,8 @@ app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $ var equipmentmeterid = angular.element('#' + dragEl).scope().equipmentmeter.id; var equipmentid = $scope.currentEquipment.id; var metertype = angular.element('#' + dragEl).scope().equipmentmeter.metertype; - EquipmentMeterService.deletePair(equipmentid, equipmentmeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentMeterService.deletePair(equipmentid, equipmentmeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js index 17ae48d8..2b1a326c 100644 --- a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('EquipmentParameterController', function($scope, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentParameterService, EquipmentService, PointService, toaster,SweetAlert) { +app.controller('EquipmentParameterController', function( + $scope, + $window, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + EquipmentParameterService, + EquipmentService, + PointService, + toaster,SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentEquipment = {selected:undefined}; $scope.is_show_add_parameter = false; $scope.equipments = []; @@ -61,8 +73,8 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran if (equipmentparameter.denominator_meter != null) { equipmentparameter.denominator_meter_uuid = equipmentparameter.denominator_meter.uuid; } - - EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -111,7 +123,9 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran if (modifiedEquipmentParameter.denominator_meter != null) { modifiedEquipmentParameter.denominator_meter_uuid = modifiedEquipmentParameter.denominator_meter.uuid; } - EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, modifiedEquipmentParameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, + modifiedEquipmentParameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -148,7 +162,9 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran }, function(isConfirm) { if (isConfirm) { - EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, equipmentparameter.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, + equipmentparameter.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -167,7 +183,8 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran } }); } - }); + } + ); }; $scope.colorMeterType = function(type) { @@ -251,7 +268,8 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran }; $scope.getAllPoints = function() { - PointService.getAllPoints(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getAllPoints(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/menu/menu.controller.js b/admin/app/controllers/settings/menu/menu.controller.js index 13ada957..03400cfd 100644 --- a/admin/app/controllers/settings/menu/menu.controller.js +++ b/admin/app/controllers/settings/menu/menu.controller.js @@ -1,10 +1,16 @@ 'use strict'; -app.controller('MenuController', function ($scope, $uibModal, MenuService, toaster, $translate) { +app.controller('MenuController', function ( + $scope, + $window, + $uibModal, + MenuService, + toaster, + $translate) { $scope.menus = []; $scope.currentMenu = {}; $scope.currentMenuChildren = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllMenus = function () { MenuService.getAllMenus(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -104,7 +110,8 @@ app.controller('MenuController', function ($scope, $uibModal, MenuService, toast }); modalInstance.result.then(function (modifiedMenu) { - MenuService.editMenu(modifiedMenu, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + MenuService.editMenu(modifiedMenu, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/meter/meter.controller.js b/admin/app/controllers/settings/meter/meter.controller.js index 747c3bbe..9f43df25 100644 --- a/admin/app/controllers/settings/meter/meter.controller.js +++ b/admin/app/controllers/settings/meter/meter.controller.js @@ -1,7 +1,16 @@ 'use strict'; -app.controller('MeterController', function($scope, $translate, $uibModal, MeterService, CategoryService, CostCenterService, EnergyItemService,toaster, SweetAlert) { - +app.controller('MeterController', function($scope, + $window, + $translate, + $uibModal, + MeterService, + CategoryService, + CostCenterService, + EnergyItemService, + 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) { diff --git a/admin/app/controllers/settings/meter/meterpoint.controller.js b/admin/app/controllers/settings/meter/meterpoint.controller.js index fa0f697b..44e6fb38 100644 --- a/admin/app/controllers/settings/meter/meterpoint.controller.js +++ b/admin/app/controllers/settings/meter/meterpoint.controller.js @@ -1,14 +1,20 @@ 'use strict'; -app.controller('MeterPointController', function ($scope, $timeout, $translate, - MeterService, - DataSourceService, - PointService, - MeterPointService, - toaster) { +app.controller('MeterPointController', function ( + $scope, + $window, + $timeout, + $translate, + MeterService, + DataSourceService, + PointService, + MeterPointService, + toaster) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentMeter = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -22,7 +28,8 @@ app.controller('MeterPointController', function ($scope, $timeout, $translate, }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -69,7 +76,8 @@ app.controller('MeterPointController', function ($scope, $timeout, $translate, $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var meterid = $scope.currentMeter.id; - MeterPointService.addPair(meterid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + MeterPointService.addPair(meterid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -95,7 +103,8 @@ app.controller('MeterPointController', function ($scope, $timeout, $translate, } var meterpointid = angular.element('#' + dragEl).scope().meterpoint.id; var meterid = $scope.currentMeter.id; - MeterPointService.deletePair(meterid, meterpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + MeterPointService.deletePair(meterid, meterpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", 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/sensor/sensor.controller.js b/admin/app/controllers/settings/sensor/sensor.controller.js index ee242f3f..e9f5edae 100644 --- a/admin/app/controllers/settings/sensor/sensor.controller.js +++ b/admin/app/controllers/settings/sensor/sensor.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('SensorController', function($scope, $translate, $uibModal, SensorService, toaster, SweetAlert) { - +app.controller('SensorController', function( + $scope, + $window, + $translate, + $uibModal, + SensorService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function() { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -27,7 +34,8 @@ app.controller('SensorController', function($scope, $translate, $uibModal, Sens } }); modalInstance.result.then(function(sensor) { - SensorService.addSensor(sensor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorService.addSensor(sensor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -67,7 +75,8 @@ app.controller('SensorController', function($scope, $translate, $uibModal, Sens }); modalInstance.result.then(function(modifiedSensor) { - SensorService.editSensor(modifiedSensor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorService.editSensor(modifiedSensor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -105,7 +114,8 @@ app.controller('SensorController', function($scope, $translate, $uibModal, Sens }, function(isConfirm) { if (isConfirm) { - SensorService.deleteSensor(sensor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorService.deleteSensor(sensor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/sensor/sensorpoint.controller.js b/admin/app/controllers/settings/sensor/sensorpoint.controller.js index 3ba13fd3..2edbd3e0 100644 --- a/admin/app/controllers/settings/sensor/sensorpoint.controller.js +++ b/admin/app/controllers/settings/sensor/sensorpoint.controller.js @@ -1,9 +1,21 @@ 'use strict'; -app.controller('SensorPointController', function ($scope, $timeout, $translate, SensorService, DataSourceService, PointService, SensorPointService, toaster, SweetAlert) { +app.controller('SensorPointController', function ( + $scope, + $window, + $timeout, + $translate, + SensorService, + DataSourceService, + PointService, + SensorPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentSensor = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -18,7 +30,8 @@ app.controller('SensorPointController', function ($scope, $timeout, $translate, }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -39,11 +52,11 @@ app.controller('SensorPointController', function ($scope, $timeout, $translate, }; - $scope.changeSensor=function(item,model){ - $scope.currentSensor=item; - $scope.currentSensor.selected=model; - $scope.getPointsBySensorID($scope.currentSensor.id); - }; + $scope.changeSensor=function(item,model){ + $scope.currentSensor=item; + $scope.currentSensor.selected=model; + $scope.getPointsBySensorID($scope.currentSensor.id); + }; $scope.changeDataSource = function (item, model) { $scope.currentDataSource = model; @@ -67,7 +80,8 @@ app.controller('SensorPointController', function ($scope, $timeout, $translate, $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var sensorid = $scope.currentSensor.id; - SensorPointService.addPair(sensorid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorPointService.addPair(sensorid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -93,7 +107,8 @@ app.controller('SensorPointController', function ($scope, $timeout, $translate, } var sensorpointid = angular.element('#' + dragEl).scope().sensorpoint.id; var sensorid = $scope.currentSensor.id; - SensorPointService.deletePair(sensorid, sensorpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorPointService.deletePair(sensorid, sensorpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/shopfloor/shopfloor.controller.js b/admin/app/controllers/settings/shopfloor/shopfloor.controller.js index 8ae47618..6d7c877c 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloor.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloor.controller.js @@ -1,7 +1,16 @@ 'use strict'; -app.controller('ShopfloorController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, ShopfloorService, toaster, SweetAlert) { - +app.controller('ShopfloorController', function ( + $scope, + $window, + $translate, + $uibModal, + CostCenterService, + ContactService, + ShopfloorService, + 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) { @@ -53,7 +62,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C if (angular.isDefined(shopfloor.is_input_counted) == false) { shopfloor.is_input_counted = false; } - ShopfloorService.addShopfloor(shopfloor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorService.addShopfloor(shopfloor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -99,7 +109,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C if (angular.isDefined(shopfloor.is_input_counted) == false) { shopfloor.is_input_counted = false; } - ShopfloorService.editShopfloor(modifiedShopfloor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorService.editShopfloor(modifiedShopfloor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -136,7 +147,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C }, function (isConfirm) { if (isConfirm) { - ShopfloorService.deleteShopfloor(shopfloor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorService.deleteShopfloor(shopfloor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js index b160c772..47c1556a 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js @@ -1,8 +1,16 @@ 'use strict'; -app.controller('ShopfloorEquipmentController', function ($scope, $translate, ShopfloorService, EquipmentService, ShopfloorEquipmentService, toaster, SweetAlert) { +app.controller('ShopfloorEquipmentController', function ( + $scope, + $window, + $translate, + ShopfloorService, + EquipmentService, + ShopfloorEquipmentService, + toaster, + SweetAlert) { $scope.currentShopfloor = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEquipments = function () { EquipmentService.getAllEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +50,8 @@ app.controller('ShopfloorEquipmentController', function ($scope, $translate, Sho $scope.pairEquipment = function (dragEl, dropEl) { var equipmentid = angular.element('#' + dragEl).scope().equipment.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +77,8 @@ app.controller('ShopfloorEquipmentController', function ($scope, $translate, Sho } var shopfloorequipmentid = angular.element('#' + dragEl).scope().shopfloorequipment.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js b/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js index cb3a7d25..8fb53d30 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js @@ -1,14 +1,18 @@ 'use strict'; -app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, - MeterService, - VirtualMeterService, - OfflineMeterService, - ShopfloorMeterService, - ShopfloorService, - toaster) { +app.controller('ShopfloorMeterController', function( + $scope, + $window, + $timeout, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + ShopfloorMeterService, + ShopfloorService, + toaster) { $scope.currentShopfloor = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllShopfloors = function(id) { ShopfloorService.getAllShopfloors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -80,7 +84,6 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, }; - $scope.getAllOfflineMeters = function() { OfflineMeterService.getAllOfflineMeters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -106,7 +109,8 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var shopfloorid=$scope.currentShopfloor.id; - ShopfloorMeterService.addPair(shopfloorid, meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorMeterService.addPair(shopfloorid, meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -133,7 +137,8 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, var shopfloormeterid = angular.element('#' + dragEl).scope().shopfloormeter.id; var shopfloorid = $scope.currentShopfloor.id; var metertype = angular.element('#' + dragEl).scope().shopfloormeter.metertype; - ShopfloorMeterService.deletePair(shopfloorid, shopfloormeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorMeterService.deletePair(shopfloorid, shopfloormeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js index a88ea9f1..2b67d9c7 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js @@ -1,9 +1,20 @@ 'use strict'; -app.controller('ShopfloorPointController', function ($scope, $translate, ShopfloorService, DataSourceService, PointService, ShopfloorPointService, toaster, SweetAlert) { +app.controller('ShopfloorPointController', function ( + $scope, + $window, + $translate, + ShopfloorService, + DataSourceService, + PointService, + ShopfloorPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentShopfloor = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +28,8 @@ app.controller('ShopfloorPointController', function ($scope, $translate, Shopflo }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -62,7 +74,8 @@ app.controller('ShopfloorPointController', function ($scope, $translate, Shopflo $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorPointService.addPair(shopfloorid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorPointService.addPair(shopfloorid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -88,7 +101,8 @@ app.controller('ShopfloorPointController', function ($scope, $translate, Shopflo } var shopfloorpointid = angular.element('#' + dragEl).scope().shopfloorpoint.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "error", diff --git a/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js index c2740c93..76b11a8b 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js @@ -1,8 +1,16 @@ 'use strict'; -app.controller('ShopfloorSensorController', function ($scope, $translate, ShopfloorService, SensorService, ShopfloorSensorService, toaster, SweetAlert) { +app.controller('ShopfloorSensorController', function ( + $scope, + $window, + $translate, + ShopfloorService, + SensorService, + ShopfloorSensorService, + toaster, + SweetAlert) { $scope.currentShopfloor = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +50,8 @@ app.controller('ShopfloorSensorController', function ($scope, $translate, Shopfl $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorSensorService.addPair(shopfloorid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorSensorService.addPair(shopfloorid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +77,8 @@ app.controller('ShopfloorSensorController', function ($scope, $translate, Shopfl } var shopfloorsensorid = angular.element('#' + dragEl).scope().shopfloorsensor.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, 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..1761a6c8 100644 --- a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js +++ b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js @@ -1,17 +1,19 @@ 'use strict'; -app.controller('SpaceCombinedEquipmentController', function($scope, $translate, - SpaceService, - CombinedEquipmentService, - SpaceCombinedEquipmentService, - toaster) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.combinedequipments = []; - $scope.spacecombinedequipments = []; +app.controller('SpaceCombinedEquipmentController', function($scope, + $window, + $translate, + SpaceService, + CombinedEquipmentService, + SpaceCombinedEquipmentService, + toaster) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.combinedequipments = []; + $scope.spacecombinedequipments = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -43,7 +45,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, $scope.getCombinedEquipmentsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getCombinedEquipmentsBySpaceID = function(id) { $scope.spacecombinedequipments=[]; @@ -69,7 +71,8 @@ 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 +98,8 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, } var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id; var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); - - SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spaceequipment.controller.js b/admin/app/controllers/settings/space/spaceequipment.controller.js index f536c873..799a90a0 100644 --- a/admin/app/controllers/settings/space/spaceequipment.controller.js +++ b/admin/app/controllers/settings/space/spaceequipment.controller.js @@ -1,13 +1,20 @@ 'use strict'; -app.controller('SpaceEquipmentController', function($scope, $translate, SpaceService, EquipmentService, SpaceEquipmentService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.equipments = []; - $scope.spaceequipments = []; +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() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -39,7 +46,7 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer $scope.getEquipmentsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getEquipmentsBySpaceID = function(id) { $scope.spaceequipments=[]; @@ -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,8 @@ 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(); - - SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacemeter.controller.js b/admin/app/controllers/settings/space/spacemeter.controller.js index 9ca31c96..05c4b73e 100644 --- a/admin/app/controllers/settings/space/spacemeter.controller.js +++ b/admin/app/controllers/settings/space/spacemeter.controller.js @@ -1,11 +1,20 @@ 'use strict'; -app.controller('SpaceMeterController', function($scope ,$timeout, $translate, SpaceService, MeterService, VirtualMeterService, OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.spacemeters = []; +app.controller('SpaceMeterController', function( + $scope , + $window, + $timeout, + $translate, + SpaceService, + MeterService, + VirtualMeterService, + OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.spacemeters = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -38,7 +47,7 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp $scope.getMetersBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getMetersBySpaceID = function(id) { var metertypes=['meters','virtualmeters','offlinemeters']; @@ -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", @@ -166,12 +177,12 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp }); }; - $scope.getAllSpaces(); - $scope.getAllMeters(); - $scope.getAllVirtualMeters(); - $scope.getAllOfflineMeters(); + $scope.getAllSpaces(); + $scope.getAllMeters(); + $scope.getAllVirtualMeters(); + $scope.getAllOfflineMeters(); - $scope.refreshSpaceTree = function() { + $scope.refreshSpaceTree = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -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).refresh(); }); - }; + }; $scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.spacemeters = []; diff --git a/admin/app/controllers/settings/space/spacepoint.controller.js b/admin/app/controllers/settings/space/spacepoint.controller.js index cec6de57..51ff441d 100644 --- a/admin/app/controllers/settings/space/spacepoint.controller.js +++ b/admin/app/controllers/settings/space/spacepoint.controller.js @@ -1,6 +1,16 @@ 'use strict'; -app.controller('SpacePointController', function ($scope, $translate, SpaceService, DataSourceService, PointService, SpacePointService, toaster, SweetAlert) { +app.controller('SpacePointController', function ( + $scope, + $window, + $translate, + SpaceService, + DataSourceService, + PointService, + SpacePointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.spaces = []; $scope.currentSpaceID = 1; $scope.spacepoints = []; @@ -42,7 +52,8 @@ app.controller('SpacePointController', function ($scope, $translate, SpaceServic }; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -56,7 +67,8 @@ app.controller('SpacePointController', function ($scope, $translate, SpaceServic }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -84,7 +96,8 @@ app.controller('SpacePointController', function ($scope, $translate, SpaceServic $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", @@ -110,7 +123,8 @@ app.controller('SpacePointController', function ($scope, $translate, SpaceServic } 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..c114d6af 100644 --- a/admin/app/controllers/settings/space/spaceshopfloor.controller.js +++ b/admin/app/controllers/settings/space/spaceshopfloor.controller.js @@ -1,13 +1,19 @@ 'use strict'; -app.controller('SpaceShopfloorController', function($scope, $translate, SpaceService, ShopfloorService, SpaceShopfloorService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.shopfloors = []; - $scope.spaceshopfloors = []; +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() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -39,7 +45,7 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer $scope.getShopfloorsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getShopfloorsBySpaceID = function(id) { $scope.spaceshopfloors=[]; @@ -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", @@ -112,7 +119,7 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer }); }; - $scope.getAllSpaces(); + $scope.getAllSpaces(); $scope.getAllShopfloors(); $scope.refreshSpaceTree = function() { diff --git a/admin/app/controllers/settings/space/spacestore.controller.js b/admin/app/controllers/settings/space/spacestore.controller.js index b49396d7..41d26a9c 100644 --- a/admin/app/controllers/settings/space/spacestore.controller.js +++ b/admin/app/controllers/settings/space/spacestore.controller.js @@ -1,13 +1,18 @@ 'use strict'; -app.controller('SpaceStoreController', function($scope, $translate, SpaceService, StoreService, SpaceStoreService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.stores = []; - $scope.spacestores = []; +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() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -39,7 +44,7 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService $scope.getStoresBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getStoresBySpaceID = function(id) { $scope.spacestores=[]; @@ -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,8 @@ 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(); - - SpaceStoreService.deletePair(spaceid, spacestoreid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceStoreService.deletePair(spaceid, spacestoreid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacetenant.controller.js b/admin/app/controllers/settings/space/spacetenant.controller.js index 37f11561..3f76a07e 100644 --- a/admin/app/controllers/settings/space/spacetenant.controller.js +++ b/admin/app/controllers/settings/space/spacetenant.controller.js @@ -1,13 +1,19 @@ 'use strict'; -app.controller('SpaceTenantController', function($scope, $translate, SpaceService, TenantService, SpaceTenantService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.tenants = []; - $scope.spacetenants = []; +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() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -39,7 +45,7 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic $scope.getTenantsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getTenantsBySpaceID = function(id) { $scope.spacetenants=[]; @@ -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,8 @@ 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(); - - SpaceTenantService.deletePair(spaceid, spacetenantid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceTenantService.deletePair(spaceid, spacetenantid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -112,10 +119,10 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic }); }; - $scope.getAllSpaces(); - $scope.getAllTenants(); + $scope.getAllSpaces(); + $scope.getAllTenants(); - $scope.refreshSpaceTree = function() { + $scope.refreshSpaceTree = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -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).refresh(); }); - }; + }; $scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.spacetenants = []; diff --git a/admin/app/controllers/settings/store/store.controller.js b/admin/app/controllers/settings/store/store.controller.js index 23bda2b5..ecd612ff 100644 --- a/admin/app/controllers/settings/store/store.controller.js +++ b/admin/app/controllers/settings/store/store.controller.js @@ -1,7 +1,17 @@ 'use strict'; -app.controller('StoreController', function($scope,$translate,$uibModal, CostCenterService, ContactService, StoreService, StoreTypeService, toaster,SweetAlert) { - +app.controller('StoreController', function( + $scope, + $window, + $translate, + $uibModal, + CostCenterService, + ContactService, + StoreService, + StoreTypeService, + 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) { @@ -32,15 +42,16 @@ app.controller('StoreController', function($scope,$translate,$uibModal, CostCent }); }; -$scope.getAllStoreTypes = function() { - StoreTypeService.getAllStoreTypes(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.storetypes = response.data; - } else { - $scope.storetypes = []; - } - }); -}; + $scope.getAllStoreTypes = function() { + StoreTypeService.getAllStoreTypes(function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + $scope.storetypes = response.data; + } else { + $scope.storetypes = []; + } + }); + }; + $scope.addStore = function() { var modalInstance = $uibModal.open({ templateUrl: 'views/settings/store/store.model.html', @@ -64,7 +75,8 @@ $scope.getAllStoreTypes = function() { if (angular.isDefined(store.is_input_counted) == false) { store.is_input_counted = false; } - StoreService.addStore(store, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreService.addStore(store, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -111,7 +123,8 @@ $scope.getAllStoreTypes = function() { if (angular.isDefined(store.is_input_counted) == false) { store.is_input_counted = false; } - StoreService.editStore(modifiedStore, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreService.editStore(modifiedStore, headers, function(response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -147,7 +160,8 @@ $scope.getAllStoreTypes = function() { closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - StoreService.deleteStore(store, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreService.deleteStore(store, headers, function(response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/store/storemeter.controller.js b/admin/app/controllers/settings/store/storemeter.controller.js index 8a9240b8..5af0572e 100644 --- a/admin/app/controllers/settings/store/storemeter.controller.js +++ b/admin/app/controllers/settings/store/storemeter.controller.js @@ -1,21 +1,25 @@ 'use strict'; -app.controller('StoreMeterController', function($scope,$timeout, $translate, - MeterService, - VirtualMeterService, - OfflineMeterService, - StoreMeterService, - StoreService, - toaster) { +app.controller('StoreMeterController', function( + $scope, + $window, + $timeout, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + StoreMeterService, + StoreService, + toaster) { $scope.currentStore = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllStores = function(id) { StoreService.getAllStores(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.stores = response.data; - } else { + } else { $scope.stores = []; - } + } }); }; @@ -106,7 +110,8 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate, $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var storeid=$scope.currentStore.id; - StoreMeterService.addPair(storeid, meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreMeterService.addPair(storeid, meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -133,7 +138,8 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate, var storemeterid = angular.element('#' + dragEl).scope().storemeter.id; var storeid = $scope.currentStore.id; var metertype = angular.element('#' + dragEl).scope().storemeter.metertype; - StoreMeterService.deletePair(storeid, storemeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreMeterService.deletePair(storeid, storemeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/store/storepoint.controller.js b/admin/app/controllers/settings/store/storepoint.controller.js index 17cc3c0e..c06951a1 100644 --- a/admin/app/controllers/settings/store/storepoint.controller.js +++ b/admin/app/controllers/settings/store/storepoint.controller.js @@ -1,9 +1,20 @@ 'use strict'; -app.controller('StorePointController', function ($scope, $translate, StoreService, DataSourceService, PointService, StorePointService, toaster, SweetAlert) { +app.controller('StorePointController', function ( + $window, + $scope, + $translate, + StoreService, + DataSourceService, + PointService, + StorePointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentStore = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +28,8 @@ app.controller('StorePointController', function ($scope, $translate, StoreServic }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -37,11 +49,11 @@ app.controller('StorePointController', function ($scope, $translate, StoreServic }; - $scope.changeStore=function(item,model){ - $scope.currentStore=item; - $scope.currentStore.selected=model; - $scope.getPointsByStoreID($scope.currentStore.id); - }; + $scope.changeStore=function(item,model){ + $scope.currentStore=item; + $scope.currentStore.selected=model; + $scope.getPointsByStoreID($scope.currentStore.id); + }; $scope.changeDataSource = function (item, model) { $scope.currentDataSource = model; @@ -62,7 +74,8 @@ app.controller('StorePointController', function ($scope, $translate, StoreServic $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var storeid = $scope.currentStore.id; - StorePointService.addPair(storeid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StorePointService.addPair(storeid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -88,7 +101,8 @@ app.controller('StorePointController', function ($scope, $translate, StoreServic } var storepointid = angular.element('#' + dragEl).scope().storepoint.id; var storeid = $scope.currentStore.id; - StorePointService.deletePair(storeid, storepointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StorePointService.deletePair(storeid, storepointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/store/storesensor.controller.js b/admin/app/controllers/settings/store/storesensor.controller.js index 64366d51..54b9428d 100644 --- a/admin/app/controllers/settings/store/storesensor.controller.js +++ b/admin/app/controllers/settings/store/storesensor.controller.js @@ -1,8 +1,16 @@ 'use strict'; -app.controller('StoreSensorController', function ($scope, $translate, StoreService, SensorService, StoreSensorService, toaster, SweetAlert) { +app.controller('StoreSensorController', function ( + $scope, + $window, + $translate, + StoreService, + SensorService, + StoreSensorService, + toaster, + SweetAlert) { $scope.currentStore = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +50,8 @@ app.controller('StoreSensorController', function ($scope, $translate, StoreServi $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var storeid = $scope.currentStore.id; - StoreSensorService.addPair(storeid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreSensorService.addPair(storeid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +77,8 @@ app.controller('StoreSensorController', function ($scope, $translate, StoreServi } var storesensorid = angular.element('#' + dragEl).scope().storesensor.id; var storeid = $scope.currentStore.id; - StoreSensorService.deletePair(storeid, storesensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreSensorService.deletePair(storeid, storesensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tariff/flat.controller.js b/admin/app/controllers/settings/tariff/flat.controller.js deleted file mode 100644 index edfe3e16..00000000 --- a/admin/app/controllers/settings/tariff/flat.controller.js +++ /dev/null @@ -1,158 +0,0 @@ -'use strict'; - -app.controller('FlatController', function($scope,$uibModal,$translate, FlatService,toaster,SweetAlert) { - - - $scope.getAllFlats = function() { - FlatService.getAllFlats(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.flats = response.data; - } else { - $scope.flats = []; - } - }); - - }; - - $scope.addFlat = function() { - var modalInstance = $uibModal.open({ - templateUrl: 'views/settings/tariff/flat.model.html', - controller: 'ModalAddFlatCtrl', - windowClass: "animated fadeIn", - resolve: { - params:function(){ - return { - flats:angular.copy($scope.flats) - }; - } - } - }); - modalInstance.result.then(function(flat) { - FlatService.addFlat(flat, function(response) { - if (angular.isDefined(response.status) && response.status === 201) { - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("TOASTER.FLAT")}), - showCloseButton: true, - }); - $scope.getAllFlats(); - } else { - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("TOASTER.FLAT")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - }, function() { - - }); - }; - - $scope.editFlat=function(flat){ - var modalInstance = $uibModal.open({ - windowClass: "animated fadeIn", - templateUrl: 'views/settings/tariff/flat.model.html', - controller: 'ModalEditFlatCtrl', - resolve: { - params:function(){ - return { - flat:angular.copy(flat), - flats:angular.copy($scope.flats) - }; - } - } - }); - - modalInstance.result.then(function (modifiedFlat) { - FlatService.editFlat(modifiedFlat, function (response) { - if(angular.isDefined(response.status) && response.status === 200){ - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - showCloseButton: true, - }); - $scope.getAllFlats(); - }else{ - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - }, function () { - //do nothing; - }); - }; - - $scope.deleteFlat=function(flat){ - SweetAlert.swal({ - title: $translate.instant("SWEET.TITLE"), - text: $translate.instant("SWEET.TEXT"), - type: "warning", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"), - cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"), - closeOnConfirm: true, - closeOnCancel: true }, - function (isConfirm) { - if (isConfirm) { - FlatService.deleteFlat(flat, function (response) { - if (angular.isDefined(response.status) && response.status === 204) { - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - showCloseButton: true, - }); - $scope.getAllFlats(); - } else { - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - } - }); - }; - - $scope.getAllFlats(); - - -}); - -app.controller('ModalAddFlatCtrl', function ($scope, $uibModalInstance,params) { - - $scope.operation="添加"; - $scope.flats=params.flats; - $scope.ok = function () { - $uibModalInstance.close($scope.flat); - }; - - $scope.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; -}); - -app.controller('ModalEditFlatCtrl', function ($scope, $uibModalInstance, params) { - $scope.operation="编辑"; - $scope.flat = params.flat; - $scope.flats=params.flats; - - $scope.ok = function () { - $uibModalInstance.close($scope.flat); - }; - - $scope.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; -}); \ No newline at end of file diff --git a/admin/app/controllers/settings/tariff/tariff.controller.js b/admin/app/controllers/settings/tariff/tariff.controller.js index 2b43c4f5..88ecd84c 100644 --- a/admin/app/controllers/settings/tariff/tariff.controller.js +++ b/admin/app/controllers/settings/tariff/tariff.controller.js @@ -1,7 +1,17 @@ 'use strict'; -app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_TYPE, PEAK_TYPE, TariffService, CategoryService, toaster, SweetAlert) { - +app.controller('TariffController', function( + $scope, + $window, + $uibModal, + $translate, + TARIFF_TYPE, + PEAK_TYPE, + TariffService, + CategoryService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCategories = function() { CategoryService.getAllCategories(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +52,8 @@ app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_ } }); modalInstance.result.then(function(tariff) { - TariffService.addTariff(tariff, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TariffService.addTariff(tariff, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -82,7 +93,8 @@ app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_ }); modalInstance.result.then(function(modifiedTariff) { - TariffService.editTariff(modifiedTariff, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TariffService.editTariff(modifiedTariff, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -119,7 +131,8 @@ app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_ }, function(isConfirm) { if (isConfirm) { - TariffService.deleteTariff(tariff, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TariffService.deleteTariff(tariff, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenant.controller.js b/admin/app/controllers/settings/tenant/tenant.controller.js index 8427ddef..21ca44dc 100644 --- a/admin/app/controllers/settings/tenant/tenant.controller.js +++ b/admin/app/controllers/settings/tenant/tenant.controller.js @@ -1,7 +1,17 @@ 'use strict'; -app.controller('TenantController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, TenantService, TenantTypeService, toaster, SweetAlert) { - +app.controller('TenantController', function ( + $scope, + $window, + $translate, + $uibModal, + CostCenterService, + ContactService, + TenantService, + TenantTypeService, + 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) { @@ -70,7 +80,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost if (angular.isDefined(tenant.is_in_lease) == false) { tenant.is_in_lease = false; } - TenantService.addTenant(tenant, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantService.addTenant(tenant, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -123,7 +134,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost if (angular.isDefined(tenant.is_in_lease) == false) { tenant.is_in_lease = false; } - TenantService.editTenant(modifiedTenant, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantService.editTenant(modifiedTenant, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -160,7 +172,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost }, function (isConfirm) { if (isConfirm) { - TenantService.deleteTenant(tenant, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantService.deleteTenant(tenant, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenant.master.controller.js b/admin/app/controllers/settings/tenant/tenant.master.controller.js index 03d7471b..9680338c 100644 --- a/admin/app/controllers/settings/tenant/tenant.master.controller.js +++ b/admin/app/controllers/settings/tenant/tenant.master.controller.js @@ -1,8 +1,6 @@ 'use strict'; app.controller('TenantMasterController', function($scope) { - - $scope.$on('handleEmitTenantChanged', function(event) { $scope.$broadcast('handleBroadcastTenantChanged'); }); diff --git a/admin/app/controllers/settings/tenant/tenantmeter.controller.js b/admin/app/controllers/settings/tenant/tenantmeter.controller.js index 53983229..397395b9 100644 --- a/admin/app/controllers/settings/tenant/tenantmeter.controller.js +++ b/admin/app/controllers/settings/tenant/tenantmeter.controller.js @@ -1,14 +1,18 @@ 'use strict'; -app.controller('TenantMeterController', function($scope,$timeout, $translate, - MeterService, - VirtualMeterService, - OfflineMeterService, - TenantMeterService, - TenantService, - toaster) { +app.controller('TenantMeterController', function( + $scope, + $window, + $timeout, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + TenantMeterService, + TenantService, + toaster) { $scope.currentTenant = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllTenants = function(id) { TenantService.getAllTenants(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -106,7 +110,8 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate, $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var tenantid=$scope.currentTenant.id; - TenantMeterService.addPair(tenantid, meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantMeterService.addPair(tenantid, meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -133,7 +138,8 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate, var tenantmeterid = angular.element('#' + dragEl).scope().tenantmeter.id; var tenantid = $scope.currentTenant.id; var metertype = angular.element('#' + dragEl).scope().tenantmeter.metertype; - TenantMeterService.deletePair(tenantid, tenantmeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantMeterService.deletePair(tenantid, tenantmeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenantpoint.controller.js b/admin/app/controllers/settings/tenant/tenantpoint.controller.js index b29505ee..b88e83fb 100644 --- a/admin/app/controllers/settings/tenant/tenantpoint.controller.js +++ b/admin/app/controllers/settings/tenant/tenantpoint.controller.js @@ -1,9 +1,20 @@ 'use strict'; -app.controller('TenantPointController', function ($scope, $translate, TenantService, DataSourceService, PointService, TenantPointService, toaster, SweetAlert) { +app.controller('TenantPointController', function ( + $scope, + $window, + $translate, + TenantService, + DataSourceService, + PointService, + TenantPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentTenant = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +28,8 @@ app.controller('TenantPointController', function ($scope, $translate, TenantServ }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -62,7 +74,8 @@ app.controller('TenantPointController', function ($scope, $translate, TenantServ $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var tenantid = $scope.currentTenant.id; - TenantPointService.addPair(tenantid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantPointService.addPair(tenantid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -88,7 +101,8 @@ app.controller('TenantPointController', function ($scope, $translate, TenantServ } var tenantpointid = angular.element('#' + dragEl).scope().tenantpoint.id; var tenantid = $scope.currentTenant.id; - TenantPointService.deletePair(tenantid, tenantpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantPointService.deletePair(tenantid, tenantpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenantsensor.controller.js b/admin/app/controllers/settings/tenant/tenantsensor.controller.js index ffff1f1f..dbf9a575 100644 --- a/admin/app/controllers/settings/tenant/tenantsensor.controller.js +++ b/admin/app/controllers/settings/tenant/tenantsensor.controller.js @@ -1,8 +1,16 @@ 'use strict'; -app.controller('TenantSensorController', function ($scope, $translate, TenantService, SensorService, TenantSensorService, toaster, SweetAlert) { +app.controller('TenantSensorController', function ( + $scope, + $window, + $translate, + TenantService, + SensorService, + TenantSensorService, + toaster, + SweetAlert) { $scope.currentTenant = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -23,26 +31,27 @@ app.controller('TenantSensorController', function ($scope, $translate, TenantSer }); }; - $scope.changeTenant=function(item,model){ - $scope.currentTenant=item; - $scope.currentTenant.selected=model; - $scope.getSensorsByTenantID($scope.currentTenant.id); - }; + $scope.changeTenant=function(item,model){ + $scope.currentTenant=item; + $scope.currentTenant.selected=model; + $scope.getSensorsByTenantID($scope.currentTenant.id); + }; - $scope.getAllTenants = function () { - TenantService.getAllTenants(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.tenants = response.data; - } else { - $scope.tenants = []; - } - }); - }; + $scope.getAllTenants = function () { + TenantService.getAllTenants(function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + $scope.tenants = response.data; + } else { + $scope.tenants = []; + } + }); + }; $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var tenantid = $scope.currentTenant.id; - TenantSensorService.addPair(tenantid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantSensorService.addPair(tenantid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +77,8 @@ app.controller('TenantSensorController', function ($scope, $translate, TenantSer } var tenantsensorid = angular.element('#' + dragEl).scope().tenantsensor.id; var tenantid = $scope.currentTenant.id; - TenantSensorService.deletePair(tenantid, tenantsensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantSensorService.deletePair(tenantid, tenantsensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/users/privilege/privilege.controller.js b/admin/app/controllers/users/privilege/privilege.controller.js index 80b2c094..cd2df729 100644 --- a/admin/app/controllers/users/privilege/privilege.controller.js +++ b/admin/app/controllers/users/privilege/privilege.controller.js @@ -1,11 +1,14 @@ 'use strict'; -app.controller('PrivilegeController', function ($scope, +app.controller('PrivilegeController', function ( + $scope, + $window, $uibModal, PrivilegeService, toaster, $translate, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllPrivileges = function () { PrivilegeService.getAllPrivileges(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -31,7 +34,8 @@ app.controller('PrivilegeController', function ($scope, } }); modalInstance.result.then(function (privilege) { - PrivilegeService.addPrivilege(privilege, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PrivilegeService.addPrivilege(privilege, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -70,7 +74,8 @@ app.controller('PrivilegeController', function ($scope, }); modalInstance.result.then(function (modifiedPrivilege) { - PrivilegeService.editPrivilege(modifiedPrivilege, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PrivilegeService.editPrivilege(modifiedPrivilege, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -107,7 +112,8 @@ app.controller('PrivilegeController', function ($scope, }, function (isConfirm) { if (isConfirm) { - PrivilegeService.deletePrivilege(privilege, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PrivilegeService.deletePrivilege(privilege, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/users/user/user.controller.js b/admin/app/controllers/users/user/user.controller.js index 71063a83..a062907d 100644 --- a/admin/app/controllers/users/user/user.controller.js +++ b/admin/app/controllers/users/user/user.controller.js @@ -186,6 +186,41 @@ app.controller('UserController', function ($scope, }); }; + $scope.unlockUser = function (user){ + SweetAlert.swal({ + title: $translate.instant("SWEET.UNLOCK_TITLE"), + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: $translate.instant("SWEET.UNLOCK_CONFIRM_BUTTON_TEXT"), + cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"), + closeOnConfirm: true, + closeOnCancel: true + },function (isConfirm) { + if (isConfirm) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + UserService.unlockUser(user, headers, function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + toaster.pop({ + type: "success", + title: $translate.instant("TOASTER.SUCCESS_TITLE"), + body: $translate.instant("TOASTER.SUCCESS_UNLOCK_BODY", { template: $translate.instant("SETTING.USER") }), + showCloseButton: true, + }); + $scope.getAllUsers(); + } else { + toaster.pop({ + type: "error", + title: $translate.instant("TOASTER.ERROR_UNLOCK_BODY", { template: $translate.instant("SETTING.USER") }), + body: $translate.instant(response.data.description), + showCloseButton: true, + }); + } + }); + } + }); + }; + $scope.getAllUsers(); $scope.getAllPrivileges(); diff --git a/admin/app/services/fdd/emailmessageanalysis.service.js b/admin/app/services/fdd/emailmessage.service.js similarity index 57% rename from admin/app/services/fdd/emailmessageanalysis.service.js rename to admin/app/services/fdd/emailmessage.service.js index a9512c89..227c8d7b 100644 --- a/admin/app/services/fdd/emailmessageanalysis.service.js +++ b/admin/app/services/fdd/emailmessage.service.js @@ -1,11 +1,8 @@ 'use strict'; -app.factory('EmailMessageAnalysisService', function($http) { +app.factory('EmailMessageService', function($http) { return { - - getAnalysisResult: function(query,callback) { - var base="emailmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getResult: function(query, headers, callback) { + $http.get(getAPI()+"emailmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,8 +10,8 @@ app.factory('EmailMessageAnalysisService', function($http) { }); }, - deleteEmailMessage: function(emailmessage, callback) { - $http.delete(getAPI()+'emailmessages/'+emailmessage.id) + deleteEmailMessage: function(emailmessage, headers, callback) { + $http.delete(getAPI()+'emailmessages/'+emailmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/fdd/rule.service.js b/admin/app/services/fdd/rule.service.js index e4c92e65..266b05ae 100644 --- a/admin/app/services/fdd/rule.service.js +++ b/admin/app/services/fdd/rule.service.js @@ -1,48 +1,48 @@ 'use strict'; app.factory('RuleService', function($http) { return { - getAllRules:function(callback){ - $http.get(getAPI()+'rules') + getAllRules:function(headers, callback){ + $http.get(getAPI()+'rules', {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - searchRules: function(query, callback) { - $http.get(getAPI()+'rules', { params: { q: query } }) + searchRules: function(query, headers, callback) { + $http.get(getAPI()+'rules', { params: { q: query } }, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - addRule: function(rule, callback) { - $http.post(getAPI()+'rules',{data:rule}) + addRule: function(rule, headers, callback) { + $http.post(getAPI()+'rules', {data:rule}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editRule: function(rule, callback) { - $http.put(getAPI()+'rules/'+rule.id,{data:rule}) + editRule: function(rule, headers, callback) { + $http.put(getAPI()+'rules/'+rule.id,{data:rule}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteRule: function(rule, callback) { - $http.delete(getAPI()+'rules/'+rule.id) + deleteRule: function(rule, headers, callback) { + $http.delete(getAPI()+'rules/'+rule.id, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - getRule: function(id, callback) { - $http.get(getAPI()+'rules/'+id) + getRule: function(id, headers, callback) { + $http.get(getAPI()+'rules/'+id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/fdd/textmessageanalysis.service.js b/admin/app/services/fdd/textmessage.service.js similarity index 58% rename from admin/app/services/fdd/textmessageanalysis.service.js rename to admin/app/services/fdd/textmessage.service.js index 81ccdc22..cd1c8e2c 100644 --- a/admin/app/services/fdd/textmessageanalysis.service.js +++ b/admin/app/services/fdd/textmessage.service.js @@ -1,11 +1,8 @@ 'use strict'; -app.factory('TextMessageAnalysisService', function($http) { +app.factory('TextMessageService', function($http) { return { - - getAnalysisResult: function(query, callback) { - var base="textmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getResult: function(query, headers, callback) { + $http.get(getAPI()+"textmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,8 +10,8 @@ app.factory('TextMessageAnalysisService', function($http) { }); }, - deleteTextMessage: function(textmessage, callback) { - $http.delete(getAPI()+'textmessages/'+textmessage.id) + deleteTextMessage: function(textmessage, headers, callback) { + $http.delete(getAPI()+'textmessages/'+textmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/fdd/webmessageanalysis.service.js b/admin/app/services/fdd/webmessage.service.js similarity index 57% rename from admin/app/services/fdd/webmessageanalysis.service.js rename to admin/app/services/fdd/webmessage.service.js index 25fed0f6..292d7293 100644 --- a/admin/app/services/fdd/webmessageanalysis.service.js +++ b/admin/app/services/fdd/webmessage.service.js @@ -1,11 +1,8 @@ 'use strict'; -app.factory('WebMessageAnalysisService', function($http) { +app.factory('WebMessageService', function($http) { return { - - getAnalysisResult: function(query,callback) { - var base="webmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getResult: function(query, headers, callback) { + $http.get(getAPI()+"webmessages?" + "startdatetime=" + query.startdatetime + "&enddatetime=" + query.enddatetime, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,9 +10,8 @@ app.factory('WebMessageAnalysisService', function($http) { }); }, - getStatusNewResult: function(callback) { - var base="webmessagesnew"; - $http.get(getAPI()+base) + getStatusNewResult: function(headers, callback) { + $http.get(getAPI()+"webmessagesnew", {headers}) .then(function (response) { callback(response); }, function (response) { @@ -23,8 +19,8 @@ app.factory('WebMessageAnalysisService', function($http) { }); }, - editWebMessage: function(webmessage, callback) { - $http.put(getAPI()+'webmessages/'+webmessage.id, {data:webmessage}) + editWebMessage: function(webmessage, headers, callback) { + $http.put(getAPI()+'webmessages/'+webmessage.id, {data:webmessage}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -32,8 +28,8 @@ app.factory('WebMessageAnalysisService', function($http) { }); }, - deleteWebMessage: function(webmessage, callback) { - $http.delete(getAPI()+'webmessages/'+webmessage.id) + deleteWebMessage: function(webmessage, headers, callback) { + $http.delete(getAPI()+'webmessages/'+webmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/fdd/wechatmessageanalysis.service.js b/admin/app/services/fdd/wechatmessage.service.js similarity index 57% rename from admin/app/services/fdd/wechatmessageanalysis.service.js rename to admin/app/services/fdd/wechatmessage.service.js index e19d9532..a70f4c62 100644 --- a/admin/app/services/fdd/wechatmessageanalysis.service.js +++ b/admin/app/services/fdd/wechatmessage.service.js @@ -1,11 +1,8 @@ 'use strict'; -app.factory('WechatMessageAnalysisService', function($http) { +app.factory('WechatMessageService', function($http) { return { - - getAnalysisResult: function(query,callback) { - var base="wechatmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getResult: function(query, headers, callback) { + $http.get(getAPI()+"wechatmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,8 +10,8 @@ app.factory('WechatMessageAnalysisService', function($http) { }); }, - deleteWechatMessage: function(wechatmessage, callback) { - $http.delete(getAPI()+'wechatmessages/'+wechatmessage.id) + deleteWechatMessage: function(wechatmessage, headers, callback) { + $http.delete(getAPI()+'wechatmessages/'+wechatmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/category/energyitem.service.js b/admin/app/services/settings/category/energyitem.service.js index 503a8542..ee0fff62 100644 --- a/admin/app/services/settings/category/energyitem.service.js +++ b/admin/app/services/settings/category/energyitem.service.js @@ -17,24 +17,24 @@ app.factory('EnergyItemService', function($http) { callback(response); }); }, - addEnergyItem: function(energyItem, callback) { - $http.post(getAPI()+'energyitems',{data:energyItem}) + addEnergyItem: function(energyItem, headers, callback) { + $http.post(getAPI()+'energyitems',{data:energyItem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyItem: function(energyItem, callback) { - $http.put(getAPI()+'energyitems/'+energyItem.id,{data:energyItem}) + editEnergyItem: function(energyItem, headers, callback) { + $http.put(getAPI()+'energyitems/'+energyItem.id,{data:energyItem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteEnergyItem: function(energyItem, callback) { - $http.delete(getAPI()+'energyitems/'+energyItem.id) + deleteEnergyItem: function(energyItem, headers, callback) { + $http.delete(getAPI()+'energyitems/'+energyItem.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipment.service.js b/admin/app/services/settings/combinedequipment/combinedequipment.service.js index 33c00abb..aff87c4e 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipment.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipment.service.js @@ -17,24 +17,24 @@ app.factory('CombinedEquipmentService', function($http) { callback(response); }); }, - addCombinedEquipment: function(combinedequipment, callback) { - $http.post(getAPI()+'combinedequipments',{data:combinedequipment}) + addCombinedEquipment: function(combinedequipment, headers, callback) { + $http.post(getAPI()+'combinedequipments',{data:combinedequipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editCombinedEquipment: function(combinedequipment, callback) { - $http.put(getAPI()+'combinedequipments/'+combinedequipment.id,{data:combinedequipment}) + editCombinedEquipment: function(combinedequipment, headers, callback) { + $http.put(getAPI()+'combinedequipments/'+combinedequipment.id,{data:combinedequipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteCombinedEquipment: function(combinedequipment, callback) { - $http.delete(getAPI()+'combinedequipments/'+combinedequipment.id) + deleteCombinedEquipment: function(combinedequipment, headers, callback) { + $http.delete(getAPI()+'combinedequipments/'+combinedequipment.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js index b19ac465..085c2da5 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('CombinedEquipmentEquipmentService', function($http) { return { - addPair: function(combinedequipmentID,equipmentID,callback) { - $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}}) + addPair: function(combinedequipmentID,equipmentID, headers, callback) { + $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments', {data:{'equipment_id':equipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('CombinedEquipmentEquipmentService', function($http) { }); }, - deletePair: function(combinedequipmentID, equipmentID, callback) { - $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments/'+equipmentID) + deletePair: function(combinedequipmentID, equipmentID, headers, callback) { + $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments/'+equipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js index 2ea9305c..8363d429 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('CombinedEquipmentMeterService', function ($http) { return { - addPair: function (combinedequipmentID, meterID, metertype, is_output, callback) { + addPair: function (combinedequipmentID, meterID, metertype, is_output, headers, callback) { var meter = {}; if (metertype == 'meters') { meter = { 'meter_id': meterID, is_output: is_output }; @@ -10,7 +10,7 @@ app.factory('CombinedEquipmentMeterService', function ($http) { } else { meter = { 'offline_meter_id': meterID, is_output: is_output }; } - $http.post(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype, { data: meter }) + $http.post(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype, { data: meter }, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -18,8 +18,8 @@ app.factory('CombinedEquipmentMeterService', function ($http) { }); }, - deletePair: function (combinedequipmentID, meterID, metertype, callback) { - $http.delete(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype + '/' + meterID) + deletePair: function (combinedequipmentID, meterID, metertype, headers, callback) { + $http.delete(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype + '/' + meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js index dd32c7e0..6857677c 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js @@ -1,7 +1,6 @@ 'use strict'; app.factory('CombinedEquipmentParameterService', function($http) { return { - getParametersByCombinedEquipmentID: function(id, callback) { $http.get(getAPI()+'combinedequipments/'+id+'/parameters') .then(function (response) { @@ -10,16 +9,17 @@ app.factory('CombinedEquipmentParameterService', function($http) { callback(response); }); }, - addCombinedEquipmentParameter: function(combinedequipmentID, combinedequipmentparameter,callback) { - $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters',{data:combinedequipmentparameter}) + addCombinedEquipmentParameter: function(combinedequipmentID, combinedequipmentparameter, headers, callback) { + $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters',{data:combinedequipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter,callback) { - $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter}) + editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter, headers, callback) { + $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id, + {data:combinedequipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -27,8 +27,8 @@ app.factory('CombinedEquipmentParameterService', function($http) { }); }, - deleteCombinedEquipmentParameter: function(combinedequipmentID, parameterID, callback) { - $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+parameterID) + deleteCombinedEquipmentParameter: function(combinedequipmentID, parameterID, headers, callback) { + $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+parameterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/contact/contact.service.js b/admin/app/services/settings/contact/contact.service.js index 19b47c98..437540e0 100644 --- a/admin/app/services/settings/contact/contact.service.js +++ b/admin/app/services/settings/contact/contact.service.js @@ -17,24 +17,24 @@ app.factory('ContactService', function($http) { callback(response); }); }, - addContact: function(contact, callback) { - $http.post(getAPI()+'contacts',{data:contact}) + addContact: function(contact, headers, callback) { + $http.post(getAPI()+'contacts',{data:contact}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editContact: function(contact, callback) { - $http.put(getAPI()+'contacts/'+contact.id,{data:contact}) + editContact: function(contact, headers, callback) { + $http.put(getAPI()+'contacts/'+contact.id,{data:contact}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteContact: function(contact, callback) { - $http.delete(getAPI()+'contacts/'+contact.id) + deleteContact: function(contact, headers, callback) { + $http.delete(getAPI()+'contacts/'+contact.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/costcenter/costcenter.service.js b/admin/app/services/settings/costcenter/costcenter.service.js index 6adc79cf..fc307150 100644 --- a/admin/app/services/settings/costcenter/costcenter.service.js +++ b/admin/app/services/settings/costcenter/costcenter.service.js @@ -17,24 +17,24 @@ app.factory('CostCenterService', function($http) { callback(response); }); }, - addCostCenter: function(costcenter, callback) { - $http.post(getAPI()+'costcenters',{data:costcenter}) + addCostCenter: function(costcenter, headers, callback) { + $http.post(getAPI()+'costcenters',{data:costcenter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editCostCenter: function(costcenter, callback) { - $http.put(getAPI()+'costcenters/'+costcenter.id,{data:costcenter}) + editCostCenter: function(costcenter, headers, callback) { + $http.put(getAPI()+'costcenters/'+costcenter.id,{data:costcenter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteCostCenter: function(costcenter, callback) { - $http.delete(getAPI()+'costcenters/'+costcenter.id) + deleteCostCenter: function(costcenter, headers, callback) { + $http.delete(getAPI()+'costcenters/'+costcenter.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/costcenter/costcentertariff.service.js b/admin/app/services/settings/costcenter/costcentertariff.service.js index 532af9f5..7c121a01 100644 --- a/admin/app/services/settings/costcenter/costcentertariff.service.js +++ b/admin/app/services/settings/costcenter/costcentertariff.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('CostCenterTariffService', function($http) { return { - addPair: function(costcenterid,tariffid,callback) { - $http.post(getAPI()+'costcenters/'+costcenterid+'/tariffs',{data:{'tariff_id':tariffid}}) + addPair: function(costcenterid, tariffid, headers, callback ) { + $http.post(getAPI()+'costcenters/'+costcenterid+'/tariffs',{data:{'tariff_id':tariffid}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('CostCenterTariffService', function($http) { }); }, - deletePair: function(costcenterid,tariffid, callback) { - $http.delete(getAPI()+'costcenters/'+costcenterid+'/tariffs/'+tariffid) + deletePair: function(costcenterid, tariffid, headers, callback) { + $http.delete(getAPI()+'costcenters/'+costcenterid+'/tariffs/'+tariffid, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,7 +19,7 @@ app.factory('CostCenterTariffService', function($http) { }); }, getTariffsByCostCenterID: function(id, callback) { - $http.get(getAPI()+'costcenters/'+id+'/tariffs') + $http.get(getAPI()+'costcenters/'+id+'/tariffs') .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/datasource/datasource.service.js b/admin/app/services/settings/datasource/datasource.service.js index f33486c0..b3e88a92 100644 --- a/admin/app/services/settings/datasource/datasource.service.js +++ b/admin/app/services/settings/datasource/datasource.service.js @@ -2,7 +2,7 @@ app.factory('DataSourceService', function($http) { return { getAllDataSources:function(headers, callback){ - $http.get(getAPI()+'datasources', {headers}) + $http.get(getAPI() + 'datasources', {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/distributionsystem/distributioncircuit.service.js b/admin/app/services/settings/distributionsystem/distributioncircuit.service.js index ff4be381..1c7914de 100644 --- a/admin/app/services/settings/distributionsystem/distributioncircuit.service.js +++ b/admin/app/services/settings/distributionsystem/distributioncircuit.service.js @@ -17,16 +17,16 @@ app.factory('DistributionCircuitService', function($http) { callback(response); }); }, - addDistributionCircuit: function(distributioncircuit,callback) { - $http.post(getAPI()+'/distributioncircuits',{data:distributioncircuit}) + addDistributionCircuit: function(distributioncircuit, headers, callback) { + $http.post(getAPI()+'/distributioncircuits',{data:distributioncircuit}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editDistributionCircuit: function(distributioncircuit,callback) { - $http.put(getAPI()+'/distributioncircuits/'+distributioncircuit.id,{data:distributioncircuit}) + editDistributionCircuit: function(distributioncircuit, headers, callback) { + $http.put(getAPI()+'/distributioncircuits/'+distributioncircuit.id,{data:distributioncircuit}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -34,8 +34,8 @@ app.factory('DistributionCircuitService', function($http) { }); }, - deleteDistributionCircuit: function(distributioncircuitID, callback) { - $http.delete(getAPI()+'/distributioncircuits/'+distributioncircuitID) + deleteDistributionCircuit: function(distributioncircuitID, headers, callback) { + $http.delete(getAPI()+'/distributioncircuits/'+distributioncircuitID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js b/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js index c2ca6420..ab56348c 100644 --- a/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js +++ b/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('DistributionCircuitPointService', function($http) { return { - addPair: function(distributioncircuitID,pointID,callback) { - $http.post(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points',{data:{'point_id':pointID}}) + addPair: function(distributioncircuitID,pointID, headers, callback) { + $http.post(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('DistributionCircuitPointService', function($http) { }); }, - deletePair: function(distributioncircuitID,pointID, callback) { - $http.delete(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points/'+pointID) + deletePair: function(distributioncircuitID,pointID, headers, callback) { + $http.delete(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/distributionsystem/distributionsystem.service.js b/admin/app/services/settings/distributionsystem/distributionsystem.service.js index 358cf58a..19ba3b99 100644 --- a/admin/app/services/settings/distributionsystem/distributionsystem.service.js +++ b/admin/app/services/settings/distributionsystem/distributionsystem.service.js @@ -17,24 +17,24 @@ app.factory('DistributionSystemService', function($http) { callback(response); }); }, - addDistributionSystem: function(distributionsystem, callback) { - $http.post(getAPI()+'distributionsystems',{data:distributionsystem}) + addDistributionSystem: function(distributionsystem, headers, callback) { + $http.post(getAPI()+'distributionsystems',{data:distributionsystem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editDistributionSystem: function(distributionsystem, callback) { - $http.put(getAPI()+'distributionsystems/'+distributionsystem.id,{data:distributionsystem}) + editDistributionSystem: function(distributionsystem, headers, callback) { + $http.put(getAPI()+'distributionsystems/'+distributionsystem.id,{data:distributionsystem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteDistributionSystem: function(distributionsystem, callback) { - $http.delete(getAPI()+'distributionsystems/'+distributionsystem.id) + deleteDistributionSystem: function(distributionsystem, headers, callback) { + $http.delete(getAPI()+'distributionsystems/'+distributionsystem.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js b/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js index c82b3f22..6180fe60 100644 --- a/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js +++ b/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js @@ -17,24 +17,24 @@ app.factory('EnergyFlowDiagramService', function($http) { callback(response); }); }, - addEnergyFlowDiagram: function(energyflowdiagram, callback) { - $http.post(getAPI()+'energyflowdiagrams',{data:energyflowdiagram}) + addEnergyFlowDiagram: function(energyflowdiagram, headers, callback) { + $http.post(getAPI()+'energyflowdiagrams',{data:energyflowdiagram}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyFlowDiagram: function(energyflowdiagram, callback) { - $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id,{data:energyflowdiagram}) + editEnergyFlowDiagram: function(energyflowdiagram, headers, callback) { + $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id,{data:energyflowdiagram}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteEnergyFlowDiagram: function(energyflowdiagram, callback) { - $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id) + deleteEnergyFlowDiagram: function(energyflowdiagram, headers, callback) { + $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js b/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js index 511fb04a..0709c60b 100644 --- a/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js +++ b/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js @@ -10,16 +10,16 @@ app.factory('EnergyFlowDiagramLinkService', function($http) { callback(response); }); }, - addEnergyFlowDiagramLink: function(energyflowdiagramID, energyflowdiagramlink, callback) { - $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links',{data:energyflowdiagramlink}) + addEnergyFlowDiagramLink: function(energyflowdiagramID, energyflowdiagramlink, headers, callback) { + $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links',{data:energyflowdiagramlink}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyFlowDiagramLink: function(energyflowdiagramID,energyflowdiagramlink,callback) { - $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+energyflowdiagramlink.id,{data:energyflowdiagramlink}) + editEnergyFlowDiagramLink: function(energyflowdiagramID, energyflowdiagramlink, headers, callback) { + $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+energyflowdiagramlink.id,{data:energyflowdiagramlink}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -27,8 +27,8 @@ app.factory('EnergyFlowDiagramLinkService', function($http) { }); }, - deleteEnergyFlowDiagramLink: function(energyflowdiagramID, linkID, callback) { - $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+linkID) + deleteEnergyFlowDiagramLink: function(energyflowdiagramID, linkID, headers, callback) { + $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+linkID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js b/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js index b9d69a7f..4786ec09 100644 --- a/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js +++ b/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js @@ -9,16 +9,16 @@ app.factory('EnergyFlowDiagramNodeService', function($http) { callback(response); }); }, - addEnergyFlowDiagramNode: function(energyflowdiagramID, energyflowdiagramnode,callback) { - $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes',{data:energyflowdiagramnode}) + addEnergyFlowDiagramNode: function(energyflowdiagramID, energyflowdiagramnode, headers, callback) { + $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes',{data:energyflowdiagramnode}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyFlowDiagramNode: function(energyflowdiagramID,energyflowdiagramnode,callback) { - $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+energyflowdiagramnode.id,{data:energyflowdiagramnode}) + editEnergyFlowDiagramNode: function(energyflowdiagramID, energyflowdiagramnode, headers, callback) { + $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+energyflowdiagramnode.id,{data:energyflowdiagramnode}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -26,8 +26,8 @@ app.factory('EnergyFlowDiagramNodeService', function($http) { }); }, - deleteEnergyFlowDiagramNode: function(energyflowdiagramID, nodeID, callback) { - $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+nodeID) + deleteEnergyFlowDiagramNode: function(energyflowdiagramID, nodeID, headers, callback) { + $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+nodeID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/energyflowdiagram/equipmentparameter.model.html b/admin/app/services/settings/energyflowdiagram/equipmentparameter.model.html deleted file mode 100644 index f1bfb19c..00000000 --- a/admin/app/services/settings/energyflowdiagram/equipmentparameter.model.html +++ /dev/null @@ -1,84 +0,0 @@ -
-
-

{{operation | translate}}

-
-
-
-
- -
-
- {{'EQUIPMENT.INPUT_PARAMETER_NAME' | translate}} -
-
-
-
-
- -
- -
- {{'EQUIPMENT.SELECT_PARAMETER_TYPE' | translate}} -
-
-
-
-
- -
- -
- {{'EQUIPMENT.INPUT_CONSTANT' | translate}} -
-
-
-
-
- -
- - {{$select.selected.name}} - -
- - -
- {{'EQUIPMENT.SELECT_POINT' | translate}} -
-
-
-
-
- -
- - {{$select.selected.name}} - -
- - -
-
-
-
- -
- - {{$select.selected.name}} - -
- - -
-
-
-
-
- - -
-
diff --git a/admin/app/services/settings/equipment/equipment.service.js b/admin/app/services/settings/equipment/equipment.service.js index c90bec6b..cba00419 100644 --- a/admin/app/services/settings/equipment/equipment.service.js +++ b/admin/app/services/settings/equipment/equipment.service.js @@ -17,24 +17,24 @@ app.factory('EquipmentService', function($http) { callback(response); }); }, - addEquipment: function(equipment, callback) { - $http.post(getAPI()+'equipments',{data:equipment}) + addEquipment: function(equipment, headers, callback) { + $http.post(getAPI()+'equipments',{data:equipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEquipment: function(equipment, callback) { - $http.put(getAPI()+'equipments/'+equipment.id,{data:equipment}) + editEquipment: function(equipment, headers, callback) { + $http.put(getAPI()+'equipments/'+equipment.id,{data:equipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteEquipment: function(equipment, callback) { - $http.delete(getAPI()+'equipments/'+equipment.id) + deleteEquipment: function(equipment, headers, callback) { + $http.delete(getAPI()+'equipments/'+equipment.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/equipment/equipmentmeter.service.js b/admin/app/services/settings/equipment/equipmentmeter.service.js index 2b54b38a..253964aa 100644 --- a/admin/app/services/settings/equipment/equipmentmeter.service.js +++ b/admin/app/services/settings/equipment/equipmentmeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('EquipmentMeterService', function($http) { return { - addPair: function(equipmentID,meterID,metertype,is_output,callback) { + addPair: function(equipmentID, meterID, metertype, is_output, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID,is_output:is_output}; @@ -10,7 +10,7 @@ app.factory('EquipmentMeterService', function($http) { }else{ meter={'offline_meter_id':meterID,is_output:is_output}; } - $http.post(getAPI()+'equipments/'+equipmentID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'equipments/'+equipmentID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -18,8 +18,8 @@ app.factory('EquipmentMeterService', function($http) { }); }, - deletePair: function(equipmentID,meterID,metertype, callback) { - $http.delete(getAPI()+'equipments/'+equipmentID+'/'+metertype+'/'+meterID) + deletePair: function(equipmentID,meterID,metertype, headers, callback) { + $http.delete(getAPI()+'equipments/'+equipmentID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/equipment/equipmentparameter.service.js b/admin/app/services/settings/equipment/equipmentparameter.service.js index c803bc25..e65b79b8 100644 --- a/admin/app/services/settings/equipment/equipmentparameter.service.js +++ b/admin/app/services/settings/equipment/equipmentparameter.service.js @@ -10,16 +10,16 @@ app.factory('EquipmentParameterService', function($http) { callback(response); }); }, - addEquipmentParameter: function(equipmentID, equipmentparameter,callback) { - $http.post(getAPI()+'equipments/'+equipmentID+'/parameters',{data:equipmentparameter}) + addEquipmentParameter: function(equipmentID, equipmentparameter, headers, callback) { + $http.post(getAPI()+'equipments/'+equipmentID+'/parameters',{data:equipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEquipmentParameter: function(equipmentID,equipmentparameter,callback) { - $http.put(getAPI()+'equipments/'+equipmentID+'/parameters/'+equipmentparameter.id,{data:equipmentparameter}) + editEquipmentParameter: function(equipmentID, equipmentparameter, headers, callback) { + $http.put(getAPI()+'equipments/'+equipmentID+'/parameters/'+equipmentparameter.id,{data:equipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -27,8 +27,8 @@ app.factory('EquipmentParameterService', function($http) { }); }, - deleteEquipmentParameter: function(equipmentID, parameterID, callback) { - $http.delete(getAPI()+'equipments/'+equipmentID+'/parameters/'+parameterID) + deleteEquipmentParameter: function(equipmentID, parameterID, headers, callback) { + $http.delete(getAPI()+'equipments/'+equipmentID+'/parameters/'+parameterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/menu/menu.service.js b/admin/app/services/settings/menu/menu.service.js index fc0c6505..7d2080bb 100644 --- a/admin/app/services/settings/menu/menu.service.js +++ b/admin/app/services/settings/menu/menu.service.js @@ -17,8 +17,8 @@ app.factory('MenuService', function($http) { callback(response); }); }, - editMenu: function(menu, callback) { - $http.put(getAPI()+'menus/'+menu.id,{data:menu}) + editMenu: function(menu, headers, callback) { + $http.put(getAPI()+'menus/'+menu.id, {data:menu}, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/meter/meterpoint.service.js b/admin/app/services/settings/meter/meterpoint.service.js index e9184851..3c1ebf28 100644 --- a/admin/app/services/settings/meter/meterpoint.service.js +++ b/admin/app/services/settings/meter/meterpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('MeterPointService', function($http) { return { - addPair: function(meterID,pointID,callback) { - $http.post(getAPI()+'meters/'+meterID+'/points',{data:{'point_id':pointID}}) + addPair: function(meterID, pointID, headers, callback) { + $http.post(getAPI() + 'meters/' + meterID + '/points', {data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('MeterPointService', function($http) { }); }, - deletePair: function(meterID,pointID, callback) { - $http.delete(getAPI()+'meters/'+meterID+'/points/'+pointID) + deletePair: function(meterID,pointID, headers, callback) { + $http.delete(getAPI() + 'meters/' + meterID + '/points/' + pointID, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,7 +19,7 @@ app.factory('MeterPointService', function($http) { }); }, getPointsByMeterID: function(id, callback) { - $http.get(getAPI()+'meters/'+id+'/points') + $http.get(getAPI() + 'meters/' + id + '/points') .then(function (response) { callback(response); }, function (response) { 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/sensor/sensor.service.js b/admin/app/services/settings/sensor/sensor.service.js index 1282799b..e28b6e59 100644 --- a/admin/app/services/settings/sensor/sensor.service.js +++ b/admin/app/services/settings/sensor/sensor.service.js @@ -17,24 +17,24 @@ app.factory('SensorService', function($http) { callback(response); }); }, - addSensor: function(sensor, callback) { - $http.post(getAPI()+'sensors',{data:sensor}) + addSensor: function(sensor, headers, callback) { + $http.post(getAPI()+'sensors',{data:sensor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editSensor: function(sensor, callback) { - $http.put(getAPI()+'sensors/'+sensor.id,{data:sensor}) + editSensor: function(sensor, headers, callback) { + $http.put(getAPI()+'sensors/'+sensor.id,{data:sensor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteSensor: function(sensor, callback) { - $http.delete(getAPI()+'sensors/'+sensor.id) + deleteSensor: function(sensor, headers, callback) { + $http.delete(getAPI()+'sensors/'+sensor.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/sensor/sensorpoint.service.js b/admin/app/services/settings/sensor/sensorpoint.service.js index d2f614de..365771a1 100644 --- a/admin/app/services/settings/sensor/sensorpoint.service.js +++ b/admin/app/services/settings/sensor/sensorpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SensorPointService', function($http) { return { - addPair: function(sensorID,pointID,callback) { - $http.post(getAPI()+'sensors/'+sensorID+'/points',{data:{'point_id':pointID}}) + addPair: function(sensorID,pointID, headers, callback) { + $http.post(getAPI()+'sensors/'+sensorID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SensorPointService', function($http) { }); }, - deletePair: function(sensorID,pointID, callback) { - $http.delete(getAPI()+'sensors/'+sensorID+'/points/'+pointID) + deletePair: function(sensorID,pointID, headers, callback) { + $http.delete(getAPI()+'sensors/'+sensorID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloor.service.js b/admin/app/services/settings/shopfloor/shopfloor.service.js index 7abe289a..2680a8ae 100644 --- a/admin/app/services/settings/shopfloor/shopfloor.service.js +++ b/admin/app/services/settings/shopfloor/shopfloor.service.js @@ -25,24 +25,24 @@ app.factory('ShopfloorService', function($http) { callback(response); }); }, - addShopfloor: function(shopfloor, callback) { - $http.post(getAPI()+'shopfloors',{data:shopfloor}) + addShopfloor: function(shopfloor, headers, callback) { + $http.post(getAPI()+'shopfloors',{data:shopfloor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editShopfloor: function(shopfloor, callback) { - $http.put(getAPI()+'shopfloors/'+shopfloor.id,{data:shopfloor}) + editShopfloor: function(shopfloor, headers, callback) { + $http.put(getAPI()+'shopfloors/'+shopfloor.id,{data:shopfloor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteShopfloor: function(shopfloor, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloor.id) + deleteShopfloor: function(shopfloor, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloor.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloorequipment.service.js b/admin/app/services/settings/shopfloor/shopfloorequipment.service.js index 8f576bab..b2c18f22 100644 --- a/admin/app/services/settings/shopfloor/shopfloorequipment.service.js +++ b/admin/app/services/settings/shopfloor/shopfloorequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('ShopfloorEquipmentService', function($http) { return { - addPair: function(shopfloorID,equipmentID,callback) { - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/equipments',{data:{'equipment_id':equipmentID}}) + addPair: function(shopfloorID,equipmentID, headers, callback) { + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/equipments',{data:{'equipment_id':equipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('ShopfloorEquipmentService', function($http) { }); }, - deletePair: function(shopfloorID, equipmentID, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/equipments/'+equipmentID) + deletePair: function(shopfloorID, equipmentID, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/equipments/'+equipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloormeter.service.js b/admin/app/services/settings/shopfloor/shopfloormeter.service.js index 9b0823af..509a751f 100644 --- a/admin/app/services/settings/shopfloor/shopfloormeter.service.js +++ b/admin/app/services/settings/shopfloor/shopfloormeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('ShopfloorMeterService', function($http) { return { - addPair: function(shopfloorID,meterID, metertype,callback) { + addPair: function(shopfloorID,meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('ShopfloorMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('ShopfloorMeterService', function($http) { }); }, - deletePair: function(shopfloorID,meterID, metertype, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype+'/'+meterID) + deletePair: function(shopfloorID,meterID, metertype, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloorpoint.service.js b/admin/app/services/settings/shopfloor/shopfloorpoint.service.js index e9cfe09a..6834be32 100644 --- a/admin/app/services/settings/shopfloor/shopfloorpoint.service.js +++ b/admin/app/services/settings/shopfloor/shopfloorpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('ShopfloorPointService', function($http) { return { - addPair: function(shopfloorID,pointID,callback) { - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/points',{data:{'point_id':pointID}}) + addPair: function(shopfloorID,pointID, headers, callback) { + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('ShopfloorPointService', function($http) { }); }, - deletePair: function(shopfloorID,pointID, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/points/'+pointID) + deletePair: function(shopfloorID,pointID, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloorsensor.service.js b/admin/app/services/settings/shopfloor/shopfloorsensor.service.js index eb6956c1..4d9aa532 100644 --- a/admin/app/services/settings/shopfloor/shopfloorsensor.service.js +++ b/admin/app/services/settings/shopfloor/shopfloorsensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('ShopfloorSensorService', function($http) { return { - addPair: function(shopfloorID,sensorID,callback) { - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(shopfloorID,sensorID, headers, callback) { + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('ShopfloorSensorService', function($http) { }); }, - deletePair: function(shopfloorID,sensorID, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/sensors/'+sensorID) + deletePair: function(shopfloorID,sensorID, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/sensors/'+sensorID, {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/admin/app/services/settings/store/store.service.js b/admin/app/services/settings/store/store.service.js index 4fea0042..e4844665 100644 --- a/admin/app/services/settings/store/store.service.js +++ b/admin/app/services/settings/store/store.service.js @@ -17,24 +17,24 @@ app.factory('StoreService', function($http) { callback(response); }); }, - addStore: function(store, callback) { - $http.post(getAPI()+'stores',{data:store}) + addStore: function(store, headers, callback) { + $http.post(getAPI()+'stores',{data:store}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editStore: function(store, callback) { - $http.put(getAPI()+'stores/'+store.id,{data:store}) + editStore: function(store, headers, callback) { + $http.put(getAPI()+'stores/'+store.id,{data:store}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteStore: function(store, callback) { - $http.delete(getAPI()+'stores/'+store.id) + deleteStore: function(store, headers, callback) { + $http.delete(getAPI()+'stores/'+store.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storemeter.service.js b/admin/app/services/settings/store/storemeter.service.js index 860ee1e5..a36b3349 100644 --- a/admin/app/services/settings/store/storemeter.service.js +++ b/admin/app/services/settings/store/storemeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('StoreMeterService', function($http) { return { - addPair: function(storeID, meterID, metertype,callback) { + addPair: function(storeID, meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('StoreMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'stores/'+storeID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'stores/'+storeID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('StoreMeterService', function($http) { }); }, - deletePair: function(storeID, meterID, metertype, callback) { - $http.delete(getAPI()+'stores/'+storeID+'/'+metertype+'/'+meterID) + deletePair: function(storeID, meterID, metertype, headers, callback) { + $http.delete(getAPI()+'stores/'+storeID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storepoint.service.js b/admin/app/services/settings/store/storepoint.service.js index 182f3393..bf046bab 100644 --- a/admin/app/services/settings/store/storepoint.service.js +++ b/admin/app/services/settings/store/storepoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('StorePointService', function($http) { return { - addPair: function(storeID,pointID,callback) { - $http.post(getAPI()+'stores/'+storeID+'/points',{data:{'point_id':pointID}}) + addPair: function(storeID,pointID, headers, callback) { + $http.post(getAPI()+'stores/'+storeID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('StorePointService', function($http) { }); }, - deletePair: function(storeID,pointID, callback) { - $http.delete(getAPI()+'stores/'+storeID+'/points/'+pointID) + deletePair: function(storeID,pointID, headers, callback) { + $http.delete(getAPI()+'stores/'+storeID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storesensor.service.js b/admin/app/services/settings/store/storesensor.service.js index 988aa3f2..8d15bef9 100644 --- a/admin/app/services/settings/store/storesensor.service.js +++ b/admin/app/services/settings/store/storesensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('StoreSensorService', function($http) { return { - addPair: function(storeID,sensorID,callback) { - $http.post(getAPI()+'stores/'+storeID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(storeID,sensorID, headers, callback) { + $http.post(getAPI()+'stores/'+storeID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('StoreSensorService', function($http) { }); }, - deletePair: function(storeID,sensorID, callback) { - $http.delete(getAPI()+'stores/'+storeID+'/sensors/'+sensorID) + deletePair: function(storeID,sensorID, headers, callback) { + $http.delete(getAPI()+'stores/'+storeID+'/sensors/'+sensorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storetype.service.js b/admin/app/services/settings/store/storetype.service.js index 50060d1e..9055b6a0 100644 --- a/admin/app/services/settings/store/storetype.service.js +++ b/admin/app/services/settings/store/storetype.service.js @@ -17,24 +17,24 @@ app.factory('StoreTypeService', function($http) { callback(response); }); }, - addStoreType: function(store_type, callback) { - $http.post(getAPI()+'storetypes',{data:store}) + addStoreType: function(store_type, headers, callback) { + $http.post(getAPI()+'storetypes',{data:store}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editStoreType: function(store_type, callback) { - $http.put(getAPI()+'storetypes/'+store_type.id,{data:store_type}) + editStoreType: function(store_type, headers, callback) { + $http.put(getAPI()+'storetypes/'+store_type.id,{data:store_type}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteStoreType: function(store_type, callback) { - $http.delete(getAPI()+'storetypes/'+store_type.id) + deleteStoreType: function(store_type, headers, callback) { + $http.delete(getAPI()+'storetypes/'+store_type.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tariff/flat.service.js b/admin/app/services/settings/tariff/flat.service.js deleted file mode 100644 index a853302c..00000000 --- a/admin/app/services/settings/tariff/flat.service.js +++ /dev/null @@ -1,53 +0,0 @@ -'use strict'; -app.factory('FlatService', function($http) { - return { - getAllFlats:function(callback){ - $http.get(getAPI()+'flats') - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - searchFlats: function(query, callback) { - $http.get(getAPI()+'flats', { params: { q: query } }) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - addFlat: function(flat, callback) { - $http.post(getAPI()+'flats',{data:flat}) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - editFlat: function(flat, callback) { - $http.put(getAPI()+'flats/'+flat.id,{data:flat}) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - deleteFlat: function(flat, callback) { - $http.delete(getAPI()+'flats/'+flat.id) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - getFlat: function(id, callback) { - $http.get(getAPI()+'flats/'+id) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - } - }; -}); \ No newline at end of file diff --git a/admin/app/services/settings/tariff/tariff.service.js b/admin/app/services/settings/tariff/tariff.service.js index ca4be90f..0848f124 100644 --- a/admin/app/services/settings/tariff/tariff.service.js +++ b/admin/app/services/settings/tariff/tariff.service.js @@ -17,24 +17,24 @@ app.factory('TariffService', function($http) { callback(response); }); }, - addTariff: function(tariff, callback) { - $http.post(getAPI()+'tariffs',{data:tariff}) + addTariff: function(tariff, headers, callback) { + $http.post(getAPI()+'tariffs',{data:tariff}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editTariff: function(tariff, callback) { - $http.put(getAPI()+'tariffs/'+tariff.id,{data:tariff}) + editTariff: function(tariff, headers, callback) { + $http.put(getAPI()+'tariffs/'+tariff.id,{data:tariff}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteTariff: function(tariff, callback) { - $http.delete(getAPI()+'tariffs/'+tariff.id) + deleteTariff: function(tariff, headers, callback) { + $http.delete(getAPI()+'tariffs/'+tariff.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenant.service.js b/admin/app/services/settings/tenant/tenant.service.js index 547cfaaf..5584813a 100644 --- a/admin/app/services/settings/tenant/tenant.service.js +++ b/admin/app/services/settings/tenant/tenant.service.js @@ -17,24 +17,24 @@ app.factory('TenantService', function($http) { callback(response); }); }, - addTenant: function(tenant, callback) { - $http.post(getAPI()+'tenants',{data:tenant}) + addTenant: function(tenant, headers, callback) { + $http.post(getAPI()+'tenants',{data:tenant}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editTenant: function(tenant, callback) { - $http.put(getAPI()+'tenants/'+tenant.id,{data:tenant}) + editTenant: function(tenant, headers, callback) { + $http.put(getAPI()+'tenants/'+tenant.id,{data:tenant}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteTenant: function(tenant, callback) { - $http.delete(getAPI()+'tenants/'+tenant.id) + deleteTenant: function(tenant, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenant.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenantmeter.service.js b/admin/app/services/settings/tenant/tenantmeter.service.js index 6a4b6394..e4e05b22 100644 --- a/admin/app/services/settings/tenant/tenantmeter.service.js +++ b/admin/app/services/settings/tenant/tenantmeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('TenantMeterService', function($http) { return { - addPair: function(tenantID, meterID, metertype,callback) { + addPair: function(tenantID, meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('TenantMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'tenants/'+tenantID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'tenants/'+tenantID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('TenantMeterService', function($http) { }); }, - deletePair: function(tenantID, meterID, metertype, callback) { - $http.delete(getAPI()+'tenants/'+tenantID+'/'+metertype+'/'+meterID) + deletePair: function(tenantID, meterID, metertype, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenantID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenantpoint.service.js b/admin/app/services/settings/tenant/tenantpoint.service.js index b5146f91..3cadc625 100644 --- a/admin/app/services/settings/tenant/tenantpoint.service.js +++ b/admin/app/services/settings/tenant/tenantpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('TenantPointService', function($http) { return { - addPair: function(tenantID,pointID,callback) { - $http.post(getAPI()+'tenants/'+tenantID+'/points',{data:{'point_id':pointID}}) + addPair: function(tenantID,pointID, headers, callback) { + $http.post(getAPI()+'tenants/'+tenantID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('TenantPointService', function($http) { }); }, - deletePair: function(tenantID,pointID, callback) { - $http.delete(getAPI()+'tenants/'+tenantID+'/points/'+pointID) + deletePair: function(tenantID,pointID, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenantID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenantsensor.service.js b/admin/app/services/settings/tenant/tenantsensor.service.js index f7e66686..98cdd71b 100644 --- a/admin/app/services/settings/tenant/tenantsensor.service.js +++ b/admin/app/services/settings/tenant/tenantsensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('TenantSensorService', function($http) { return { - addPair: function(tenantID,sensorID,callback) { - $http.post(getAPI()+'tenants/'+tenantID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(tenantID,sensorID, headers, callback) { + $http.post(getAPI()+'tenants/'+tenantID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('TenantSensorService', function($http) { }); }, - deletePair: function(tenantID,sensorID, callback) { - $http.delete(getAPI()+'tenants/'+tenantID+'/sensors/'+sensorID) + deletePair: function(tenantID,sensorID, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenantID+'/sensors/'+sensorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenanttype.service.js b/admin/app/services/settings/tenant/tenanttype.service.js index 17e87880..60e83195 100644 --- a/admin/app/services/settings/tenant/tenanttype.service.js +++ b/admin/app/services/settings/tenant/tenanttype.service.js @@ -17,24 +17,24 @@ app.factory('TenantTypeService', function($http) { callback(response); }); }, - addTenantType: function(tenant_type, callback) { - $http.post(getAPI()+'tenanttypes',{data:tenant}) + addTenantType: function(tenant_type, headers, callback) { + $http.post(getAPI()+'tenanttypes',{data:tenant}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editTenantType: function(tenant_type, callback) { - $http.put(getAPI()+'tenanttypes/'+tenant_type.id,{data:tenant_type}) + editTenantType: function(tenant_type, headers, callback) { + $http.put(getAPI()+'tenanttypes/'+tenant_type.id,{data:tenant_type}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteTenantType: function(tenant_type, callback) { - $http.delete(getAPI()+'tenanttypes/'+tenant_type.id) + deleteTenantType: function(tenant_type, headers, callback) { + $http.delete(getAPI()+'tenanttypes/'+tenant_type.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/users/privilege/privilege.service.js b/admin/app/services/users/privilege/privilege.service.js index 04402b9a..53ac75d5 100644 --- a/admin/app/services/users/privilege/privilege.service.js +++ b/admin/app/services/users/privilege/privilege.service.js @@ -9,24 +9,24 @@ app.factory('PrivilegeService', function($http) { callback(response); }); }, - addPrivilege: function(privilege, callback) { - $http.post(getAPI()+'privileges',{data:privilege}) + addPrivilege: function(privilege, headers, callback) { + $http.post(getAPI()+'privileges', {data:privilege}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editPrivilege: function(privilege, callback) { - $http.put(getAPI()+'privileges/'+privilege.id,{data:privilege}) + editPrivilege: function(privilege, headers, callback) { + $http.put(getAPI()+'privileges/'+privilege.id, {data:privilege}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deletePrivilege: function(privilege, callback) { - $http.delete(getAPI()+'privileges/'+privilege.id) + deletePrivilege: function(privilege, headers, callback) { + $http.delete(getAPI()+'privileges/'+privilege.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/users/user/user.service.js b/admin/app/services/users/user/user.service.js index 29d39962..be8b2c02 100644 --- a/admin/app/services/users/user/user.service.js +++ b/admin/app/services/users/user/user.service.js @@ -64,6 +64,14 @@ app.factory('UserService', function($http) { }, function (response) { callback(response); }); + }, + unlockUser: function(user, headers, callback){ + $http.put(getAPI()+'users/unlock/'+ user.id, {user}, {headers}) + .then(function (response) { + callback(response); + }, function (response) { + callback(response); + }); } }; }); \ No newline at end of file diff --git a/admin/app/translations.js b/admin/app/translations.js index 5251e020..e8418864 100644 --- a/admin/app/translations.js +++ b/admin/app/translations.js @@ -128,6 +128,7 @@ function config($translateProvider) { EDIT: 'Edit', BIND_PROPERTY: 'Bind Property', DELETE: 'Delete', + UNLOCK: 'Unlock', SELECT: 'Select', RESET: 'Reset', SAVE: 'Save', @@ -560,9 +561,11 @@ function config($translateProvider) { SUCCESS_ADD_BODY: 'Add {{template}} Success', SUCCESS_UPDATE_BODY: 'Update {{template}} Success', SUCCESS_DELETE_BODY: 'Delete {{template}} Success', + SUCCESS_UNLOCK_BODY: 'Unlock {{template}} Success', ERROR_ADD_BODY: 'Add {{template}} Failure', ERROR_UPDATE_BODY: 'Update {{template}} Failure', ERROR_DELETE_BODY: 'Delete {{template}} Failure', + ERROR_UNLOCK_BODY: 'Unlock {{template}} Failure', USER_PASSWORD: 'User Password', BIND_METER_SUCCESS: 'Bind Meter Success', @@ -583,10 +586,12 @@ function config($translateProvider) { UNBIND_STORE_SUCCESS: 'Unbind Store Success', }, SWEET: { - TITLE: 'Please confirm whether to delete?', + TITLE: 'Please confirm to delete?', TEXT: 'Deleting this bar will also delete all related data!', CONFIRM_BUTTON_TEXT: 'Confirm delete', CANCEL_BUTTON_TEXT: 'Cancel', + UNLOCK_TITLE: 'Please confirm to unlock', + UNLOCK_CONFIRM_BUTTON_TEXT: 'Confirm unlock', }, API: { ADMINISTRATOR_SESSION_NOT_FOUND: 'Administrator Session Not Found', @@ -1107,6 +1112,7 @@ function config($translateProvider) { BIND_PROPERTY: '绑定属性', EDIT: '修改', DELETE: '删除', + UNLOCK: '解锁', SELECT: '选择', RESET: '重置', SAVE: '保存', @@ -1544,9 +1550,11 @@ function config($translateProvider) { SUCCESS_ADD_BODY: '添加 {{template}} 成功', SUCCESS_UPDATE_BODY: '更新 {{template}} 成功', SUCCESS_DELETE_BODY: '删除 {{template}} 成功', + SUCCESS_UNLOCK_BODY: '解锁 {{template}} 成功', ERROR_ADD_BODY: '添加 {{template}} 失败', ERROR_UPDATE_BODY: '更新 {{template}} 失败', ERROR_DELETE_BODY: '删除 {{template}} 失败', + ERROR_UNLOCK_BODY: '解锁 {{template}} 失败', USER_PASSWORD: '用户密码', BIND_METER_SUCCESS: '绑定计量表成功', @@ -1573,6 +1581,8 @@ function config($translateProvider) { TEXT: '删除该条也会删除所有与其相关数据!', CONFIRM_BUTTON_TEXT: '确认删除', CANCEL_BUTTON_TEXT: '取消', + UNLOCK_TITLE: '请确认是否解锁?', + UNLOCK_CONFIRM_BUTTON_TEXT: '确认解锁' }, API: { ADMINISTRATOR_SESSION_NOT_FOUND: 'Administrator Session Not Found', @@ -2093,6 +2103,7 @@ function config($translateProvider) { BIND_PROPERTY: 'Bindungseigenschaften', EDIT: 'ändern', DELETE: 'löschen', + UNLOCK: 'Öffnen', SELECT: 'wählen', RESET: 'Zurücksetzen', SAVE: 'speichern', @@ -2529,9 +2540,11 @@ function config($translateProvider) { SUCCESS_ADD_BODY: 'Fügen Sie {{template}} erfolgreich hinzu', SUCCESS_UPDATE_BODY: 'Update {{template}} erfolgreich', SUCCESS_DELETE_BODY: '{{Template}} erfolgreich löschen', + SUCCESS_UNLOCK_BODY: 'Öffnen {{template}} erfolgreich', ERROR_ADD_BODY: 'Das Hinzufügen von {{template}} ist fehlgeschlagen', ERROR_UPDATE_BODY: 'Update {{template}} fehlgeschlagen', ERROR_DELETE_BODY: 'Fehler beim Löschen von {{template}}', + ERROR_UNLOCK_BODY: 'Öffnen {{template}} fehlgeschlagen', USER_PASSWORD: 'Benutzer-Passwort', BIND_METER_SUCCESS: 'Binden Sie das Messgerät erfolgreich', @@ -2558,6 +2571,8 @@ function config($translateProvider) { TEXT: 'Durch Löschen dieses Artikels werden auch alle zugehörigen Daten gelöscht!', CONFIRM_BUTTON_TEXT: 'Löschung bestätigen', CANCEL_BUTTON_TEXT: 'stornieren', + UNLOCK_TITLE: 'Bitte bestätigen, um zu entsperren', + UNLOCK_CONFIRM_BUTTON_TEXT: 'Aktivieren bestätigen', }, API: { ADMINISTRATOR_SESSION_NOT_FOUND: 'Administrator Session Not Found', diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index 78e1d487..79c54383 100644 --- a/admin/views/common/footer-login.html +++ b/admin/views/common/footer-login.html @@ -1,5 +1,5 @@
- {{'MY_EMS_NAME' | translate}} v1.4.0 https://myems.io + {{'MY_EMS_NAME' | translate}} v1.6.0 https://myems.io
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html index b620758c..1002d381 100644 --- a/admin/views/common/footer.html +++ b/admin/views/common/footer.html @@ -3,6 +3,6 @@ https://myems.io
- {{'MY_EMS_NAME' | translate}} v1.4.0 + {{'MY_EMS_NAME' | translate}} v1.6.0
diff --git a/admin/views/fdd/emailmessage.html b/admin/views/fdd/emailmessage.html index d1ce6262..a50da955 100644 --- a/admin/views/fdd/emailmessage.html +++ b/admin/views/fdd/emailmessage.html @@ -4,8 +4,10 @@
-