Merge branch 'develop'
guangyuzhang
commit
342c6b1be7
|
|
@ -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
|
||||
|
||||
|
|
|
|||
62
CHANGELOG.md
62
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
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可
|
|||
|
||||
| 功能 |社区版 | 说明 |
|
||||
| :--- | :----- | :----- |
|
||||
| 开源 | ✔️ | |
|
||||
| 开源 | ✔️ | MIT License |
|
||||
| 价格 | 免费 | |
|
||||
| 更换品牌名称与标志LOGO | ❌ | |
|
||||
| Modbus TCP 协议 | ✔️ | 采集数据 https://modbus.org/ |
|
||||
|
|
@ -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交流群
|
||||
|
||||
|
||||
12
README_DE.md
12
README_DE.md
|
|
@ -40,7 +40,7 @@ MyEMS wird von einem erfahrenen Entwicklungsteam entwickelt und gewartet, und de
|
|||
|
||||
| Eigenschaften | Gemeinschaftsausgabe | Erläuterung |
|
||||
| :--- | :----: | :----: |
|
||||
| Open Source | ✔️ | |
|
||||
| Open Source | ✔️ | MIT License |
|
||||
| Pricing | Free | |
|
||||
| Change Name and Logo | ️❌ | |
|
||||
| Modbus TCP | ✔️ | |
|
||||
|
|
@ -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
|
||||
|
||||
|
||||
12
README_EN.md
12
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
|
||||
|
||||
|
||||
|
|
@ -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/
|
||||
|
|
|
|||
|
|
@ -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/
|
||||
[1]. https://myems.io
|
||||
|
||||
[2]. https://dev.mysql.com/doc/connector-python/en/
|
||||
|
||||
[3]. https://nginx.org/
|
||||
|
|
@ -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'
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
});
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
});
|
||||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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,
|
|||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -1,42 +1,47 @@
|
|||
'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) {
|
||||
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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,
|
|||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 ($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
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('CostCenterTariffController', function ($scope, $translate,
|
||||
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",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('DataSourceController', function($scope,
|
||||
app.controller('DataSourceController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$uibModal,
|
||||
$translate,
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
@ -273,7 +287,6 @@ app.controller('ModalAddEnergyFlowDiagramLinkCtrl', function($scope, $uibModalIn
|
|||
$scope.energyflowdiagramnodes = params.energyflowdiagramnodes;
|
||||
$scope.mergedmeters = params.mergedmeters;
|
||||
$scope.ok = function() {
|
||||
|
||||
$uibModalInstance.close($scope.energyflowdiagramlink);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,19 @@
|
|||
'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) {
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,20 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('MeterPointController', function ($scope, $timeout, $translate,
|
||||
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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('ShopfloorMeterController', function($scope,$timeout, $translate,
|
||||
app.controller('ShopfloorMeterController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$timeout,
|
||||
$translate,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService,
|
||||
|
|
@ -8,7 +12,7 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate,
|
|||
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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceCombinedEquipmentController', function($scope, $translate,
|
||||
app.controller('SpaceCombinedEquipmentController', function($scope,
|
||||
$window,
|
||||
$translate,
|
||||
SpaceService,
|
||||
CombinedEquipmentService,
|
||||
SpaceCombinedEquipmentService,
|
||||
|
|
@ -9,7 +11,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate,
|
|||
$scope.currentSpaceID = 1;
|
||||
$scope.combinedequipments = [];
|
||||
$scope.spacecombinedequipments = [];
|
||||
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
|
|
@ -69,7 +71,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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,18 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceEquipmentController', function($scope, $translate, SpaceService, EquipmentService, SpaceEquipmentService, toaster,SweetAlert) {
|
||||
app.controller('SpaceEquipmentController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$translate,
|
||||
SpaceService,
|
||||
EquipmentService,
|
||||
SpaceEquipmentService,
|
||||
toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.equipments = [];
|
||||
$scope.spaceequipments = [];
|
||||
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
|
|
@ -65,7 +72,8 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer
|
|||
$scope.pairEquipment=function(dragEl,dropEl){
|
||||
var equipmentid=angular.element('#'+dragEl).scope().equipment.id;
|
||||
var spaceid=angular.element(spacetreewithequipment).jstree(true).get_top_selected();
|
||||
SpaceEquipmentService.addPair(spaceid,equipmentid, function (response) {
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
SpaceEquipmentService.addPair(spaceid,equipmentid, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
@ -91,8 +99,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",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,18 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceMeterController', function($scope ,$timeout, $translate, SpaceService, MeterService, VirtualMeterService, OfflineMeterService, SpaceMeterService, toaster,SweetAlert) {
|
||||
app.controller('SpaceMeterController', function(
|
||||
$scope ,
|
||||
$window,
|
||||
$timeout,
|
||||
$translate,
|
||||
SpaceService,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService, SpaceMeterService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.spacemeters = [];
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
|
|
@ -119,7 +128,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp
|
|||
$scope.pairMeter=function(dragEl,dropEl){
|
||||
var meterid=angular.element('#'+dragEl).scope().meter.id;
|
||||
var spaceid=angular.element(spacetreewithmeter).jstree(true).get_top_selected();
|
||||
SpaceMeterService.addPair(spaceid,meterid, $scope.currentMeterType, function (response) {
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
SpaceMeterService.addPair(spaceid,meterid, $scope.currentMeterType, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
@ -146,7 +156,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp
|
|||
var spacemeterid = angular.element('#' + dragEl).scope().spacemeter.id;
|
||||
var spaceid = angular.element(spacetreewithmeter).jstree(true).get_top_selected();
|
||||
var metertype = angular.element('#' + dragEl).scope().spacemeter.metertype;
|
||||
SpaceMeterService.deletePair(spaceid, spacemeterid, metertype, function (response) {
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
SpaceMeterService.deletePair(spaceid, spacemeterid, metertype, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,17 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceShopfloorController', function($scope, $translate, SpaceService, ShopfloorService, SpaceShopfloorService, toaster,SweetAlert) {
|
||||
app.controller('SpaceShopfloorController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$translate,
|
||||
SpaceService,
|
||||
ShopfloorService,
|
||||
SpaceShopfloorService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.shopfloors = [];
|
||||
$scope.spaceshopfloors = [];
|
||||
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
|
|
@ -65,7 +71,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer
|
|||
$scope.pairShopfloor=function(dragEl,dropEl){
|
||||
var shopfloorid=angular.element('#'+dragEl).scope().shopfloor.id;
|
||||
var spaceid=angular.element(spacetreewithshopfloor).jstree(true).get_top_selected();
|
||||
SpaceShopfloorService.addPair(spaceid,shopfloorid, function (response){
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
SpaceShopfloorService.addPair(spaceid,shopfloorid, headers, function (response){
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
@ -91,8 +98,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer
|
|||
}
|
||||
var spaceshopfloorid = angular.element('#' + dragEl).scope().spaceshopfloor.id;
|
||||
var spaceid = angular.element(spacetreewithshopfloor).jstree(true).get_top_selected();
|
||||
|
||||
SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, function (response) {
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,16 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceStoreController', function($scope, $translate, SpaceService, StoreService, SpaceStoreService, toaster,SweetAlert) {
|
||||
app.controller('SpaceStoreController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$translate,
|
||||
SpaceService,
|
||||
StoreService, SpaceStoreService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.stores = [];
|
||||
$scope.spacestores = [];
|
||||
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
|
|
@ -65,7 +70,8 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService
|
|||
$scope.pairStore=function(dragEl,dropEl){
|
||||
var storeid=angular.element('#'+dragEl).scope().store.id;
|
||||
var spaceid=angular.element(spacetreewithstore).jstree(true).get_top_selected();
|
||||
SpaceStoreService.addPair(spaceid,storeid, function (response){
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
SpaceStoreService.addPair(spaceid,storeid, headers, function (response){
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
@ -92,8 +98,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",
|
||||
|
|
|
|||
|
|
@ -1,11 +1,17 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceTenantController', function($scope, $translate, SpaceService, TenantService, SpaceTenantService, toaster,SweetAlert) {
|
||||
app.controller('SpaceTenantController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$translate,
|
||||
SpaceService,
|
||||
TenantService,
|
||||
SpaceTenantService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.tenants = [];
|
||||
$scope.spacetenants = [];
|
||||
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user"));
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
|
|
@ -65,7 +71,8 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic
|
|||
$scope.pairTenant=function(dragEl,dropEl){
|
||||
var tenantid=angular.element('#'+dragEl).scope().tenant.id;
|
||||
var spaceid=angular.element(spacetreewithtenant).jstree(true).get_top_selected();
|
||||
SpaceTenantService.addPair(spaceid,tenantid, function (response){
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
SpaceTenantService.addPair(spaceid,tenantid, headers, function (response){
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
|
|
@ -91,8 +98,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",
|
||||
|
|
|
|||
|
|
@ -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,7 +42,7 @@ app.controller('StoreController', function($scope,$translate,$uibModal, CostCent
|
|||
});
|
||||
};
|
||||
|
||||
$scope.getAllStoreTypes = function() {
|
||||
$scope.getAllStoreTypes = function() {
|
||||
StoreTypeService.getAllStoreTypes(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.storetypes = response.data;
|
||||
|
|
@ -40,7 +50,8 @@ $scope.getAllStoreTypes = function() {
|
|||
$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",
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('StoreMeterController', function($scope,$timeout, $translate,
|
||||
app.controller('StoreMeterController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$timeout,
|
||||
$translate,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService,
|
||||
|
|
@ -8,7 +12,7 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate,
|
|||
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) {
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
};
|
||||
});
|
||||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TenantMasterController', function($scope) {
|
||||
|
||||
|
||||
$scope.$on('handleEmitTenantChanged', function(event) {
|
||||
$scope.$broadcast('handleBroadcastTenantChanged');
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TenantMeterController', function($scope,$timeout, $translate,
|
||||
app.controller('TenantMeterController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$timeout,
|
||||
$translate,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService,
|
||||
|
|
@ -8,7 +12,7 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate,
|
|||
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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
@ -42,7 +50,8 @@ app.controller('TenantSensorController', function ($scope, $translate, TenantSer
|
|||
$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",
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
@ -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) {
|
||||
|
|
@ -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) {
|
||||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -1,84 +0,0 @@
|
|||
<div class="inmodal">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">{{operation | translate}}</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form role="form" name="form_equipmentparameter" novalidate class="form-horizontal">
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">{{'EQUIPMENT.PARAMETER_NAME' | translate}}</label>
|
||||
<div class="col-sm-8"><input ng-model="equipmentparameter.name" type="text" name="equipmentparametername" class="form-control" required="">
|
||||
<div class="m-t-xs" ng-show="form_equipmentparameter.equipmentparametername.$invalid && form_equipmentparameter.equipmentparametername.$dirty">
|
||||
<small class="text-danger" ng-show="form_equipmentparameter.equipmentparametername.$error.required">{{'EQUIPMENT.INPUT_PARAMETER_NAME' | translate}}</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hr-line-dashed"></div>
|
||||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label">{{'EQUIPMENT.PARAMETER_TYPE' | translate}}</label>
|
||||
<div class="col-sm-8">
|
||||
<select ng-disabled="is_disabled" name="equipment_parameter_type" ng-model="equipmentparameter.parameter_type" class="form-control m-b">
|
||||
<option value="constant">{{'EQUIPMENT.CONSTANT' | translate}}</option>
|
||||
<option value="point">{{'EQUIPMENT.POINT' | translate}}</option>
|
||||
<option value="fraction">{{'EQUIPMENT.FRACTION' | translate}}</option>
|
||||
</select>
|
||||
<div class="m-t-xs" ng-show="form_equipmentparameter.equipmentparameter.parameter_type.$invalid && form_equipmentparameter.equipmentparameter.parameter_type.$dirty">
|
||||
<small class="text-danger" ng-show="form_equipmentparameter.equipmentparameter.parameter_type.$error.required">{{'EQUIPMENT.SELECT_PARAMETER_TYPE' | translate}}</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hr-line-dashed" ng-show=" equipmentparameter.parameter_type=='constant' "></div>
|
||||
<div class="form-group" ng-show=" equipmentparameter.parameter_type=='constant' ">
|
||||
<label class="col-sm-4 control-label">{{'EQUIPMENT.CONSTANT' | translate}}</label>
|
||||
<div class="col-sm-8">
|
||||
<input ng-model="equipmentparameter.constant" type="text" name="equipmentparameterconstant" class="form-control" >
|
||||
<div class="m-t-xs" ng-show="form_equipmentparameter.equipmentparameterconstant.$invalid && form_equipmentparameter.equipmentparameterconstant.$dirty">
|
||||
<small class="text-danger" ng-show="form_equipmentparameter.equipmentparameterconstant.$error.required">{{'EQUIPMENT.INPUT_CONSTANT' | translate}}</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hr-line-dashed" ng-show=" equipmentparameter.parameter_type=='point' "></div>
|
||||
<div class="form-group" ng-show=" equipmentparameter.parameter_type=='point' " >
|
||||
<label class="col-sm-4 control-label">{{'EQUIPMENT.POINT' | translate}}</label>
|
||||
<div class="col-sm-8">
|
||||
<ui-select ng-model="equipmentparameter.point.id" name="equipmentparameter.point_id" theme="bootstrap">
|
||||
<ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
|
||||
<ui-select-choices repeat="point.id as point in points | filter: $select.search">
|
||||
<div ng-bind-html="point.name | highlight: $select.search"></div>
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
<div class="m-t-xs" ng-show="form_equipmentparameter.point_id.$invalid && form_equipmentparameter.point_id.$dirty">
|
||||
<small class="text-danger" ng-show="form_equipmentparameter.point_id.$error.required">{{'EQUIPMENT.SELECT_POINT' | translate}}</small>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hr-line-dashed" ng-show=" equipmentparameter.parameter_type=='fraction' "></div>
|
||||
<div class="form-group" ng-show=" equipmentparameter.parameter_type=='fraction' ">
|
||||
<label class="col-sm-4 control-label">{{'EQUIPMENT.PARAMETER_NUMERATOR_METER' | translate}}</label>
|
||||
<div class="col-sm-8">
|
||||
<ui-select ng-model="equipmentparameter.numerator_meter.uuid" name="equipmentparameter.numerator_meter_uuid" theme="bootstrap" required>
|
||||
<ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
|
||||
<ui-select-choices repeat="meter.uuid as meter in mergedmeters | filter: $select.search">
|
||||
<div ng-bind-html="meter.name | highlight: $select.search"></div>
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="hr-line-dashed" ng-show=" equipmentparameter.parameter_type=='fraction' "></div>
|
||||
<div class="form-group" ng-show=" equipmentparameter.parameter_type=='fraction' ">
|
||||
<label class="col-sm-4 control-label">{{'EQUIPMENT.PARAMETER_DENOMINATOR_METER' | translate}}</label>
|
||||
<div class="col-sm-8">
|
||||
<ui-select ng-model="equipmentparameter.denominator_meter.uuid" name="equipmentparameter.denominator_meter_uuid" theme="bootstrap" required>
|
||||
<ui-select-match allow-clear="false" placeholder="{{'COMMON.PLACEHOLDER' | translate}}">{{$select.selected.name}}</ui-select-match>
|
||||
<ui-select-choices repeat="meter.uuid as meter in mergedmeters | filter: $select.search">
|
||||
<div ng-bind-html="meter.name | highlight: $select.search"></div>
|
||||
</ui-select-choices>
|
||||
</ui-select>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-white" ng-click="cancel()">{{'SETTING.CANCEL' | translate}}</button>
|
||||
<button type="button" ng-disabled="form_meter.$invalid" class="btn btn-primary" ng-click="ok()">{{'SETTING.SAVE' | translate}}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue