13621160019@163.com
commit
ce3f5b4f93
|
|
@ -1,19 +0,0 @@
|
|||
'use strict';
|
||||
app.constant('$common',{
|
||||
toaster:{
|
||||
success_title:"TOASTER.SUCCESS_TITLE",
|
||||
success_add_body:"TOASTER.SUCCESS_ADD_BODY",
|
||||
success_update_body:"TOASTER.SUCCESS_UPDATE_BODY",
|
||||
success_delete_body:"TOASTER.SUCCESS_DELETE_BODY",
|
||||
error_title:"TOASTER.FAILURE_TITLE",
|
||||
error_add_body:"TOASTER.ERROR_ADD_BODY",
|
||||
error_update_body:"TOASTER.ERROR_UPDATE_BODY",
|
||||
error_delete_body:"TOASTER.ERROR_DELETE_BODY",
|
||||
},
|
||||
sweet:{
|
||||
title: "SWEET.TITLE",
|
||||
text: "SWEET.TEXT",
|
||||
confirmButtonText: "SWEET.CONFIRM_BUTTON_TEXT",
|
||||
cancelButtonText: "SWEET.CANCEL_BUTTON_TEXT",
|
||||
}
|
||||
});
|
||||
|
|
@ -1,12 +1,9 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EmailMessageController', function($scope, $timeout,$translate,
|
||||
$common,
|
||||
$interval,
|
||||
EmailMessageAnalysisService,
|
||||
toaster, SweetAlert) {
|
||||
|
||||
|
||||
$scope.$on('handleBroadcastEmailMessageOptionChanged', function (event, data) {
|
||||
if (angular.isDefined(data.load)) {
|
||||
$scope.tabledata = [];
|
||||
|
|
@ -23,59 +20,34 @@ app.controller('EmailMessageController', function($scope, $timeout,$translate,
|
|||
});
|
||||
|
||||
|
||||
|
||||
$scope.deleteEmailMessage = function(emailmessage) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
EmailMessageAnalysisService.deleteEmailMessage(emailmessage, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var templateName = "FDD.EMAIL_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
EmailMessageAnalysisService.deleteEmailMessage(emailmessage, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("FDD.EMAIL_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit('handleEmitEmailMessageTableChanged');
|
||||
} else {
|
||||
var templateName = "FDD.EMAIL_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("FDD.EMAIL_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ app.controller('EmailMessageOptionController', function($scope, $timeout,
|
|||
period:$scope.currentPeriod
|
||||
});
|
||||
|
||||
EmailMessageAnalysisService.getAnalysisResult(query, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.$emit('handleEmitEmailMessageOptionChanged', data);
|
||||
EmailMessageAnalysisService.getAnalysisResult(query, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.$emit('handleEmitEmailMessageOptionChanged', response.data);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('RuleController', function($scope, $common, $uibModal, $translate, RuleService, toaster, SweetAlert) {
|
||||
app.controller('RuleController', function($scope, $uibModal, $translate, RuleService, toaster, SweetAlert) {
|
||||
|
||||
$scope.initExpression = [{
|
||||
"sample_object_id": 1,
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('RuleController', function($scope, $common, $uibModal, $translate
|
|||
$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(error, data) {
|
||||
if (!error) {
|
||||
$scope.rules = data;
|
||||
RuleService.getAllRules(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.rules = response.data;
|
||||
} else {
|
||||
$scope.rules = [];
|
||||
}
|
||||
|
|
@ -40,42 +40,20 @@ app.controller('RuleController', function($scope, $common, $uibModal, $translate
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(rule) {
|
||||
RuleService.addRule(rule, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "FDD.RULE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
RuleService.addRule(rule, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("FDD.RULE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllRules();
|
||||
} else {
|
||||
var templateName = "FDD.RULE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY",{template: $translate.instant("FDD.RULE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -101,43 +79,20 @@ app.controller('RuleController', function($scope, $common, $uibModal, $translate
|
|||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedRule) {
|
||||
RuleService.editRule(modifiedRule, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "FDD.RULE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
RuleService.editRule(modifiedRule, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY",{template: $translate.instant("FDD.RULE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllRules();
|
||||
} else {
|
||||
var templateName = "FDD.RULE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("FDD.RULE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
|
@ -150,71 +105,39 @@ app.controller('RuleController', function($scope, $common, $uibModal, $translate
|
|||
|
||||
$scope.deleteRule = function(rule) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
RuleService.deleteRule(rule, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "FDD.RULE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
RuleService.deleteRule(rule, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant(popBody, {template: $translate.instant("FDD.RULE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllRules();
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "FDD.RULE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("FDD.RULE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TextMessageController', function($scope, $common,$timeout,$translate,
|
||||
$interval,TextMessageAnalysisService,SweetAlert,toaster) {
|
||||
app.controller('TextMessageController', function($scope,$timeout,$translate,
|
||||
TextMessageAnalysisService,SweetAlert,toaster) {
|
||||
|
||||
$scope.$on('handleBroadcastTextMessageOptionChanged', function (event, data) {
|
||||
if (angular.isDefined(data.load)) {
|
||||
|
|
@ -20,55 +20,33 @@ app.controller('TextMessageController', function($scope, $common,$timeout,$trans
|
|||
|
||||
$scope.deleteTextMessage = function(textmessage) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
TextMessageAnalysisService.deleteTextMessage(textmessage, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "FDD.TEXT_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
TextMessageAnalysisService.deleteTextMessage(textmessage, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("FDD.TEXT_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit('handleEmitTextMessageTableChanged');
|
||||
} else {
|
||||
var templateName = "FDD.TEXT_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("FDD.TEXT_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ app.controller('TextMessageOptionController', function($scope, $timeout,
|
|||
period:$scope.currentPeriod
|
||||
});
|
||||
|
||||
TextMessageAnalysisService.getAnalysisResult(query, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.$emit('handleEmitTextMessageOptionChanged', data);
|
||||
TextMessageAnalysisService.getAnalysisResult(query, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.$emit('handleEmitTextMessageOptionChanged', response.data);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('WebMessageController', function($scope, $timeout, $translate, $common, $interval, $uibModal, WebMessageAnalysisService, toaster, SweetAlert) {
|
||||
app.controller('WebMessageController', function($scope, $timeout, $translate, $uibModal, WebMessageAnalysisService, toaster, SweetAlert) {
|
||||
$scope.$on('handleBroadcastWebMessageOptionChanged', function (event, data) {
|
||||
if (angular.isDefined(data.load)) {
|
||||
$scope.tabledata = [];
|
||||
|
|
@ -32,44 +32,20 @@ app.controller('WebMessageController', function($scope, $timeout, $translate, $c
|
|||
|
||||
modalInstance.result.then(function(modifiedWebmessage) {
|
||||
modifiedWebmessage.status = "acknowledged";
|
||||
WebMessageAnalysisService.editWebMessage(modifiedWebmessage, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "FDD.WEB_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
WebMessageAnalysisService.editWebMessage(modifiedWebmessage, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("FDD.WEB_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.$emit('handleEmitWebMessageTableChanged');
|
||||
} else {
|
||||
var templateName = "FDD.WEB_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("FDD.WEB_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
|
@ -82,56 +58,32 @@ app.controller('WebMessageController', function($scope, $timeout, $translate, $c
|
|||
|
||||
$scope.deleteWebMessage = function(webmessage) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
WebMessageAnalysisService.deleteWebMessage(webmessage, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "FDD.WEB_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
WebMessageAnalysisService.deleteWebMessage(webmessage, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("FDD.WEB_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.$emit('handleEmitWebMessageTableChanged');
|
||||
} else {
|
||||
var templateName = "FDD.WEB_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("FDD.WEB_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,9 @@ app.controller('WebMessageOptionController', function($scope, $timeout,
|
|||
load: true,
|
||||
period:$scope.currentPeriod
|
||||
});
|
||||
WebMessageAnalysisService.getAnalysisResult(query, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.$emit('handleEmitWebMessageOptionChanged', data);
|
||||
WebMessageAnalysisService.getAnalysisResult(query, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.$emit('handleEmitWebMessageOptionChanged', response.data);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('WechatMessageController', function($scope, $timeout,$translate,
|
||||
$common,
|
||||
$interval,
|
||||
WechatMessageAnalysisService,
|
||||
toaster, SweetAlert) {
|
||||
app.controller('WechatMessageController', function($scope, $timeout,$translate, WechatMessageAnalysisService, toaster, SweetAlert) {
|
||||
|
||||
$scope.$on('handleBroadcastWechatMessageOptionChanged', function (event, data) {
|
||||
if (angular.isDefined(data.load)) {
|
||||
|
|
@ -23,58 +19,36 @@ app.controller('WechatMessageController', function($scope, $timeout,$translate,
|
|||
|
||||
$scope.deleteWechatMessage = function(wechatmessage) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
WechatMessageAnalysisService.deleteWechatMessage(wechatmessage, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "FDD.WECHAT_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
WechatMessageAnalysisService.deleteWechatMessage(wechatmessage, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("FDD.WECHAT_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit('handleEmitWechatMessageTableChanged');
|
||||
} else {
|
||||
var templateName = "FDD.WECHAT_MESSAGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("FDD.WECHAT_MESSAGE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -36,10 +36,10 @@ app.controller('WechatMessageOptionController', function($scope, $timeout,
|
|||
load: true,
|
||||
period:$scope.currentPeriod
|
||||
});
|
||||
WechatMessageAnalysisService.getAnalysisResult(query, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.$emit('handleEmitWechatMessageOptionChanged', data);
|
||||
}
|
||||
WechatMessageAnalysisService.getAnalysisResult(query, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.$emit('handleEmitWechatMessageOptionChanged', response.data);
|
||||
}
|
||||
});
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('LoginController', function ($rootScope,
|
||||
app.controller('LoginController', function (
|
||||
$translate,
|
||||
$timeout,
|
||||
$location,
|
||||
$window,
|
||||
$common,
|
||||
$uibModal,
|
||||
$scope,
|
||||
$interval,
|
||||
|
|
@ -22,59 +21,32 @@ app.controller('LoginController', function ($rootScope,
|
|||
// login section start
|
||||
$scope.login = function (user) {
|
||||
$scope.dataLoading = true;
|
||||
LoginService.login(user, function (response, error, status, headers) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.LOGIN_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
LoginService.login(user, function (response) {
|
||||
console.log(response);
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
// toaster type options: 'error','info','wait','success','warning'
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant('TOASTER.LOGIN_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$window.localStorage.setItem("currentUser", JSON.stringify(response));
|
||||
// $rootScope.cookie=$cookies.get('user_uuid');
|
||||
$window.localStorage.setItem("currentUser", JSON.stringify(response.data));
|
||||
|
||||
$location.path('/settings/space');
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
|
||||
} else if (angular.isDefined(status) && status == 400 || status == 404) {
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400 || response.status === 404) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
} else {
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = 'TOASTER.LOGIN_FAILURE';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant('TOASTER.LOGIN_FAILURE'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -85,38 +57,21 @@ app.controller('LoginController', function ($rootScope,
|
|||
$scope.logout = function () {
|
||||
let data = null;
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
LoginService.logout(data, headers, function (error, status, headers) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.LOGIN_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
LoginService.logout(data, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant('TOASTER.LOGIN_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$window.localStorage.removeItem("currentUser");
|
||||
$location.path('/login');
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$window.localStorage.removeItem("currentUser");
|
||||
|
|
@ -153,60 +108,28 @@ app.controller('LoginController', function ($rootScope,
|
|||
modalInstance.result.then(function (user) {
|
||||
let data = {
|
||||
old_password: user.old_password,
|
||||
new_password: user.new_password };
|
||||
new_password: user.new_password
|
||||
};
|
||||
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
|
||||
UserService.changePassword(data, headers, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "TOASTER.USER_PASSWORD";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
UserService.changePassword(data, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("TOASTER.USER_PASSWORD") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit('handleEmitLineChanged');
|
||||
} else {
|
||||
var templateName = "TOASTER.USER_PASSWORD";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitleOne = error.title;
|
||||
var popTitleTwo = $common.toaster.error_title;
|
||||
var popBodyOne = error.description;
|
||||
var popBodyTwo = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitleOne = $translate.instant(popTitleOne);
|
||||
popTitleTwo = $translate.instant(popTitleTwo);
|
||||
popBodyOne = $translate.instant(popBodyOne, { template: templateName });
|
||||
popBodyTwo = $translate.instant(popBodyTwo, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitleOne || popTitleTwo,
|
||||
body: popBodyOne || popBodyTwo,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title) || $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant( response.data.description, { template: $translate.instant("TOASTER.USER_PASSWORD") }) || $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("TOASTER.USER_PASSWORD") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
// toaster.pop({
|
||||
// type: 'error',
|
||||
// title: error.title || $common.toaster.error_title,
|
||||
// body: error.description || $common.toaster.error_update_body.format('user password'),
|
||||
// showCloseButton: true,
|
||||
// });
|
||||
}
|
||||
});
|
||||
}, function () {
|
||||
|
|
@ -288,9 +211,9 @@ app.controller('LoginController', function ($rootScope,
|
|||
// web message alarm section start
|
||||
$scope.webmessages = [];
|
||||
$scope.getWebMessage = function () {
|
||||
WebMessageAnalysisService.getStatusNewResult(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.webmessages = data;
|
||||
WebMessageAnalysisService.getStatusNewResult(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.webmessages = response.data;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EnergyCategoryController', function($scope,$common, $translate,$uibModal, CategoryService,toaster,SweetAlert) {
|
||||
|
||||
app.controller('EnergyCategoryController', function($scope, $translate,$uibModal, CategoryService,toaster,SweetAlert) {
|
||||
|
||||
$scope.getAllCategories = function() {
|
||||
CategoryService.getAllCategories(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.categories = data;
|
||||
CategoryService.getAllCategories(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.categories = response.data;
|
||||
} else {
|
||||
$scope.categories = [];
|
||||
}
|
||||
|
|
@ -28,45 +27,22 @@ app.controller('EnergyCategoryController', function($scope,$common, $translate,$
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(category) {
|
||||
CategoryService.addCategory(category, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "SETTING.CATEGORY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
CategoryService.addCategory(category, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY",{template: $translate.instant("SETTING.CATEGORY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllCategories();
|
||||
$scope.$emit('handleEmitEnergyCategoryChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.CATEGORY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.CATEGORY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -92,48 +68,26 @@ app.controller('EnergyCategoryController', function($scope,$common, $translate,$
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedCategory) {
|
||||
CategoryService.editCategory(modifiedCategory,function(error,status){
|
||||
if(angular.isDefined(status) && status==200){
|
||||
var templateName = "SETTING.CATEGORY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
CategoryService.editCategory(modifiedCategory, function (response) {
|
||||
if(angular.isDefined(response.status) && response.status === 200){
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.CATEGORY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllCategories();
|
||||
$scope.getAllCategories();
|
||||
$scope.$emit('handleEmitEnergyCategoryChanged');
|
||||
}else{
|
||||
var templateName = "SETTING.CATEGORY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
}else{
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.CATEGORY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
}, function () {
|
||||
//do nothing;
|
||||
});
|
||||
|
|
@ -141,60 +95,38 @@ app.controller('EnergyCategoryController', function($scope,$common, $translate,$
|
|||
|
||||
$scope.deleteCategory=function(category){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
CategoryService.deleteCategory(category, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.CATEGORY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCategories();
|
||||
$scope.$emit('handleEmitEnergyCategoryChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.CATEGORY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
CategoryService.deleteCategory(category, 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("SETTING.CATEGORY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCategories();
|
||||
$scope.$emit('handleEmitEnergyCategoryChanged');
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.CATEGORY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getAllCategories();
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EnergyItemController', function($scope,$common, $translate,$uibModal, CategoryService, EnergyItemService, toaster,SweetAlert) {
|
||||
|
||||
|
||||
app.controller('EnergyItemController', function($scope, $translate,$uibModal, CategoryService, EnergyItemService, toaster,SweetAlert) {
|
||||
$scope.getAllCategories = function() {
|
||||
CategoryService.getAllCategories(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.categories = data;
|
||||
CategoryService.getAllCategories(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.categories = response.data;
|
||||
} else {
|
||||
$scope.categories = [];
|
||||
}
|
||||
|
|
@ -15,9 +13,9 @@ app.controller('EnergyItemController', function($scope,$common, $translate,$uibM
|
|||
};
|
||||
|
||||
$scope.getAllEnergyItems = function() {
|
||||
EnergyItemService.getAllEnergyItems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyItems = data;
|
||||
EnergyItemService.getAllEnergyItems(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyItems = response.data;
|
||||
} else {
|
||||
$scope.energyItems = [];
|
||||
}
|
||||
|
|
@ -40,44 +38,20 @@ app.controller('EnergyItemController', function($scope,$common, $translate,$uibM
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(energyItem) {
|
||||
EnergyItemService.addEnergyItem(energyItem, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "SETTING.ENERGY_ITEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EnergyItemService.addEnergyItem(energyItem, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.ENERGY_ITEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllEnergyItems();
|
||||
} else {
|
||||
var templateName = "SETTING.ENERGY_ITEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.ENERGY_ITEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -104,44 +78,22 @@ app.controller('EnergyItemController', function($scope,$common, $translate,$uibM
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedEnergyItem) {
|
||||
EnergyItemService.editEnergyItem(modifiedEnergyItem,function(error,status){
|
||||
if(angular.isDefined(status) && status==200){
|
||||
var templateName = "SETTING.ENERGY_ITEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
EnergyItemService.editEnergyItem(modifiedEnergyItem, 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("SETTING.ENERGY_ITEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEnergyItems();
|
||||
}else{
|
||||
var templateName = "SETTING.ENERGY_ITEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.ENERGY_ITEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}, function () {
|
||||
|
|
@ -151,55 +103,33 @@ app.controller('EnergyItemController', function($scope,$common, $translate,$uibM
|
|||
|
||||
$scope.deleteEnergyItem=function(energyItem){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
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) {
|
||||
EnergyItemService.deleteEnergyItem(energyItem, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.ENERGY_ITEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEnergyItems();
|
||||
} else {
|
||||
var templateName = "SETTING.ENERGY_ITEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
EnergyItemService.deleteEnergyItem(energyItem, 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("SETTING.ENERGY_ITEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEnergyItems();
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.ENERGY_ITEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -216,13 +146,12 @@ app.controller('EnergyItemController', function($scope,$common, $translate,$uibM
|
|||
|
||||
app.controller('ModalAddEnergyItemCtrl', function ($scope, $uibModalInstance,params) {
|
||||
|
||||
$scope.operation="SETTING.ADD_ENERGY_ITEM";
|
||||
$scope.operation="SETTING.ADD_ENERGY_ITEM";
|
||||
$scope.energyItems=params.energyItems;
|
||||
$scope.categories=params.categories;
|
||||
$scope.categories=params.categories;
|
||||
$scope.ok = function () {
|
||||
$uibModalInstance.close($scope.energyItem);
|
||||
};
|
||||
|
||||
$scope.cancel = function () {
|
||||
$uibModalInstance.dismiss('cancel');
|
||||
};
|
||||
|
|
@ -232,11 +161,11 @@ app.controller('ModalEditEnergyItemCtrl', function ($scope, $uibModalInstance, p
|
|||
$scope.operation="SETTING.EDIT_ENERGY_ITEM";
|
||||
$scope.energyItem = params.energyItem;
|
||||
$scope.energyItems=params.energyItems;
|
||||
$scope.categories=params.categories;
|
||||
$scope.categories=params.categories;
|
||||
if($scope.energyItem.energy_category!=null){
|
||||
$scope.energyItem.energy_category_id=$scope.energyItem.energy_category.id ;
|
||||
$scope.energyItem.energy_category_id=$scope.energyItem.energy_category.id ;
|
||||
}else{
|
||||
$scope.energyItem.energy_category_id=undefined;
|
||||
$scope.energyItem.energy_category_id=undefined;
|
||||
}
|
||||
|
||||
$scope.ok = function () {
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('CombinedEquipmentController', function ($scope, $common, $translate, $uibModal, CombinedEquipmentService, CostCenterService, toaster, SweetAlert) {
|
||||
app.controller('CombinedEquipmentController', function ($scope, $translate, $uibModal, CombinedEquipmentService, CostCenterService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllCombinedEquipments = function () {
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.combinedequipments = data;
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.combinedequipments = response.data;
|
||||
} else {
|
||||
$scope.combinedequipments = [];
|
||||
}
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('CombinedEquipmentController', function ($scope, $common, $transl
|
|||
};
|
||||
|
||||
$scope.getAllCostCenters = function () {
|
||||
CostCenterService.getAllCostCenters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -36,43 +36,21 @@ app.controller('CombinedEquipmentController', function ($scope, $common, $transl
|
|||
});
|
||||
modalInstance.result.then(function (combinedequipment) {
|
||||
combinedequipment.cost_center_id = combinedequipment.cost_center.id;
|
||||
CombinedEquipmentService.addCombinedEquipment(combinedequipment, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "COMMON.COMBINED_EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
CombinedEquipmentService.addCombinedEquipment(combinedequipment, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", { template: $translate.instant("COMMON.COMBINED_EQUIPMENT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCombinedEquipments();
|
||||
$scope.$emit('handleEmitCombinedEquipmentChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.COMBINED_EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", { template: $translate.instant("COMMON.COMBINED_EQUIPMENT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -99,43 +77,21 @@ app.controller('CombinedEquipmentController', function ($scope, $common, $transl
|
|||
|
||||
modalInstance.result.then(function (modifiedCombinedEquipment) {
|
||||
modifiedCombinedEquipment.cost_center_id = modifiedCombinedEquipment.cost_center.id;
|
||||
CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.COMBINED_EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("COMMON.COMBINED_EQUIPMENT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCombinedEquipments();
|
||||
$scope.$emit('handleEmitCombinedEquipmentChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.COMBINED_EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("COMMON.COMBINED_EQUIPMENT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -147,55 +103,33 @@ app.controller('CombinedEquipmentController', function ($scope, $common, $transl
|
|||
|
||||
$scope.deleteCombinedEquipment = function (combinedequipment) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.COMBINED_EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", { template: $translate.instant("COMMON.COMBINED_EQUIPMENT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCombinedEquipments();
|
||||
$scope.$emit('handleEmitCombinedEquipmentChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.COMBINED_EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", { template: $translate.instant("COMMON.COMBINED_EQUIPMENT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('CombinedEquipmentEquipmentController', function ($scope, $common, $uibModal, $timeout, $translate, CombinedEquipmentService, EquipmentService, CombinedEquipmentEquipmentService, toaster, SweetAlert) {
|
||||
app.controller('CombinedEquipmentEquipmentController', function ($scope, $translate, CombinedEquipmentService, EquipmentService, CombinedEquipmentEquipmentService, toaster, SweetAlert) {
|
||||
$scope.currentCombinedEquipment = {selected:undefined};
|
||||
|
||||
$scope.getAllEquipments = function () {
|
||||
EquipmentService.getAllEquipments(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.equipments = data;
|
||||
EquipmentService.getAllEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.equipments = response.data;
|
||||
} else {
|
||||
$scope.equipments = [];
|
||||
}
|
||||
|
|
@ -14,9 +14,9 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $common
|
|||
};
|
||||
|
||||
$scope.getEquipmentsByCombinedEquipmentID = function (id) {
|
||||
CombinedEquipmentEquipmentService.getEquipmentsByCombinedEquipmentID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.combinedequipmentequipments = data;
|
||||
CombinedEquipmentEquipmentService.getEquipmentsByCombinedEquipmentID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.combinedequipmentequipments = response.data;
|
||||
} else {
|
||||
$scope.combinedequipmentequipments = [];
|
||||
}
|
||||
|
|
@ -30,9 +30,9 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $common
|
|||
};
|
||||
|
||||
$scope.getAllCombinedEquipments = function () {
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.combinedequipments = data;
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.combinedequipments = response.data;
|
||||
} else {
|
||||
$scope.combinedequipments = [];
|
||||
}
|
||||
|
|
@ -42,38 +42,21 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $common
|
|||
$scope.pairEquipment = function (dragEl, dropEl) {
|
||||
var equipmentid = angular.element('#' + dragEl).scope().equipment.id;
|
||||
var combinedequipmentid = $scope.currentCombinedEquipment.id;
|
||||
CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_EQUIPMENT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant('TOASTER.BIND_EQUIPMENT_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getEquipmentsByCombinedEquipmentID($scope.currentCombinedEquipment.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -86,38 +69,21 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $common
|
|||
}
|
||||
var combinedequipmentequipmentid = angular.element('#' + dragEl).scope().combinedequipmentequipment.id;
|
||||
var combinedequipmentid = $scope.currentCombinedEquipment.id;
|
||||
CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_EQUIPMENT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant('TOASTER.UNBIND_EQUIPMENT_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getEquipmentsByCombinedEquipmentID($scope.currentCombinedEquipment.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('CombinedEquipmentMeterController', function ($scope, $common, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentMeterService, CombinedEquipmentService, toaster, SweetAlert) {
|
||||
app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentMeterService, CombinedEquipmentService, toaster, SweetAlert) {
|
||||
$scope.currentCombinedEquipment = { selected: undefined };
|
||||
|
||||
$scope.getAllCombinedEquipments = function (id) {
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.combinedequipments = data;
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.combinedequipments = response.data;
|
||||
} else {
|
||||
$scope.combinedequipments = [];
|
||||
}
|
||||
|
|
@ -23,12 +23,12 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $common, $t
|
|||
var metertypes = ['meters', 'virtualmeters', 'offlinemeters'];
|
||||
$scope.combinedequipmentmeters = [];
|
||||
angular.forEach(metertypes, function (value, index) {
|
||||
CombinedEquipmentMeterService.getMetersByCombinedEquipmentID(id, value, function (error, data) {
|
||||
if (!error) {
|
||||
angular.forEach(data, function (item, indx) {
|
||||
CombinedEquipmentMeterService.getMetersByCombinedEquipmentID(id, value, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
angular.forEach(response.data, function (item, indx) {
|
||||
data[indx].metertype = value;
|
||||
});
|
||||
$scope.combinedequipmentmeters = $scope.combinedequipmentmeters.concat(data);
|
||||
$scope.combinedequipmentmeters = $scope.combinedequipmentmeters.concat(response.data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -60,9 +60,9 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $common, $t
|
|||
|
||||
|
||||
$scope.getAllMeters = function () {
|
||||
MeterService.getAllMeters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.currentMeterType = "meters";
|
||||
$timeout(function () {
|
||||
$scope.changeMeterType();
|
||||
|
|
@ -76,9 +76,9 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $common, $t
|
|||
|
||||
|
||||
$scope.getAllOfflineMeters = function () {
|
||||
OfflineMeterService.getAllOfflineMeters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
|
|
@ -87,9 +87,9 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $common, $t
|
|||
};
|
||||
|
||||
$scope.getAllVirtualMeters = function () {
|
||||
VirtualMeterService.getAllVirtualMeters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
|
|
@ -112,39 +112,21 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $common, $t
|
|||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
CombinedEquipmentMeterService.addPair(combinedequipmentid, meterid, $scope.currentMeterType, is_output, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByCombinedEquipmentID($scope.currentCombinedEquipment.id);
|
||||
} else {
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -160,38 +142,21 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $common, $t
|
|||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
CombinedEquipmentMeterService.deletePair(combinedequipmentid, combinedequipmentmeterid, metertype, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByCombinedEquipmentID($scope.currentCombinedEquipment.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('CombinedEquipmentParameterController', function ($scope, $common, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentParameterService, CombinedEquipmentService, PointService, toaster, SweetAlert) {
|
||||
app.controller('CombinedEquipmentParameterController', function ($scope, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentParameterService, CombinedEquipmentService, PointService, toaster, SweetAlert) {
|
||||
$scope.currentCombinedEquipment = { selected: undefined };
|
||||
$scope.is_show_add_parameter = false;
|
||||
$scope.combinedequipments = [];
|
||||
|
|
@ -10,9 +10,9 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
$scope.mergedMeters = [];
|
||||
|
||||
$scope.getAllCombinedEquipments = function () {
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.combinedequipments = data;
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.combinedequipments = response.data;
|
||||
} else {
|
||||
$scope.combinedequipments = [];
|
||||
}
|
||||
|
|
@ -28,9 +28,9 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
|
||||
$scope.getParametersByCombinedEquipmentID = function (id) {
|
||||
$scope.combinedequipmentparameters = [];
|
||||
CombinedEquipmentParameterService.getParametersByCombinedEquipmentID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.combinedequipmentparameters = data;
|
||||
CombinedEquipmentParameterService.getParametersByCombinedEquipmentID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.combinedequipmentparameters = response.data;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
@ -62,42 +62,20 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
combinedequipmentparameter.denominator_meter_uuid = combinedequipmentparameter.denominator_meter.uuid;
|
||||
}
|
||||
|
||||
CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "COMBINED_EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", { template: $translate.instant("COMBINED_EQUIPMENT.PARAMETER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getParametersByCombinedEquipmentID($scope.currentCombinedEquipment.id);
|
||||
} else {
|
||||
var templateName = "COMBINED_EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", { template: $translate.instant("COMBINED_EQUIPMENT.PARAMETER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -133,42 +111,20 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
if (modifiedCombinedEquipmentParameter.denominator_meter != null) {
|
||||
modifiedCombinedEquipmentParameter.denominator_meter_uuid = modifiedCombinedEquipmentParameter.denominator_meter.uuid;
|
||||
}
|
||||
CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMBINED_EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("COMBINED_EQUIPMENT.PARAMETER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getParametersByCombinedEquipmentID($scope.currentCombinedEquipment.id);
|
||||
} else {
|
||||
var templateName = "COMBINED_EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("COMBINED_EQUIPMENT.PARAMETER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -180,69 +136,39 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
|
||||
$scope.deleteCombinedEquipmentParameter = function (combinedequipmentparameter) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMBINED_EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", { template: $translate.instant("COMBINED_EQUIPMENT.PARAMETER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getParametersByCombinedEquipmentID($scope.currentCombinedEquipment.id);
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "COMBINED_EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant(popBody, { template: $translate.instant("COMBINED_EQUIPMENT.PARAMETER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -293,25 +219,21 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
$scope.meters = [];
|
||||
$scope.offlinemeters = [];
|
||||
$scope.virtualmeters = [];
|
||||
MeterService.getAllMeters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
for (var i = 0; i < $scope.meters.length; i++) {
|
||||
var mergedmeter = { "uuid": $scope.meters[i].uuid, "name": "meter/" + $scope.meters[i].name };
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
// $scope.currentMeterType="meters";
|
||||
// $timeout(function(){
|
||||
// $scope.changeMeterType();
|
||||
// },1000);
|
||||
} else {
|
||||
$scope.meters = [];
|
||||
}
|
||||
});
|
||||
|
||||
OfflineMeterService.getAllOfflineMeters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
for (var i = 0; i < $scope.offlinemeters.length; i++) {
|
||||
var mergedmeter = { "uuid": $scope.offlinemeters[i].uuid, "name": "offlinemeter/" + $scope.offlinemeters[i].name };
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
|
|
@ -321,9 +243,9 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
}
|
||||
});
|
||||
|
||||
VirtualMeterService.getAllVirtualMeters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
for (var i = 0; i < $scope.virtualmeters.length; i++) {
|
||||
var mergedmeter = { "uuid": $scope.virtualmeters[i].uuid, "name": "virtualmeter/" + $scope.virtualmeters[i].name };
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
|
|
@ -337,14 +259,9 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $common
|
|||
};
|
||||
|
||||
$scope.getAllPoints = function () {
|
||||
PointService.getAllPoints(function (error, data) {
|
||||
if (!error) {
|
||||
// if (data.length > 0) {
|
||||
// for (var i = 0; i < data.length; i++) {
|
||||
// data[i].name = data[i].data_source.name + "/" + data[i].name ;
|
||||
// }
|
||||
// }
|
||||
$scope.points = data;
|
||||
PointService.getAllPoints(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('ContactController', function($scope,$common, $translate,$uibModal, ContactService,toaster,SweetAlert) {
|
||||
app.controller('ContactController', function($scope, $translate,$uibModal, ContactService,toaster,SweetAlert) {
|
||||
|
||||
|
||||
$scope.getAllContacts = function() {
|
||||
ContactService.getAllContacts(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.contacts = data;
|
||||
ContactService.getAllContacts(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.contacts = response.data;
|
||||
} else {
|
||||
$scope.contacts = [];
|
||||
}
|
||||
|
|
@ -28,45 +28,20 @@ app.controller('ContactController', function($scope,$common, $translate,$uibModa
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(contact) {
|
||||
ContactService.addContact(contact, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "SETTING.CONTACT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
ContactService.addContact(contact, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.CONTACT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.getAllContacts();
|
||||
} else {
|
||||
var templateName = "SETTING.CONTACT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.CONTACT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -92,44 +67,20 @@ app.controller('ContactController', function($scope,$common, $translate,$uibModa
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedContact) {
|
||||
ContactService.editContact(modifiedContact,function(error,status){
|
||||
if(angular.isDefined(status) && status==200){
|
||||
var templateName = "SETTING.CONTACT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
ContactService.editContact(modifiedContact, function (response) {
|
||||
if(angular.isDefined(response.status) && response.status === 200200){
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.CONTACT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.getAllContacts();
|
||||
}else{
|
||||
var templateName = "SETTING.CONTACT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.CONTACT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -141,53 +92,31 @@ app.controller('ContactController', function($scope,$common, $translate,$uibModa
|
|||
|
||||
$scope.deleteContact=function(contact){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
ContactService.deleteContact(contact, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.CONTACT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
ContactService.deleteContact(contact, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.CONTACT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllContacts();
|
||||
} else {
|
||||
var templateName = "SETTING.CONTACT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.CONTACT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('CostCenterController', function($scope,$common, $translate,$uibModal, CostCenterService,toaster,SweetAlert) {
|
||||
app.controller('CostCenterController', function($scope, $translate,$uibModal, CostCenterService,toaster,SweetAlert) {
|
||||
|
||||
$scope.getAllCostCenters = function() {
|
||||
CostCenterService.getAllCostCenters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -19,44 +19,22 @@ app.controller('CostCenterController', function($scope,$common, $translate,$uibM
|
|||
windowClass: "animated fadeIn",
|
||||
});
|
||||
modalInstance.result.then(function(costcenter) {
|
||||
CostCenterService.addCostCenter(costcenter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "SETTING.COSTCENTER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
CostCenterService.addCostCenter(costcenter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.COSTCENTER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllCostCenters();
|
||||
$scope.$emit('handleEmitCostCenterChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.COSTCENTER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'SETTING.COSTCENTER';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.COSTCENTER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -82,46 +60,24 @@ app.controller('CostCenterController', function($scope,$common, $translate,$uibM
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedCostCenter) {
|
||||
CostCenterService.editCostCenter(modifiedCostCenter,function(error,status){
|
||||
if(angular.isDefined(status) && status==200){
|
||||
var templateName = "SETTING.COSTCENTER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCostCenters();
|
||||
$scope.$emit('handleEmitCostCenterChanged');
|
||||
CostCenterService.editCostCenter(modifiedCostCenter, 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("SETTING.COSTCENTER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCostCenters();
|
||||
$scope.$emit('handleEmitCostCenterChanged');
|
||||
}else{
|
||||
var templateName = "SETTING.COSTCENTER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'SETTING.COSTCENTER';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.COSTCENTER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}, function () {
|
||||
//do nothing;
|
||||
|
|
@ -130,70 +86,39 @@ app.controller('CostCenterController', function($scope,$common, $translate,$uibM
|
|||
|
||||
$scope.deleteCostCenter=function(costcenter){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
CostCenterService.deleteCostCenter(costcenter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.COSTCENTER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
CostCenterService.deleteCostCenter(costcenter, 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("SETTING.COSTCENTER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCostCenters();
|
||||
$scope.$emit('handleEmitCostCenterChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'SETTING.COSTCENTER';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
$scope.$emit('handleEmitCostCenterChanged');
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "SETTING.COSTCENTER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'SETTING.COSTCENTER';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.COSTCENTER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('CostCenterTariffController', function ($scope, $translate,$common, $uibModal, $timeout,
|
||||
app.controller('CostCenterTariffController', function ($scope, $translate,
|
||||
CostCenterService,
|
||||
TariffService,
|
||||
CostCenterTariffService,
|
||||
toaster, SweetAlert) {
|
||||
toaster) {
|
||||
|
||||
$scope.getAllCostCenters = function () {
|
||||
CostCenterService.getAllCostCenters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
if ($scope.costcenters.length > 0) {
|
||||
$scope.currentCostCenter = $scope.costcenters[0];
|
||||
$scope.getTariffsByCostCenterID($scope.currentCostCenter.id);
|
||||
|
|
@ -22,9 +22,9 @@ app.controller('CostCenterTariffController', function ($scope, $translate,$comm
|
|||
};
|
||||
|
||||
$scope.getTariffsByCostCenterID = function (id) {
|
||||
CostCenterTariffService.getTariffsByCostCenterID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.costcentertariffs = data;
|
||||
CostCenterTariffService.getTariffsByCostCenterID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcentertariffs = response.data;
|
||||
} else {
|
||||
$scope.costcentertariffs = [];
|
||||
}
|
||||
|
|
@ -38,9 +38,9 @@ app.controller('CostCenterTariffController', function ($scope, $translate,$comm
|
|||
|
||||
|
||||
$scope.getAllTariffs = function () {
|
||||
TariffService.getAllTariffs(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.tariffs = data;
|
||||
TariffService.getAllTariffs(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tariffs = response.data;
|
||||
} else {
|
||||
$scope.tariffs = [];
|
||||
}
|
||||
|
|
@ -51,41 +51,20 @@ app.controller('CostCenterTariffController', function ($scope, $translate,$comm
|
|||
$scope.pairTariff = function (dragEl, dropEl) {
|
||||
var tariffid = angular.element('#' + dragEl).scope().tariff.id;
|
||||
var costcenterid = $scope.currentCostCenter.id;
|
||||
CostCenterTariffService.addPair(costcenterid, tariffid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "TOASTER.BIND_TARIFF_SUCCESS";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
CostCenterTariffService.addPair(costcenterid, tariffid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("TOASTER.BIND_TARIFF_SUCCESS")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getTariffsByCostCenterID($scope.currentCostCenter.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -98,41 +77,21 @@ app.controller('CostCenterTariffController', function ($scope, $translate,$comm
|
|||
}
|
||||
var costcentertariffid = angular.element('#' + dragEl).scope().costcentertariff.id;
|
||||
var costcenterid = $scope.currentCostCenter.id;
|
||||
CostCenterTariffService.deletePair(costcenterid, costcentertariffid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "TOASTER.UNBIND_TARIFF_SUCCESS";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
CostCenterTariffService.deletePair(costcenterid, costcentertariffid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: popTi$translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("TOASTER.UNBIND_TARIFF_SUCCESS")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getTariffsByCostCenterID($scope.currentCostCenter.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
app.controller('CostFileController', function (
|
||||
$scope,
|
||||
$window,
|
||||
$common,
|
||||
$translate,
|
||||
$uibModal,
|
||||
$interval,
|
||||
CostFileService,
|
||||
toaster,
|
||||
|
|
@ -14,9 +12,9 @@ app.controller('CostFileController', function (
|
|||
$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
|
||||
|
||||
$scope.getAllCostFiles = function () {
|
||||
CostFileService.getAllCostFiles(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.costfiles = data;
|
||||
CostFileService.getAllCostFiles(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costfiles = response.data;
|
||||
} else {
|
||||
$scope.costfiles = [];
|
||||
}
|
||||
|
|
@ -36,45 +34,30 @@ app.controller('CostFileController', function (
|
|||
console.info('File added.', file);
|
||||
},
|
||||
'success': function (file, xhr) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body.format(file.name);
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY".format(file.name)),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllCostFiles();
|
||||
},
|
||||
'error': function (file, xhr) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body.format(file.name);
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY".format(file.name)),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
$scope.restoreCostFile = function (costfile) {
|
||||
CostFileService.restoreCostFile(costfile, function (error, data) {
|
||||
if (!error) {
|
||||
CostFileService.restoreCostFile(costfile, function (response) {
|
||||
console.log(response);
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: $translate.instant('TOASTER.SUCCESS'),
|
||||
type: "success",
|
||||
title: $translate.instant('TOASTER.SUCCESS_TITLE'),
|
||||
body: $translate.instant('SETTING.RESTORE_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
|
|
@ -83,8 +66,8 @@ app.controller('CostFileController', function (
|
|||
} else {
|
||||
toaster.pop({
|
||||
type: $translate.instant('TOASTER.ERROR'),
|
||||
title: $translate.instant(error.title),
|
||||
body: $translate.instant(error.description),
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -93,72 +76,39 @@ app.controller('CostFileController', function (
|
|||
|
||||
$scope.deleteCostFile = function (costfile) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
CostFileService.deleteCostFile(costfile, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.COST_FILE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
CostFileService.deleteCostFile(costfile, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.COST_FILE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.getAllCostFiles();
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "TOASTER.COST_FILE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("TOASTER.COST_FILE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('DataSourceController', function($scope, $uibModal, $timeout, $common, $translate, DataSourceService, GatewayService, toaster, SweetAlert) {
|
||||
app.controller('DataSourceController', function($scope, $uibModal, $translate, DataSourceService, GatewayService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllDataSources = function() {
|
||||
DataSourceService.getAllDataSources(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
} else {
|
||||
$scope.datasources = [];
|
||||
}
|
||||
|
|
@ -15,9 +15,9 @@ app.controller('DataSourceController', function($scope, $uibModal, $timeout, $co
|
|||
|
||||
|
||||
$scope.getAllGateways = function() {
|
||||
GatewayService.getAllGateways(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.gateways = data;
|
||||
GatewayService.getAllGateways(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.gateways = response.data;
|
||||
} else {
|
||||
$scope.gateways = [];
|
||||
}
|
||||
|
|
@ -40,43 +40,21 @@ app.controller('DataSourceController', function($scope, $uibModal, $timeout, $co
|
|||
});
|
||||
modalInstance.result.then(function(datasource) {
|
||||
datasource.gateway_id = datasource.gateway.id;
|
||||
DataSourceService.addDataSource(datasource, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "DATA_SOURCE.DATA_SOURCE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
DataSourceService.addDataSource(datasource, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY",{template: $translate.instant("DATA_SOURCE.DATA_SOURCE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit("handleEmitDataSourceChanged");
|
||||
} else {
|
||||
var templateName = "DATA_SOURCE.DATA_SOURCE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("DATA_SOURCE.DATA_SOURCE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -103,42 +81,20 @@ app.controller('DataSourceController', function($scope, $uibModal, $timeout, $co
|
|||
|
||||
modalInstance.result.then(function(modifiedDataSource) {
|
||||
modifiedDataSource.gateway_id = modifiedDataSource.gateway.id;
|
||||
DataSourceService.editDataSource(modifiedDataSource, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "DATA_SOURCE.DATA_SOURCE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
DataSourceService.editDataSource(modifiedDataSource, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("DATA_SOURCE.DATA_SOURCE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit("handleEmitDataSourceChanged");
|
||||
} else {
|
||||
var templateName = "DATA_SOURCE.DATA_SOURCE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("DATA_SOURCE.DATA_SOURCE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -150,73 +106,41 @@ app.controller('DataSourceController', function($scope, $uibModal, $timeout, $co
|
|||
|
||||
$scope.deleteDataSource = function(datasource) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
DataSourceService.deleteDataSource(datasource, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "DATA_SOURCE.DATA_SOURCE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
DataSourceService.deleteDataSource(datasource, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("DATA_SOURCE.DATA_SOURCE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.$emit("handleEmitDataSourceChanged");
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "DATA_SOURCE.DATA_SOURCE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("DATA_SOURCE.DATA_SOURCE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('PointController', function($scope, $common, $uibModal, $timeout, $translate, DataSourceService, PointService, toaster, SweetAlert) {
|
||||
app.controller('PointController', function($scope, $uibModal, $translate, DataSourceService, PointService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllDataSources = function() {
|
||||
DataSourceService.getAllDataSources(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -18,9 +18,9 @@ app.controller('PointController', function($scope, $common, $uibModal, $timeout,
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function(id) {
|
||||
PointService.getPointsByDataSourceID(id, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -45,42 +45,20 @@ app.controller('PointController', function($scope, $common, $uibModal, $timeout,
|
|||
if(point.ratio==""){
|
||||
point.ratio = undefined;
|
||||
}
|
||||
PointService.addPoint(point, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "SETTING.POINT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
PointService.addPoint(point, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY",{template: $translate.instant( "SETTING.POINT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
} else {
|
||||
var templateName = "SETTING.POINT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: "TOASTER.ERROR_ADD_BODY",
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -109,42 +87,20 @@ app.controller('PointController', function($scope, $common, $uibModal, $timeout,
|
|||
if(modifiedPoint.ratio==""){
|
||||
modifiedPoint.ratio = undefined;
|
||||
}
|
||||
PointService.editPoint(modifiedPoint, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "SETTING.POINT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
PointService.editPoint(modifiedPoint, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.POINT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
} else {
|
||||
var templateName = "SETTING.POINT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.POINT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -156,70 +112,39 @@ app.controller('PointController', function($scope, $common, $uibModal, $timeout,
|
|||
|
||||
$scope.deletePoint = function(point) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
PointService.deletePoint(point, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.POINT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
PointService.deletePoint(point, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.POINT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "SETTING.POINT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.POINT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('DistributionCircuitController', function($scope,$common, $translate, $uibModal, DistributionSystemService, DistributionCircuitService, toaster,SweetAlert) {
|
||||
app.controller('DistributionCircuitController', function($scope, $translate, $uibModal, DistributionSystemService, DistributionCircuitService, toaster,SweetAlert) {
|
||||
$scope.distributionsystems = [];
|
||||
$scope.distributioncircuits = [];
|
||||
$scope.currentDistributionSystem = null;
|
||||
|
||||
$scope.getAllDistributionSystems = function() {
|
||||
DistributionSystemService.getAllDistributionSystems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.distributionsystems = data;
|
||||
} else {
|
||||
DistributionSystemService.getAllDistributionSystems(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.distributionsystems = response.data;
|
||||
} else {
|
||||
$scope.distributionsystems = [];
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getDistributionCircuitsByDistributionSystemID = function(id) {
|
||||
|
||||
DistributionCircuitService.getDistributionCircuitsByDistributionSystemID(id, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.distributioncircuits=data;
|
||||
} else {
|
||||
$scope.distributioncircuits=[];
|
||||
DistributionCircuitService.getDistributionCircuitsByDistributionSystemID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.distributioncircuits = response.data;
|
||||
} else {
|
||||
$scope.distributioncircuits=[];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
|
@ -48,43 +48,21 @@ app.controller('DistributionCircuitController', function($scope,$common, $transl
|
|||
});
|
||||
modalInstance.result.then(function(distributioncircuit) {
|
||||
distributioncircuit.distribution_system_id = $scope.currentDistributionSystem.id;
|
||||
DistributionCircuitService.addDistributionCircuit(distributioncircuit, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
DistributionCircuitService.addDistributionCircuit(distributioncircuit, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getDistributionCircuitsByDistributionSystemID($scope.currentDistributionSystem.id);
|
||||
$scope.$emit('handleEmitDistributionCircuitChanged');
|
||||
$scope.$emit('handleEmitDistributionCircuitChanged');
|
||||
} else {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -110,43 +88,21 @@ app.controller('DistributionCircuitController', function($scope,$common, $transl
|
|||
|
||||
modalInstance.result.then(function(modifiedDistributionCircuit) {
|
||||
modifiedDistributionCircuit.distribution_system_id = $scope.currentDistributionSystem.id;
|
||||
DistributionCircuitService.editDistributionCircuit(modifiedDistributionCircuit, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
DistributionCircuitService.editDistributionCircuit(modifiedDistributionCircuit, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getDistributionCircuitsByDistributionSystemID($scope.currentDistributionSystem.id);
|
||||
$scope.$emit('handleEmitDistributionCircuitChanged');
|
||||
$scope.$emit('handleEmitDistributionCircuitChanged');
|
||||
} else {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -158,73 +114,43 @@ app.controller('DistributionCircuitController', function($scope,$common, $transl
|
|||
|
||||
$scope.deleteDistributionCircuit = function(distributioncircuit) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
DistributionCircuitService.deleteDistributionCircuit(distributioncircuit.id, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getDistributionCircuitsByDistributionSystemID($scope.currentDistributionSystem.id);
|
||||
$scope.$emit('handleEmitDistributionCircuitChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
DistributionCircuitService.deleteDistributionCircuit(distributioncircuit.id, 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("DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getDistributionCircuitsByDistributionSystemID($scope.currentDistributionSystem.id);
|
||||
$scope.$emit('handleEmitDistributionCircuitChanged');
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_CIRCUIT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -244,7 +170,6 @@ app.controller('DistributionCircuitController', function($scope,$common, $transl
|
|||
$scope.operation = "DISTRIBUTION_SYSTEM.ADD_DISTRIBUTION_CIRCUIT";
|
||||
|
||||
$scope.ok = function() {
|
||||
|
||||
$uibModalInstance.close($scope.distributioncircuit);
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('DistributionCircuitPointController', function ($scope, $common, $uibModal, $timeout, $translate, DistributionCircuitService, DataSourceService, PointService, DistributionCircuitPointService, toaster, SweetAlert) {
|
||||
app.controller('DistributionCircuitPointController', function ($scope, $timeout, $translate, DistributionCircuitService, DataSourceService, PointService, DistributionCircuitPointService, toaster, SweetAlert) {
|
||||
$scope.currentDistributionCircuit = {selected:undefined};
|
||||
$scope.getAllDataSources = function () {
|
||||
DataSourceService.getAllDataSources(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -17,9 +17,9 @@ app.controller('DistributionCircuitPointController', function ($scope, $common,
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function (id) {
|
||||
PointService.getPointsByDataSourceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -27,9 +27,9 @@ app.controller('DistributionCircuitPointController', function ($scope, $common,
|
|||
};
|
||||
|
||||
$scope.getPointsByDistributionCircuitID = function (id) {
|
||||
DistributionCircuitPointService.getPointsByDistributionCircuitID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.distributioncircuitpoints = data;
|
||||
DistributionCircuitPointService.getPointsByDistributionCircuitID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.distributioncircuitpoints = response.data;
|
||||
} else {
|
||||
$scope.distributioncircuitpoints = [];
|
||||
}
|
||||
|
|
@ -48,9 +48,9 @@ app.controller('DistributionCircuitPointController', function ($scope, $common,
|
|||
};
|
||||
|
||||
$scope.getAllDistributionCircuits = function () {
|
||||
DistributionCircuitService.getAllDistributionCircuits(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.distributioncircuits = data;
|
||||
DistributionCircuitService.getAllDistributionCircuits(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.distributioncircuits = response.data;
|
||||
for(var i = 0; i < $scope.distributioncircuits.length; i++) {
|
||||
$scope.distributioncircuits[i].name = $scope.distributioncircuits[i].distribution_system.name + '/' + $scope.distributioncircuits[i].name;
|
||||
}
|
||||
|
|
@ -67,38 +67,20 @@ app.controller('DistributionCircuitPointController', function ($scope, $common,
|
|||
$scope.pairPoint = function (dragEl, dropEl) {
|
||||
var pointid = angular.element('#' + dragEl).scope().point.id;
|
||||
var distributioncircuitid = $scope.currentDistributionCircuit.id;
|
||||
DistributionCircuitPointService.addPair(distributioncircuitid, pointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
DistributionCircuitPointService.addPair(distributioncircuitid, pointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant('TOASTER.BIND_POINT_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -111,38 +93,20 @@ app.controller('DistributionCircuitPointController', function ($scope, $common,
|
|||
}
|
||||
var distributioncircuitpointid = angular.element('#' + dragEl).scope().distributioncircuitpoint.id;
|
||||
var distributioncircuitid = $scope.currentDistributionCircuit.id;
|
||||
DistributionCircuitPointService.deletePair(distributioncircuitid, distributioncircuitpointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
DistributionCircuitPointService.deletePair(distributioncircuitid, distributioncircuitpointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant('TOASTER.UNBIND_POINT_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('DistributionSystemController', function($scope,$common, $translate, $uibModal, DistributionSystemService, toaster,SweetAlert) {
|
||||
app.controller('DistributionSystemController', function($scope, $translate, $uibModal, DistributionSystemService, toaster,SweetAlert) {
|
||||
|
||||
$scope.getAllDistributionSystems = function() {
|
||||
DistributionSystemService.getAllDistributionSystems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.distributionsystems = data;
|
||||
DistributionSystemService.getAllDistributionSystems(function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.distributionsystems = response.data;
|
||||
} else {
|
||||
$scope.distributionsystems = [];
|
||||
}
|
||||
|
|
@ -19,43 +19,21 @@ app.controller('DistributionSystemController', function($scope,$common, $transla
|
|||
windowClass: "animated fadeIn",
|
||||
});
|
||||
modalInstance.result.then(function(distributionsystem) {
|
||||
DistributionSystemService.addDistributionSystem(distributionsystem, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
DistributionSystemService.addDistributionSystem(distributionsystem, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllDistributionSystems();
|
||||
$scope.$emit('handleEmitDistributionSystemChanged');
|
||||
} else {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -80,43 +58,21 @@ app.controller('DistributionSystemController', function($scope,$common, $transla
|
|||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedDistributionSystem) {
|
||||
DistributionSystemService.editDistributionSystem(modifiedDistributionSystem, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
DistributionSystemService.editDistributionSystem(modifiedDistributionSystem, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllDistributionSystems();
|
||||
$scope.$emit('handleEmitDistributionSystemChanged');
|
||||
} else {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -128,56 +84,34 @@ app.controller('DistributionSystemController', function($scope,$common, $transla
|
|||
|
||||
$scope.deleteDistributionSystem=function(distributionsystem){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
DistributionSystemService.deleteDistributionSystem(distributionsystem, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllDistributionSystems();
|
||||
DistributionSystemService.deleteDistributionSystem(distributionsystem, 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("DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllDistributionSystems();
|
||||
$scope.$emit('handleEmitDistributionSystemChanged');
|
||||
} else {
|
||||
var templateName = "DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("DISTRIBUTION_SYSTEM.DISTRIBUTION_SYSTEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,28 +1,27 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('DistributionSystemPreviewController', function($scope,$common, $translate, DistributionSystemService, DistributionCircuitService) {
|
||||
app.controller('DistributionSystemPreviewController', function($scope, DistributionSystemService, DistributionCircuitService) {
|
||||
$scope.distributionsystems = [];
|
||||
$scope.currentDistributionSystem = null;
|
||||
|
||||
$scope.getAllDistributionSystems = function() {
|
||||
DistributionSystemService.getAllDistributionSystems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.distributionsystems = data;
|
||||
DistributionSystemService.getAllDistributionSystems(function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.distributionsystems = response.data;
|
||||
} else {
|
||||
$scope.distributionsystems = [];
|
||||
}
|
||||
$scope.distributionsystems = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getDistributionCircuitsByDistributionSystemID = function(id) {
|
||||
|
||||
DistributionCircuitService.getDistributionCircuitsByDistributionSystemID(id, function(error, data) {
|
||||
if (!error) {
|
||||
return data;
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
});
|
||||
DistributionCircuitService.getDistributionCircuitsByDistributionSystemID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
return response.data;
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.changeDistributionSystem=function(item,model){
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EmailServerController', function($scope,$common, $translate,$uibModal, EmailServerService,toaster,SweetAlert) {
|
||||
app.controller('EmailServerController', function($scope, $translate,$uibModal, EmailServerService,toaster,SweetAlert) {
|
||||
|
||||
|
||||
$scope.getAllEmailServers = function() {
|
||||
EmailServerService.getAllEmailServers(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.emailservers = data;
|
||||
EmailServerService.getAllEmailServers(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.emailservers = response.data;
|
||||
} else {
|
||||
$scope.emailservers = [];
|
||||
}
|
||||
|
|
@ -28,45 +28,20 @@ app.controller('EmailServerController', function($scope,$common, $translate,$uib
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(emailserver) {
|
||||
EmailServerService.addEmailServer(emailserver, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "SETTING.EMAIL_SERVER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EmailServerService.addEmailServer(emailserver, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY",{template: $translate.instant("SETTING.EMAIL_SERVER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.getAllEmailServers();
|
||||
} else {
|
||||
var templateName = "SETTING.EMAIL_SERVER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.EMAIL_SERVER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -92,44 +67,20 @@ app.controller('EmailServerController', function($scope,$common, $translate,$uib
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedEmailServer) {
|
||||
EmailServerService.editEmailServer(modifiedEmailServer,function(error,status){
|
||||
if(angular.isDefined(status) && status==200){
|
||||
var templateName = "SETTING.EMAIL_SERVER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EmailServerService.editEmailServer(modifiedEmailServer,function (response){
|
||||
if(angular.isDefined(response.status) && response.status === 200){
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.EMAIL_SERVER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.getAllEmailServers();
|
||||
$scope.getAllEmailServers();
|
||||
}else{
|
||||
var templateName = "SETTING.EMAIL_SERVER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.EMAIL_SERVER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -141,53 +92,31 @@ app.controller('EmailServerController', function($scope,$common, $translate,$uib
|
|||
|
||||
$scope.deleteEmailServer=function(emailserver){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
EmailServerService.deleteEmailServer(emailserver, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.EMAIL_SERVER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
EmailServerService.deleteEmailServer(emailserver, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.EMAIL_SERVER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEmailServers();
|
||||
} else {
|
||||
var templateName = "SETTING.EMAIL_SERVER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.EMAIL_SERVER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EnergyFlowDiagramController', function($scope,$common, $translate, $uibModal, EnergyFlowDiagramService, toaster,SweetAlert) {
|
||||
app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibModal, EnergyFlowDiagramService, toaster,SweetAlert) {
|
||||
|
||||
$scope.getAllEnergyFlowDiagrams = function() {
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyflowdiagrams = data;
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyflowdiagrams = response.data;
|
||||
} else {
|
||||
$scope.energyflowdiagrams = [];
|
||||
}
|
||||
|
|
@ -19,43 +19,21 @@ app.controller('EnergyFlowDiagramController', function($scope,$common, $translat
|
|||
windowClass: "animated fadeIn",
|
||||
});
|
||||
modalInstance.result.then(function(energyflowdiagram) {
|
||||
EnergyFlowDiagramService.addEnergyFlowDiagram(energyflowdiagram, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "COMMON.ENERGY_FLOW_DIAGRAM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EnergyFlowDiagramService.addEnergyFlowDiagram(energyflowdiagram, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("COMMON.ENERGY_FLOW_DIAGRAM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.ENERGY_FLOW_DIAGRAM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("COMMON.ENERGY_FLOW_DIAGRAM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -80,43 +58,21 @@ app.controller('EnergyFlowDiagramController', function($scope,$common, $translat
|
|||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedEnergyFlowDiagram) {
|
||||
EnergyFlowDiagramService.editEnergyFlowDiagram(modifiedEnergyFlowDiagram, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.ENERGY_FLOW_DIAGRAM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EnergyFlowDiagramService.editEnergyFlowDiagram(modifiedEnergyFlowDiagram, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("COMMON.ENERGY_FLOW_DIAGRAM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.ENERGY_FLOW_DIAGRAM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("COMMON.ENERGY_FLOW_DIAGRAM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -128,56 +84,34 @@ app.controller('EnergyFlowDiagramController', function($scope,$common, $translat
|
|||
|
||||
$scope.deleteEnergyFlowDiagram=function(energyflowdiagram){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
EnergyFlowDiagramService.deleteEnergyFlowDiagram(energyflowdiagram, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.ENERGY_FLOW_DIAGRAM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramChanged');
|
||||
EnergyFlowDiagramService.deleteEnergyFlowDiagram(energyflowdiagram, 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("COMMON.ENERGY_FLOW_DIAGRAM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.ENERGY_FLOW_DIAGRAM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("COMMON.ENERGY_FLOW_DIAGRAM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EnergyFlowDiagramLinkController', function($scope,$common ,$timeout,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EnergyFlowDiagramLinkService, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) {
|
||||
app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EnergyFlowDiagramLinkService, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) {
|
||||
$scope.currentEnergyFlowDiagram = {selected:undefined};
|
||||
$scope.is_show_add_link = false;
|
||||
$scope.energyflowdiagrams = [];
|
||||
|
|
@ -12,9 +12,9 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$common ,$time
|
|||
$scope.mergedMeters = [];
|
||||
|
||||
$scope.getAllEnergyFlowDiagrams = function() {
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyflowdiagrams = data;
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyflowdiagrams = response.data;
|
||||
} else {
|
||||
$scope.energyflowdiagrams = [];
|
||||
}
|
||||
|
|
@ -24,33 +24,32 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$common ,$time
|
|||
$scope.changeEnergyFlowDiagram=function(item,model){
|
||||
$scope.currentEnergyFlowDiagram=item;
|
||||
$scope.currentEnergyFlowDiagram.selected=model;
|
||||
$scope.is_show_add_link = true;
|
||||
$scope.is_show_add_link = true;
|
||||
$scope.getLinksByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.getNodesByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.getNodesByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
};
|
||||
|
||||
$scope.getLinksByEnergyFlowDiagramID = function(id) {
|
||||
|
||||
EnergyFlowDiagramLinkService.getLinksByEnergyFlowDiagramID(id, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyflowdiagramlinks=data;
|
||||
$scope.showEnergyFlowDiagramMeter()
|
||||
} else {
|
||||
$scope.energyflowdiagramlinks = [];
|
||||
}
|
||||
});
|
||||
EnergyFlowDiagramLinkService.getLinksByEnergyFlowDiagramID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyflowdiagramlinks = response.data;
|
||||
$scope.showEnergyFlowDiagramMeter()
|
||||
} else {
|
||||
$scope.energyflowdiagramlinks = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getNodesByEnergyFlowDiagramID = function(id) {
|
||||
|
||||
EnergyFlowDiagramNodeService.getNodesByEnergyFlowDiagramID(id, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyflowdiagramnodes=data;
|
||||
console.log($scope.energyflowdiagramnodes);
|
||||
} else {
|
||||
$scope.energyflowdiagramnodes = [];
|
||||
}
|
||||
});
|
||||
EnergyFlowDiagramNodeService.getNodesByEnergyFlowDiagramID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyflowdiagramnodes = response.data;
|
||||
console.log($scope.energyflowdiagramnodes);
|
||||
} else {
|
||||
$scope.energyflowdiagramnodes = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.addEnergyFlowDiagramLink = function() {
|
||||
|
|
@ -62,61 +61,39 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$common ,$time
|
|||
resolve: {
|
||||
params: function() {
|
||||
return {
|
||||
energyflowdiagramnodes: angular.copy($scope.energyflowdiagramnodes),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
energyflowdiagramnodes: angular.copy($scope.energyflowdiagramnodes),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
};
|
||||
}
|
||||
}
|
||||
});
|
||||
modalInstance.result.then(function(energyflowdiagramlink) {
|
||||
var energyflowdiagramid = $scope.currentEnergyFlowDiagram.id;
|
||||
if (energyflowdiagramlink.source_node != null) {
|
||||
energyflowdiagramlink.source_node_id = energyflowdiagramlink.source_node.id;
|
||||
}
|
||||
if (energyflowdiagramlink.target_node != null) {
|
||||
energyflowdiagramlink.target_node_id = energyflowdiagramlink.target_node.id;
|
||||
}
|
||||
if (energyflowdiagramlink.meter != null) {
|
||||
energyflowdiagramlink.meter_uuid = energyflowdiagramlink.meter.uuid;
|
||||
}
|
||||
|
||||
EnergyFlowDiagramLinkService.addEnergyFlowDiagramLink(energyflowdiagramid, energyflowdiagramlink, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.LINK";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
var energyflowdiagramid = $scope.currentEnergyFlowDiagram.id;
|
||||
if (energyflowdiagramlink.source_node != null) {
|
||||
energyflowdiagramlink.source_node_id = energyflowdiagramlink.source_node.id;
|
||||
}
|
||||
if (energyflowdiagramlink.target_node != null) {
|
||||
energyflowdiagramlink.target_node_id = energyflowdiagramlink.target_node.id;
|
||||
}
|
||||
if (energyflowdiagramlink.meter != null) {
|
||||
energyflowdiagramlink.meter_uuid = energyflowdiagramlink.meter.uuid;
|
||||
}
|
||||
|
||||
EnergyFlowDiagramLinkService.addEnergyFlowDiagramLink(energyflowdiagramid, energyflowdiagramlink, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.LINK")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getLinksByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramLinkChanged');
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramLinkChanged');
|
||||
} else {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.LINK";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.LINK")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -130,65 +107,43 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$common ,$time
|
|||
var modalInstance = $uibModal.open({
|
||||
templateUrl: 'views/settings/energyflowdiagram/energyflowdiagramlink.model.html',
|
||||
controller: 'ModalEditEnergyFlowDiagramLinkCtrl',
|
||||
windowClass: "animated fadeIn",
|
||||
windowClass: "animated fadeIn",
|
||||
resolve: {
|
||||
params: function() {
|
||||
return {
|
||||
energyflowdiagramlink: angular.copy(energyflowdiagramlink),
|
||||
energyflowdiagramnodes: angular.copy($scope.energyflowdiagramnodes),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
energyflowdiagramnodes: angular.copy($scope.energyflowdiagramnodes),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
};
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedEnergyFlowDiagramLink) {
|
||||
if (modifiedEnergyFlowDiagramLink.source_node != null) {
|
||||
modifiedEnergyFlowDiagramLink.source_node_id = modifiedEnergyFlowDiagramLink.source_node.id;
|
||||
}
|
||||
if (modifiedEnergyFlowDiagramLink.target_node != null) {
|
||||
modifiedEnergyFlowDiagramLink.target_node_id = modifiedEnergyFlowDiagramLink.target_node.id;
|
||||
}
|
||||
if (modifiedEnergyFlowDiagramLink.meter != null) {
|
||||
modifiedEnergyFlowDiagramLink.meter_uuid = modifiedEnergyFlowDiagramLink.meter.uuid;
|
||||
}
|
||||
EnergyFlowDiagramLinkService.editEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramLink, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.LINK";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
if (modifiedEnergyFlowDiagramLink.source_node != null) {
|
||||
modifiedEnergyFlowDiagramLink.source_node_id = modifiedEnergyFlowDiagramLink.source_node.id;
|
||||
}
|
||||
if (modifiedEnergyFlowDiagramLink.target_node != null) {
|
||||
modifiedEnergyFlowDiagramLink.target_node_id = modifiedEnergyFlowDiagramLink.target_node.id;
|
||||
}
|
||||
if (modifiedEnergyFlowDiagramLink.meter != null) {
|
||||
modifiedEnergyFlowDiagramLink.meter_uuid = modifiedEnergyFlowDiagramLink.meter.uuid;
|
||||
}
|
||||
EnergyFlowDiagramLinkService.editEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramLink, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.LINK")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getLinksByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramLinkChanged');
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramLinkChanged');
|
||||
} else {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.LINK";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.LINK")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -200,73 +155,43 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$common ,$time
|
|||
|
||||
$scope.deleteEnergyFlowDiagramLink = function(energyflowdiagramlink) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
EnergyFlowDiagramLinkService.deleteEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, energyflowdiagramlink.id, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.LINK";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
EnergyFlowDiagramLinkService.deleteEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, energyflowdiagramlink.id, 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("ENERGY_FLOW_DIAGRAM.LINK")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getLinksByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramLinkChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramLinkChanged');
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.LINK";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.LINK")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -282,85 +207,67 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$common ,$time
|
|||
}
|
||||
};
|
||||
|
||||
// $scope.changeMeterType=function(){
|
||||
// switch($scope.currentMeterType){
|
||||
// case 'meters':
|
||||
// $scope.currentmeters=$scope.meters;
|
||||
// break;
|
||||
// case 'virtualmeters':
|
||||
// $scope.currentmeters=$scope.virtualmeters;
|
||||
// break;
|
||||
// case 'offlinemeters':
|
||||
// $scope.currentmeters=$scope.offlinemeters;
|
||||
// break;
|
||||
// }
|
||||
// };
|
||||
$scope.showEnergyFlowDiagramMeter = function(energyflowdiagramlink) {
|
||||
|
||||
$scope.showEnergyFlowDiagramMeter = function(energyflowdiagramlink) {
|
||||
if (energyflowdiagramlink == null || energyflowdiagramlink.meter == null) {
|
||||
return '-';
|
||||
} else {
|
||||
return '(' + energyflowdiagramlink.meter.type + ')' + energyflowdiagramlink.meter.name;
|
||||
}
|
||||
};
|
||||
|
||||
if (energyflowdiagramlink == null || energyflowdiagramlink.meter == null) {
|
||||
return '-';
|
||||
} else {
|
||||
return '(' + energyflowdiagramlink.meter.type + ')' + energyflowdiagramlink.meter.name;
|
||||
}
|
||||
};
|
||||
|
||||
$scope.getMergedMeters = function() {
|
||||
$scope.mergedmeters = [];
|
||||
$scope.meters = [];
|
||||
$scope.offlinemeters = [];
|
||||
$scope.virtualmeters = [];
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
for(var i = 0; i < $scope.meters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.meters[i].uuid, "name": "meter/"+$scope.meters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
// $scope.currentMeterType="meters";
|
||||
// $timeout(function(){
|
||||
// $scope.changeMeterType();
|
||||
// },1000);
|
||||
$scope.getMergedMeters = function() {
|
||||
$scope.mergedmeters = [];
|
||||
$scope.meters = [];
|
||||
$scope.offlinemeters = [];
|
||||
$scope.virtualmeters = [];
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
for(var i = 0; i < $scope.meters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.meters[i].uuid, "name": "meter/"+$scope.meters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
} else {
|
||||
$scope.meters = [];
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
for(var i = 0; i < $scope.offlinemeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.offlinemeters[i].uuid, "name": "offlinemeter/"+$scope.offlinemeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
for(var i = 0; i < $scope.offlinemeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.offlinemeters[i].uuid, "name": "offlinemeter/"+$scope.offlinemeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
});
|
||||
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
for(var i = 0; i < $scope.virtualmeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.virtualmeters[i].uuid, "name": "virtualmeter/"+$scope.virtualmeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
for(var i = 0; i < $scope.virtualmeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.virtualmeters[i].uuid, "name": "virtualmeter/"+$scope.virtualmeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
$scope.getMergedMeters();
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
$scope.getMergedMeters();
|
||||
|
||||
$scope.$on('handleBroadcastEnergyFlowDiagramChanged', function(event) {
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
});
|
||||
$scope.$on('handleBroadcastEnergyFlowDiagramChanged', function(event) {
|
||||
$scope.getAllEnergyFlowDiagrams();
|
||||
});
|
||||
|
||||
$scope.$on('handleBroadcastEnergyFlowDiagramNodeChanged', function(event) {
|
||||
$scope.getNodesByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
});
|
||||
$scope.$on('handleBroadcastEnergyFlowDiagramNodeChanged', function(event) {
|
||||
$scope.getNodesByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
});
|
||||
});
|
||||
|
||||
app.controller('ModalAddEnergyFlowDiagramLinkCtrl', function($scope, $uibModalInstance, params) {
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EnergyFlowDiagramNodeController', function($scope,$common, $translate, $uibModal, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) {
|
||||
app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $uibModal, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) {
|
||||
$scope.energyflowdiagrams = [];
|
||||
$scope.energyflowdiagramnodes = [];
|
||||
$scope.currentEnergyFlowDiagram = null;
|
||||
|
||||
$scope.getAllEnergyFlowDiagrams = function() {
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyflowdiagrams = data;
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyflowdiagrams = response.data;
|
||||
} else {
|
||||
$scope.energyflowdiagrams = [];
|
||||
}
|
||||
|
|
@ -17,9 +17,9 @@ app.controller('EnergyFlowDiagramNodeController', function($scope,$common, $tran
|
|||
|
||||
$scope.getNodesByEnergyFlowDiagramID = function(id) {
|
||||
|
||||
EnergyFlowDiagramNodeService.getNodesByEnergyFlowDiagramID(id, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyflowdiagramnodes=data;
|
||||
EnergyFlowDiagramNodeService.getNodesByEnergyFlowDiagramID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyflowdiagramnodes = response.data;
|
||||
} else {
|
||||
$scope.energyflowdiagramnodes=[];
|
||||
}
|
||||
|
|
@ -49,43 +49,21 @@ app.controller('EnergyFlowDiagramNodeController', function($scope,$common, $tran
|
|||
modalInstance.result.then(function(energyflowdiagramnode) {
|
||||
var energyflowdiagramid = $scope.currentEnergyFlowDiagram.id;
|
||||
|
||||
EnergyFlowDiagramNodeService.addEnergyFlowDiagramNode(energyflowdiagramid, energyflowdiagramnode, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.NODE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EnergyFlowDiagramNodeService.addEnergyFlowDiagramNode(energyflowdiagramid, energyflowdiagramnode, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.NODE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getNodesByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramNodeChanged');
|
||||
} else {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.NODE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.NODE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -110,43 +88,21 @@ app.controller('EnergyFlowDiagramNodeController', function($scope,$common, $tran
|
|||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedEnergyFlowDiagramNode) {
|
||||
EnergyFlowDiagramNodeService.editEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramNode, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.NODE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EnergyFlowDiagramNodeService.editEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramNode, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.NODE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getNodesByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramNodeChanged');
|
||||
} else {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.NODE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.NODE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -158,73 +114,43 @@ app.controller('EnergyFlowDiagramNodeController', function($scope,$common, $tran
|
|||
|
||||
$scope.deleteEnergyFlowDiagramNode = function(energyflowdiagramnode) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
EnergyFlowDiagramNodeService.deleteEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, energyflowdiagramnode.id, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.NODE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
EnergyFlowDiagramNodeService.deleteEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, energyflowdiagramnode.id, 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("ENERGY_FLOW_DIAGRAM.NODE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getNodesByEnergyFlowDiagramID($scope.currentEnergyFlowDiagram.id);
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramNodeChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitEnergyFlowDiagramNodeChanged');
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "ENERGY_FLOW_DIAGRAM.NODE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("ENERGY_FLOW_DIAGRAM.NODE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,25 +1,24 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EnergyFlowDiagramPreviewController', function($scope,$common, $translate, EnergyFlowDiagramService, EnergyFlowDiagramLinkService, highchartsNG) {
|
||||
app.controller('EnergyFlowDiagramPreviewController', function($scope, EnergyFlowDiagramService, EnergyFlowDiagramLinkService, highchartsNG) {
|
||||
$scope.energyflowdiagrams = [];
|
||||
$scope.currentEnergyFlowDiagram = null;
|
||||
|
||||
$scope.getAllEnergyFlowDiagrams = function() {
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyflowdiagrams = data;
|
||||
EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyflowdiagrams = response.data;
|
||||
} else {
|
||||
$scope.energyflowdiagrams = [];
|
||||
$scope.energyflowdiagrams = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getLinksByEnergyFlowDiagramID = function(id) {
|
||||
|
||||
EnergyFlowDiagramLinkService.getLinksByEnergyFlowDiagramID(id, function(error, data) {
|
||||
if (!error) {
|
||||
console.log(data);
|
||||
return data;
|
||||
EnergyFlowDiagramLinkService.getLinksByEnergyFlowDiagramID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
return response.data;
|
||||
} else {
|
||||
return [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EquipmentController', function($scope,$common, $translate, $uibModal, EquipmentService, CostCenterService, toaster,SweetAlert) {
|
||||
app.controller('EquipmentController', function($scope, $translate, $uibModal, EquipmentService, CostCenterService, toaster,SweetAlert) {
|
||||
|
||||
$scope.getAllEquipments = function() {
|
||||
EquipmentService.getAllEquipments(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.equipments = data;
|
||||
EquipmentService.getAllEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.equipments = response.data;
|
||||
} else {
|
||||
$scope.equipments = [];
|
||||
}
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('EquipmentController', function($scope,$common, $translate, $uibM
|
|||
};
|
||||
|
||||
$scope.getAllCostCenters = function() {
|
||||
CostCenterService.getAllCostCenters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -36,43 +36,21 @@ app.controller('EquipmentController', function($scope,$common, $translate, $uibM
|
|||
});
|
||||
modalInstance.result.then(function(equipment) {
|
||||
equipment.cost_center_id = equipment.cost_center.id;
|
||||
EquipmentService.addEquipment(equipment, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "COMMON.EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EquipmentService.addEquipment(equipment, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("COMMON.EQUIPMENT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEquipments();
|
||||
$scope.$emit('handleEmitEquipmentChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("COMMON.EQUIPMENT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -99,43 +77,21 @@ app.controller('EquipmentController', function($scope,$common, $translate, $uibM
|
|||
|
||||
modalInstance.result.then(function(modifiedEquipment) {
|
||||
modifiedEquipment.cost_center_id = modifiedEquipment.cost_center.id;
|
||||
EquipmentService.editEquipment(modifiedEquipment, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
EquipmentService.editEquipment(modifiedEquipment, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("COMMON.EQUIPMENT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEquipments();
|
||||
$scope.$emit('handleEmitEquipmentChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("COMMON.EQUIPMENT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -147,56 +103,34 @@ app.controller('EquipmentController', function($scope,$common, $translate, $uibM
|
|||
|
||||
$scope.deleteEquipment=function(equipment){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
EquipmentService.deleteEquipment(equipment, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEquipments();
|
||||
$scope.$emit('handleEmitEquipmentChanged');
|
||||
EquipmentService.deleteEquipment(equipment, 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("COMMON.EQUIPMENT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllEquipments();
|
||||
$scope.$emit('handleEmitEquipmentChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.EQUIPMENT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("COMMON.EQUIPMENT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentMeterService, EquipmentService, toaster,SweetAlert) {
|
||||
app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentMeterService, EquipmentService, toaster,SweetAlert) {
|
||||
$scope.currentEquipment = {selected:undefined};
|
||||
|
||||
$scope.getAllEquipments = function(id) {
|
||||
EquipmentService.getAllEquipments(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.equipments = data;
|
||||
EquipmentService.getAllEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.equipments = response.data;
|
||||
} else {
|
||||
$scope.equipments = [];
|
||||
}
|
||||
|
|
@ -23,12 +23,12 @@ app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$ui
|
|||
var metertypes=['meters','virtualmeters','offlinemeters'];
|
||||
$scope.equipmentmeters=[];
|
||||
angular.forEach(metertypes,function(value,index){
|
||||
EquipmentMeterService.getMetersByEquipmentID(id, value,function(error, data) {
|
||||
if (!error) {
|
||||
angular.forEach(data,function(item,indx){
|
||||
data[indx].metertype=value;
|
||||
EquipmentMeterService.getMetersByEquipmentID(id, value, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
angular.forEach(response.data,function(item, indx){
|
||||
response.data[indx].metertype = value;
|
||||
});
|
||||
$scope.equipmentmeters=$scope.equipmentmeters.concat(data);
|
||||
$scope.equipmentmeters = $scope.equipmentmeters.concat(response.data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -60,9 +60,9 @@ app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$ui
|
|||
|
||||
|
||||
$scope.getAllMeters = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.currentMeterType="meters";
|
||||
$timeout(function(){
|
||||
$scope.changeMeterType();
|
||||
|
|
@ -76,9 +76,9 @@ app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$ui
|
|||
|
||||
|
||||
$scope.getAllOfflineMeters = function() {
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
|
|
@ -87,9 +87,9 @@ app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$ui
|
|||
};
|
||||
|
||||
$scope.getAllVirtualMeters = function() {
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
|
|
@ -110,45 +110,26 @@ app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$ui
|
|||
size: 'sm'
|
||||
});
|
||||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByEquipmentID($scope.currentEquipment.id);
|
||||
} else {
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
var meterid=angular.element('#'+dragEl).scope().meter.id;
|
||||
var equipmentid=$scope.currentEquipment.id;
|
||||
EquipmentMeterService.addPair(equipmentid, meterid, $scope.currentMeterType, is_output, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getMetersByEquipmentID($scope.currentEquipment.id);
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
},function() {
|
||||
});
|
||||
};
|
||||
|
|
@ -160,38 +141,20 @@ app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$ui
|
|||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
EquipmentMeterService.deletePair(equipmentid, equipmentmeterid, metertype, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByEquipmentID($scope.currentEquipment.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -203,7 +166,7 @@ app.controller('EquipmentMeterController', function($scope,$common ,$timeout,$ui
|
|||
$scope.getAllVirtualMeters();
|
||||
$scope.getAllOfflineMeters();
|
||||
|
||||
$scope.$on('handleBroadcastEquipmentChanged', function(event) {
|
||||
$scope.$on('handleBroadcastEquipmentChanged', function(event) {
|
||||
$scope.getAllEquipments();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('EquipmentParameterController', function($scope,$common ,$timeout,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentParameterService, EquipmentService, PointService, toaster,SweetAlert) {
|
||||
app.controller('EquipmentParameterController', function($scope, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentParameterService, EquipmentService, PointService, toaster,SweetAlert) {
|
||||
$scope.currentEquipment = {selected:undefined};
|
||||
$scope.is_show_add_parameter = false;
|
||||
$scope.equipments = [];
|
||||
|
|
@ -9,30 +9,30 @@ app.controller('EquipmentParameterController', function($scope,$common ,$timeout
|
|||
$scope.virtualmeters = [];
|
||||
$scope.mergedMeters = [];
|
||||
|
||||
$scope.getAllEquipments = function() {
|
||||
EquipmentService.getAllEquipments(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.equipments = data;
|
||||
} else {
|
||||
$scope.getAllEquipments = function() {
|
||||
EquipmentService.getAllEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.equipments = response.data;
|
||||
} else {
|
||||
$scope.equipments = [];
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.changeEquipment=function(item,model){
|
||||
$scope.currentEquipment=item;
|
||||
$scope.currentEquipment.selected=model;
|
||||
$scope.is_show_add_parameter = true;
|
||||
$scope.is_show_add_parameter = true;
|
||||
$scope.getParametersByEquipmentID($scope.currentEquipment.id);
|
||||
};
|
||||
|
||||
$scope.getParametersByEquipmentID = function(id) {
|
||||
$scope.equipmentparameters=[];
|
||||
EquipmentParameterService.getParametersByEquipmentID(id, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.equipmentparameters=data;
|
||||
}
|
||||
});
|
||||
EquipmentParameterService.getParametersByEquipmentID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.equipmentparameters = response.data;
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.addEquipmentParameter = function() {
|
||||
|
|
@ -44,8 +44,8 @@ app.controller('EquipmentParameterController', function($scope,$common ,$timeout
|
|||
resolve: {
|
||||
params: function() {
|
||||
return {
|
||||
points: angular.copy($scope.points),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
points: angular.copy($scope.points),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -62,47 +62,25 @@ app.controller('EquipmentParameterController', function($scope,$common ,$timeout
|
|||
equipmentparameter.denominator_meter_uuid = equipmentparameter.denominator_meter.uuid;
|
||||
}
|
||||
|
||||
EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getParametersByEquipmentID($scope.currentEquipment.id);
|
||||
} else {
|
||||
var templateName = "EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}, function() {
|
||||
EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, 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("EQUIPMENT.PARAMETER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getParametersByEquipmentID($scope.currentEquipment.id);
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("EQUIPMENT.PARAMETER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}, function() {
|
||||
|
||||
});
|
||||
};
|
||||
|
|
@ -116,59 +94,37 @@ app.controller('EquipmentParameterController', function($scope,$common ,$timeout
|
|||
params: function() {
|
||||
return {
|
||||
equipmentparameter: angular.copy(equipmentparameter),
|
||||
points: angular.copy($scope.points),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
points: angular.copy($scope.points),
|
||||
mergedmeters: angular.copy($scope.mergedmeters),
|
||||
};
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedEquipmentParameter) {
|
||||
if (modifiedEquipmentParameter.point != null) {
|
||||
modifiedEquipmentParameter.point_id = modifiedEquipmentParameter.point.id;
|
||||
}
|
||||
if (modifiedEquipmentParameter.numerator_meter != null) {
|
||||
modifiedEquipmentParameter.numerator_meter_uuid = modifiedEquipmentParameter.numerator_meter.uuid;
|
||||
}
|
||||
if (modifiedEquipmentParameter.denominator_meter != null) {
|
||||
modifiedEquipmentParameter.denominator_meter_uuid = modifiedEquipmentParameter.denominator_meter.uuid;
|
||||
}
|
||||
EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, modifiedEquipmentParameter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
if (modifiedEquipmentParameter.point != null) {
|
||||
modifiedEquipmentParameter.point_id = modifiedEquipmentParameter.point.id;
|
||||
}
|
||||
if (modifiedEquipmentParameter.numerator_meter != null) {
|
||||
modifiedEquipmentParameter.numerator_meter_uuid = modifiedEquipmentParameter.numerator_meter.uuid;
|
||||
}
|
||||
if (modifiedEquipmentParameter.denominator_meter != null) {
|
||||
modifiedEquipmentParameter.denominator_meter_uuid = modifiedEquipmentParameter.denominator_meter.uuid;
|
||||
}
|
||||
EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, modifiedEquipmentParameter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("EQUIPMENT.PARAMETER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getParametersByEquipmentID($scope.currentEquipment.id);
|
||||
} else {
|
||||
var templateName = "EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("EQUIPMENT.PARAMETER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -180,72 +136,42 @@ app.controller('EquipmentParameterController', function($scope,$common ,$timeout
|
|||
|
||||
$scope.deleteEquipmentParameter = function(equipmentparameter) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, equipmentparameter.id, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, equipmentparameter.id, 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("EQUIPMENT.PARAMETER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getParametersByEquipmentID($scope.currentEquipment.id);
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "EQUIPMENT.PARAMETER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("EQUIPMENT.PARAMETER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
|
|
@ -261,118 +187,95 @@ app.controller('EquipmentParameterController', function($scope,$common ,$timeout
|
|||
}
|
||||
};
|
||||
|
||||
// $scope.changeMeterType=function(){
|
||||
// switch($scope.currentMeterType){
|
||||
// case 'meters':
|
||||
// $scope.currentmeters=$scope.meters;
|
||||
// break;
|
||||
// case 'virtualmeters':
|
||||
// $scope.currentmeters=$scope.virtualmeters;
|
||||
// break;
|
||||
// case 'offlinemeters':
|
||||
// $scope.currentmeters=$scope.offlinemeters;
|
||||
// break;
|
||||
// }
|
||||
// };
|
||||
|
||||
$scope.showEquipmentParameterType = function(type) {
|
||||
if (type == 'constant') {
|
||||
return 'EQUIPMENT.CONSTANT';
|
||||
} else if (type == 'point' ) {
|
||||
return 'EQUIPMENT.POINT';
|
||||
} else if (type == 'fraction') {
|
||||
return 'EQUIPMENT.FRACTION';
|
||||
}
|
||||
if (type == 'constant') {
|
||||
return 'EQUIPMENT.CONSTANT';
|
||||
} else if (type == 'point' ) {
|
||||
return 'EQUIPMENT.POINT';
|
||||
} else if (type == 'fraction') {
|
||||
return 'EQUIPMENT.FRACTION';
|
||||
}
|
||||
};
|
||||
|
||||
$scope.showEquipmentParameterNumerator = function(equipmentparameter) {
|
||||
if (equipmentparameter.numerator_meter == null) {
|
||||
return '-';
|
||||
} else {
|
||||
return '(' + equipmentparameter.numerator_meter.type + ')' + equipmentparameter.numerator_meter.name;
|
||||
}
|
||||
};
|
||||
$scope.showEquipmentParameterNumerator = function(equipmentparameter) {
|
||||
if (equipmentparameter.numerator_meter == null) {
|
||||
return '-';
|
||||
} else {
|
||||
return '(' + equipmentparameter.numerator_meter.type + ')' + equipmentparameter.numerator_meter.name;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
$scope.showEquipmentParameterDenominator = function(equipmentparameter) {
|
||||
if (equipmentparameter.denominator_meter == null) {
|
||||
return '-';
|
||||
} else {
|
||||
return '(' + equipmentparameter.denominator_meter.type + ')' + equipmentparameter.denominator_meter.name;
|
||||
}
|
||||
};
|
||||
$scope.showEquipmentParameterDenominator = function(equipmentparameter) {
|
||||
if (equipmentparameter.denominator_meter == null) {
|
||||
return '-';
|
||||
} else {
|
||||
return '(' + equipmentparameter.denominator_meter.type + ')' + equipmentparameter.denominator_meter.name;
|
||||
}
|
||||
};
|
||||
|
||||
$scope.getMergedMeters = function() {
|
||||
$scope.mergedmeters = [];
|
||||
$scope.meters = [];
|
||||
$scope.offlinemeters = [];
|
||||
$scope.virtualmeters = [];
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
for(var i = 0; i < $scope.meters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.meters[i].uuid, "name": "meter/"+$scope.meters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
// $scope.currentMeterType="meters";
|
||||
// $timeout(function(){
|
||||
// $scope.changeMeterType();
|
||||
// },1000);
|
||||
$scope.getMergedMeters = function() {
|
||||
$scope.mergedmeters = [];
|
||||
$scope.meters = [];
|
||||
$scope.offlinemeters = [];
|
||||
$scope.virtualmeters = [];
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
for(var i = 0; i < $scope.meters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.meters[i].uuid, "name": "meter/"+$scope.meters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
} else {
|
||||
$scope.meters = [];
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
for(var i = 0; i < $scope.offlinemeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.offlinemeters[i].uuid, "name": "offlinemeter/"+$scope.offlinemeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
for(var i = 0; i < $scope.offlinemeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.offlinemeters[i].uuid, "name": "offlinemeter/"+$scope.offlinemeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
});
|
||||
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
for(var i = 0; i < $scope.virtualmeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.virtualmeters[i].uuid, "name": "virtualmeter/"+$scope.virtualmeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
for(var i = 0; i < $scope.virtualmeters.length; i++) {
|
||||
var mergedmeter = {"uuid": $scope.virtualmeters[i].uuid, "name": "virtualmeter/"+$scope.virtualmeters[i].name};
|
||||
$scope.mergedmeters.push(mergedmeter);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
});
|
||||
|
||||
console.log($scope.mergedmeters);
|
||||
};
|
||||
|
||||
$scope.getAllPoints = function() {
|
||||
PointService.getAllPoints(function(error, data) {
|
||||
if (!error) {
|
||||
// if (data.length > 0) {
|
||||
// for (var i = 0; i < data.length; i++) {
|
||||
// data[i].name = data[i].data_source.name + "/" + data[i].name ;
|
||||
// }
|
||||
// }
|
||||
$scope.points = data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
});
|
||||
$scope.getAllPoints = function() {
|
||||
PointService.getAllPoints(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
});
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
$scope.getAllEquipments();
|
||||
$scope.getMergedMeters();
|
||||
$scope.getAllPoints();
|
||||
$scope.getMergedMeters();
|
||||
$scope.getAllPoints();
|
||||
|
||||
$scope.$on('handleBroadcastEquipmentChanged', function(event) {
|
||||
$scope.getAllEquipments();
|
||||
});
|
||||
$scope.$on('handleBroadcastEquipmentChanged', function(event) {
|
||||
$scope.getAllEquipments();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
|
|
@ -381,12 +284,11 @@ app.controller('ModalAddEquipmentParameterCtrl', function($scope, $uibModalInsta
|
|||
$scope.operation = "EQUIPMENT.ADD_PARAMETER";
|
||||
$scope.equipmentparameter = {
|
||||
parameter_type : "constant",
|
||||
};
|
||||
};
|
||||
$scope.is_disabled = false;
|
||||
$scope.points = params.points;
|
||||
$scope.mergedmeters = params.mergedmeters;
|
||||
$scope.points = params.points;
|
||||
$scope.mergedmeters = params.mergedmeters;
|
||||
$scope.ok = function() {
|
||||
|
||||
$uibModalInstance.close($scope.equipmentparameter);
|
||||
};
|
||||
|
||||
|
|
@ -398,9 +300,9 @@ app.controller('ModalAddEquipmentParameterCtrl', function($scope, $uibModalInsta
|
|||
app.controller('ModalEditEquipmentParameterCtrl', function($scope, $uibModalInstance, params) {
|
||||
$scope.operation = "EQUIPMENT.EDIT_PARAMETER";
|
||||
$scope.equipmentparameter = params.equipmentparameter;
|
||||
$scope.points = params.points;
|
||||
$scope.mergedmeters = params.mergedmeters;
|
||||
$scope.is_disabled = true;
|
||||
$scope.points = params.points;
|
||||
$scope.mergedmeters = params.mergedmeters;
|
||||
$scope.is_disabled = true;
|
||||
$scope.ok = function() {
|
||||
$uibModalInstance.close($scope.equipmentparameter);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('GatewayController', function($scope, $translate,$common, $uibModal, GatewayService, toaster, SweetAlert) {
|
||||
app.controller('GatewayController', function($scope, $translate, $uibModal, GatewayService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllGateways = function() {
|
||||
GatewayService.getAllGateways(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.gateways = data;
|
||||
GatewayService.getAllGateways(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.gateways = response.data;
|
||||
} else {
|
||||
$scope.gateways = [];
|
||||
}
|
||||
|
|
@ -27,43 +27,21 @@ app.controller('GatewayController', function($scope, $translate,$common, $uibMo
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(gateway) {
|
||||
GatewayService.addGateway(gateway, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "GATEWAY.GATEWAY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
GatewayService.addGateway(gateway, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("GATEWAY.GATEWAY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllGateways();
|
||||
$scope.$emit('handleEmitGatewayChanged');
|
||||
} else {
|
||||
var templateName = "GATEWAY.GATEWAY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("GATEWAY.GATEWAY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -89,43 +67,21 @@ app.controller('GatewayController', function($scope, $translate,$common, $uibMo
|
|||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedGateway) {
|
||||
GatewayService.editGateway(modifiedGateway, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "GATEWAY.GATEWAY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
GatewayService.editGateway(modifiedGateway, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("GATEWAY.GATEWAY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllGateways();
|
||||
$scope.$emit('handleEmitGatewayChanged');
|
||||
} else {
|
||||
var templateName = "GATEWAY.GATEWAY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("GATEWAY.GATEWAY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -137,76 +93,46 @@ app.controller('GatewayController', function($scope, $translate,$common, $uibMo
|
|||
|
||||
$scope.deleteGateway = function(gateway) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
GatewayService.deleteGateway(gateway, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "GATEWAY.GATEWAY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllGateways();
|
||||
$scope.$emit('handleEmitGatewayChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "GATEWAY.GATEWAY";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
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) {
|
||||
GatewayService.deleteGateway(gateway, 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("GATEWAY.GATEWAY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllGateways();
|
||||
$scope.$emit('handleEmitGatewayChanged');
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("GATEWAY.GATEWAY")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getAllGateways();
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('GSMModemController', function($scope,$common, $translate,$uibModal, GSMModemService,toaster,SweetAlert) {
|
||||
|
||||
app.controller('GSMModemController', function($scope, $translate,$uibModal, GSMModemService,toaster,SweetAlert) {
|
||||
|
||||
$scope.getAllGSMModems = function() {
|
||||
GSMModemService.getAllGSMModems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.gsmmodems = data;
|
||||
GSMModemService.getAllGSMModems(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.gsmmodems = response.data;
|
||||
} else {
|
||||
$scope.gsmmodems = [];
|
||||
}
|
||||
|
|
@ -28,45 +27,20 @@ app.controller('GSMModemController', function($scope,$common, $translate,$uibMod
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(gsmmodem) {
|
||||
GSMModemService.addGSMModem(gsmmodem, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "SETTING.GSM_MODEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
GSMModemService.addGSMModem(gsmmodem, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.getAllGSMModems();
|
||||
} else {
|
||||
var templateName = "SETTING.GSM_MODEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -92,44 +66,20 @@ app.controller('GSMModemController', function($scope,$common, $translate,$uibMod
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedGSMModem) {
|
||||
GSMModemService.editGSMModem(modifiedGSMModem,function(error,status){
|
||||
if(angular.isDefined(status) && status==200){
|
||||
var templateName = "SETTING.GSM_MODEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
GSMModemService.editGSMModem(modifiedGSMModem,function (response){
|
||||
if(angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
|
||||
$scope.getAllGSMModems();
|
||||
$scope.getAllGSMModems();
|
||||
}else{
|
||||
var templateName = "SETTING.GSM_MODEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -141,53 +91,31 @@ app.controller('GSMModemController', function($scope,$common, $translate,$uibMod
|
|||
|
||||
$scope.deleteGSMModem=function(gsmmodem){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
GSMModemService.deleteGSMModem(gsmmodem, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.GSM_MODEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
GSMModemService.deleteGSMModem(gsmmodem, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllGSMModems();
|
||||
} else {
|
||||
var templateName = "SETTING.GSM_MODEM";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.GSM_MODEM")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
app.controller('KnowledgeFileController', function (
|
||||
$scope,
|
||||
$window,
|
||||
$common,
|
||||
$translate,
|
||||
$uibModal,
|
||||
KnowledgeFileService,
|
||||
toaster,
|
||||
SweetAlert) {
|
||||
|
|
@ -13,9 +11,9 @@ app.controller('KnowledgeFileController', function (
|
|||
$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
|
||||
|
||||
$scope.getAllKnowledgeFiles = function () {
|
||||
KnowledgeFileService.getAllKnowledgeFiles(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.knowledgefiles = data;
|
||||
KnowledgeFileService.getAllKnowledgeFiles(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.knowledgefiles = response.data;
|
||||
} else {
|
||||
$scope.knowledgefiles = [];
|
||||
}
|
||||
|
|
@ -36,47 +34,28 @@ app.controller('KnowledgeFileController', function (
|
|||
console.info('File added.', file);
|
||||
},
|
||||
'success': function (file, xhr) {
|
||||
//console.log('File success to upload from dropzone', file, xhr);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body.format(file.name);
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY".format(file.name)),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllKnowledgeFiles();
|
||||
},
|
||||
'error': function (file, xhr) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body.format(file.name);
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY".format(file.name)),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
};
|
||||
$scope.restoreKnowledgeFile = function (knowledgefile) {
|
||||
KnowledgeFileService.restoreKnowledgeFile(knowledgefile, function (error, data) {
|
||||
if (!error) {
|
||||
KnowledgeFileService.restoreKnowledgeFile(knowledgefile, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: $translate.instant('TOASTER.SUCCESS'),
|
||||
type: "success",
|
||||
title: $translate.instant('TOASTER.SUCCESS_TITLE'),
|
||||
body: $translate.instant('SETTING.RESTORE_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
|
|
@ -84,9 +63,9 @@ app.controller('KnowledgeFileController', function (
|
|||
$scope.getAllKnowledgeFiles();
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: $translate.instant('TOASTER.ERROR'),
|
||||
title: $translate.instant(error.title),
|
||||
body: $translate.instant(error.description),
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -95,76 +74,45 @@ app.controller('KnowledgeFileController', function (
|
|||
|
||||
$scope.deleteKnowledgeFile = function (knowledgefile) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
KnowledgeFileService.deleteKnowledgeFile(knowledgefile, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.KNOWLEDGEFILE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllKnowledgeFiles();
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "SETTING.KNOWLEDGEFILE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
KnowledgeFileService.deleteKnowledgeFile(knowledgefile, 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("SETTING.KNOWLEDGEFILE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllKnowledgeFiles();
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", { template: $translate.instant("SETTING.KNOWLEDGEFILE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
$scope.getAllKnowledgeFiles();
|
||||
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('MenuController', function ($scope, $common, $uibModal, MenuService, toaster, $translate, SweetAlert) {
|
||||
app.controller('MenuController', function ($scope, $uibModal, MenuService, toaster, $translate) {
|
||||
$scope.menus = [];
|
||||
$scope.currentMenuID = null;
|
||||
$scope.currentMenu = {};
|
||||
$scope.currentMenuChildren = [];
|
||||
|
||||
$scope.getAllMenus = function () {
|
||||
MenuService.getAllMenus(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.menus = data;
|
||||
MenuService.getAllMenus(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.menus = response.data;
|
||||
} else {
|
||||
$scope.menus = [];
|
||||
}
|
||||
|
|
@ -44,9 +44,9 @@ app.controller('MenuController', function ($scope, $common, $uibModal, MenuServi
|
|||
};
|
||||
|
||||
$scope.refreshMenuTree = function () {
|
||||
MenuService.getAllMenus(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.menus = data;
|
||||
MenuService.getAllMenus(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.menus = response.data;
|
||||
} else {
|
||||
$scope.menus = [];
|
||||
}
|
||||
|
|
@ -77,10 +77,10 @@ app.controller('MenuController', function ($scope, $common, $uibModal, MenuServi
|
|||
};
|
||||
|
||||
$scope.getMenuChildren = function (menuid) {
|
||||
MenuService.getMenuChildren(menuid, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.currentMenu = data["current"];
|
||||
$scope.currentMenuChildren = data["children"];
|
||||
MenuService.getMenuChildren(menuid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.currentMenu = response.data["current"];
|
||||
$scope.currentMenuChildren = response.data["children"];
|
||||
} else {
|
||||
$scope.currentMenu = {};
|
||||
$scope.currentMenuChildren = [];
|
||||
|
|
@ -110,42 +110,20 @@ app.controller('MenuController', function ($scope, $common, $uibModal, MenuServi
|
|||
modifiedMenu.parent_menu_id = null;
|
||||
}
|
||||
|
||||
MenuService.editMenu(modifiedMenu, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.MENU";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
MenuService.editMenu(modifiedMenu, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("COMMON.MENU") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitMenuChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.MENU";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("COMMON.MENU") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('MeterController', function($scope, $translate,$common, $uibModal, MeterService, CategoryService, CostCenterService, EnergyItemService,toaster, SweetAlert) {
|
||||
app.controller('MeterController', function($scope, $translate, $uibModal, MeterService, CategoryService, CostCenterService, EnergyItemService,toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllCostCenters = function() {
|
||||
CostCenterService.getAllCostCenters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
};
|
||||
|
||||
$scope.getAllCategories = function() {
|
||||
CategoryService.getAllCategories(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.categories = data;
|
||||
CategoryService.getAllCategories(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.categories = response.data;
|
||||
} else {
|
||||
$scope.categories = [];
|
||||
}
|
||||
|
|
@ -24,9 +24,9 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
};
|
||||
|
||||
$scope.getAllEnergyItems = function() {
|
||||
EnergyItemService.getAllEnergyItems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyitems = data;
|
||||
EnergyItemService.getAllEnergyItems(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyitems = response.data;
|
||||
} else {
|
||||
$scope.energyitems = [];
|
||||
}
|
||||
|
|
@ -34,10 +34,10 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
|
||||
};
|
||||
$scope.getAllMeters = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
$scope.parentmeters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.parentmeters = response.data;
|
||||
} else {
|
||||
$scope.meters = [];
|
||||
$scope.parentmeters = [];
|
||||
|
|
@ -71,10 +71,10 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
};
|
||||
|
||||
$scope.refreshMeterTree = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
$scope.parentmeters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.parentmeters = response.data;
|
||||
} else {
|
||||
$scope.meters = [];
|
||||
$scope.parentmeters = [];
|
||||
|
|
@ -103,9 +103,9 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
};
|
||||
|
||||
$scope.getMeterSubmeters = function(meterid) {
|
||||
MeterService.getMeterSubmeters(meterid, function(error, data) {
|
||||
if (!error) {
|
||||
$scope.currentMeterSubmeters = data;
|
||||
MeterService.getMeterSubmeters(meterid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.currentMeterSubmeters = response.data;
|
||||
} else {
|
||||
$scope.currentMeterSubmeters = [];
|
||||
}
|
||||
|
|
@ -142,43 +142,21 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
} else {
|
||||
meter.master_meter_id = undefined;
|
||||
}
|
||||
MeterService.addMeter(meter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "SETTING.METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
MeterService.addMeter(meter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllMeters();
|
||||
$scope.$emit('handleEmitMeterChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -220,43 +198,21 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
} else {
|
||||
modifiedMeter.master_meter_id = undefined;
|
||||
}
|
||||
MeterService.editMeter(modifiedMeter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "SETTING.METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
MeterService.editMeter(modifiedMeter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllMeters();
|
||||
$scope.$emit('handleEmitMeterChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -268,72 +224,42 @@ app.controller('MeterController', function($scope, $translate,$common, $uibModa
|
|||
|
||||
$scope.deleteMeter = function(meter) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
MeterService.deleteMeter(meter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
MeterService.deleteMeter(meter, 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("SETTING.METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllMeters();
|
||||
$scope.$emit('handleEmitMeterChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "SETTING.METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('MeterPointController', function ($scope, $common, $uibModal, $timeout, $translate,
|
||||
app.controller('MeterPointController', function ($scope, $timeout, $translate,
|
||||
MeterService,
|
||||
DataSourceService,
|
||||
PointService,
|
||||
MeterPointService,
|
||||
toaster, SweetAlert) {
|
||||
toaster) {
|
||||
$scope.currentMeter = {selected:undefined};
|
||||
$scope.getAllDataSources = function () {
|
||||
DataSourceService.getAllDataSources(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -22,9 +22,9 @@ app.controller('MeterPointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function (id) {
|
||||
PointService.getPointsByDataSourceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -32,9 +32,9 @@ app.controller('MeterPointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getPointsByMeterID = function (id) {
|
||||
MeterPointService.getPointsByMeterID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.meterpoints = data;
|
||||
MeterPointService.getPointsByMeterID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meterpoints = response.data;
|
||||
} else {
|
||||
$scope.meterpoints = [];
|
||||
}
|
||||
|
|
@ -53,9 +53,9 @@ app.controller('MeterPointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getAllMeters = function () {
|
||||
MeterService.getAllMeters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$timeout(function () {
|
||||
$scope.getPointsByMeterID($scope.currentMeter.id);
|
||||
}, 1000);
|
||||
|
|
@ -69,38 +69,20 @@ app.controller('MeterPointController', function ($scope, $common, $uibModal, $ti
|
|||
$scope.pairPoint = function (dragEl, dropEl) {
|
||||
var pointid = angular.element('#' + dragEl).scope().point.id;
|
||||
var meterid = $scope.currentMeter.id;
|
||||
MeterPointService.addPair(meterid, pointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
MeterPointService.addPair(meterid, pointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByMeterID($scope.currentMeter.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -113,38 +95,20 @@ app.controller('MeterPointController', function ($scope, $common, $uibModal, $ti
|
|||
}
|
||||
var meterpointid = angular.element('#' + dragEl).scope().meterpoint.id;
|
||||
var meterid = $scope.currentMeter.id;
|
||||
MeterPointService.deletePair(meterid, meterpointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
MeterPointService.deletePair(meterid, meterpointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByMeterID($scope.currentMeter.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('OfflineMeterController', function($scope, $common, $translate, $uibModal, OfflineMeterService, CategoryService, EnergyItemService, CostCenterService, toaster, SweetAlert) {
|
||||
app.controller('OfflineMeterController', function($scope, $translate, $uibModal, OfflineMeterService, CategoryService, EnergyItemService, CostCenterService, toaster, SweetAlert) {
|
||||
$scope.getAllCostCenters = function() {
|
||||
CostCenterService.getAllCostCenters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -12,9 +12,9 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $
|
|||
};
|
||||
|
||||
$scope.getAllCategories = function() {
|
||||
CategoryService.getAllCategories(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.categories = data;
|
||||
CategoryService.getAllCategories(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.categories = response.data;
|
||||
} else {
|
||||
$scope.categories = [];
|
||||
}
|
||||
|
|
@ -22,9 +22,9 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $
|
|||
};
|
||||
|
||||
$scope.getAllEnergyItems = function() {
|
||||
EnergyItemService.getAllEnergyItems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyitems = data;
|
||||
EnergyItemService.getAllEnergyItems(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyitems = response.data;
|
||||
} else {
|
||||
$scope.energyitems = [];
|
||||
}
|
||||
|
|
@ -32,9 +32,9 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $
|
|||
};
|
||||
|
||||
$scope.getAllOfflineMeters = function() {
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
|
|
@ -66,44 +66,21 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $
|
|||
offlinemeter.energy_item_id = undefined;
|
||||
}
|
||||
offlinemeter.cost_center_id = offlinemeter.cost_center.id;
|
||||
OfflineMeterService.addOfflineMeter(offlinemeter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "SETTING.OFFLINE_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
OfflineMeterService.addOfflineMeter(offlinemeter, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.OFFLINE_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllOfflineMeters();
|
||||
$scope.$emit('handleEmitOfflineMeterChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.OFFLINE_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.OFFLINE_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -139,43 +116,21 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $
|
|||
modifiedOfflineMeter.energy_item_id = undefined;
|
||||
}
|
||||
modifiedOfflineMeter.cost_center_id = modifiedOfflineMeter.cost_center.id;
|
||||
OfflineMeterService.editOfflineMeter(modifiedOfflineMeter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "SETTING.OFFLINE_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
OfflineMeterService.editOfflineMeter(modifiedOfflineMeter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.OFFLINE_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllOfflineMeters();
|
||||
$scope.$emit('handleEmitOfflineMeterChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.OFFLINE_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.OFFLINE_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -187,73 +142,42 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $
|
|||
|
||||
$scope.deleteOfflineMeter = function(offlinemeter) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
OfflineMeterService.deleteOfflineMeter(offlinemeter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.OFFLINE_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
OfflineMeterService.deleteOfflineMeter(offlinemeter, 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("SETTING.OFFLINE_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllOfflineMeters();
|
||||
$scope.$emit('handleEmitOfflineMeterChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "SETTING.OFFLINE_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.OFFLINE_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,9 +3,7 @@
|
|||
app.controller('OfflineMeterFileController', function(
|
||||
$scope,
|
||||
$window,
|
||||
$common,
|
||||
$translate,
|
||||
$uibModal,
|
||||
$interval,
|
||||
OfflineMeterFileService,
|
||||
toaster,
|
||||
|
|
@ -14,9 +12,9 @@ app.controller('OfflineMeterFileController', function(
|
|||
$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
|
||||
|
||||
$scope.getAllOfflineMeterFiles = function() {
|
||||
OfflineMeterFileService.getAllOfflineMeterFiles(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeterfiles = data;
|
||||
OfflineMeterFileService.getAllOfflineMeterFiles(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeterfiles = response.data;
|
||||
} else {
|
||||
$scope.offlinemeterfiles = [];
|
||||
}
|
||||
|
|
@ -37,50 +35,29 @@ app.controller('OfflineMeterFileController', function(
|
|||
console.info('File added.', file);
|
||||
},
|
||||
'success': function(file, xhr) {
|
||||
//console.log('File success to upload from dropzone', file, xhr);
|
||||
var templateName = file.name;
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY",{template: file.name}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllOfflineMeterFiles();
|
||||
},
|
||||
'error': function (file, xhr) {
|
||||
var templateName = file.name;
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: file.name}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
$scope.restoreOfflineMeterFile = function (offlinemeterfile) {
|
||||
OfflineMeterFileService.restoreOfflineMeterFile(offlinemeterfile, function (error, data) {
|
||||
if (!error) {
|
||||
OfflineMeterFileService.restoreOfflineMeterFile(offlinemeterfile, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: $translate.instant('TOASTER.SUCCESS'),
|
||||
type: "success",
|
||||
title: $translate.instant('TOASTER.SUCCESS_TITLE'),
|
||||
body: $translate.instant('SETTING.RESTORE_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
|
|
@ -88,9 +65,9 @@ app.controller('OfflineMeterFileController', function(
|
|||
$scope.getAllOfflineMeterFiles();
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: $translate.instant('TOASTER.ERROR'),
|
||||
title: $translate.instant(error.title),
|
||||
body: $translate.instant(error.description),
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -99,71 +76,39 @@ app.controller('OfflineMeterFileController', function(
|
|||
|
||||
$scope.deleteOfflineMeterFile = function(offlinemeterfile) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
OfflineMeterFileService.deleteOfflineMeterFile(offlinemeterfile, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.OFFLINE_METER_FILE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
OfflineMeterFileService.deleteOfflineMeterFile(offlinemeterfile, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.OFFLINE_METER_FILE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getAllOfflineMeterFiles();
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "SETTING.OFFLINE_METER_FILE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.OFFLINE_METER_FILE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,18 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('VirtualMeterController', function($scope, $common, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CategoryService, EnergyItemService, CostCenterService, toaster, SweetAlert) {
|
||||
app.controller('VirtualMeterController', function($scope, $uibModal, $translate,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService,
|
||||
CategoryService,
|
||||
EnergyItemService,
|
||||
CostCenterService,
|
||||
toaster,
|
||||
SweetAlert) {
|
||||
$scope.getAllCostCenters = function() {
|
||||
CostCenterService.getAllCostCenters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -12,9 +20,9 @@ app.controller('VirtualMeterController', function($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getAllCategories = function() {
|
||||
CategoryService.getAllCategories(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.categories = data;
|
||||
CategoryService.getAllCategories(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.categories = response.data;
|
||||
} else {
|
||||
$scope.categories = [];
|
||||
}
|
||||
|
|
@ -22,9 +30,9 @@ app.controller('VirtualMeterController', function($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getAllEnergyItems = function() {
|
||||
EnergyItemService.getAllEnergyItems(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.energyitems = data;
|
||||
EnergyItemService.getAllEnergyItems(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.energyitems = response.data;
|
||||
} else {
|
||||
$scope.energyitems = [];
|
||||
}
|
||||
|
|
@ -32,9 +40,9 @@ $scope.getAllEnergyItems = function() {
|
|||
};
|
||||
|
||||
$scope.getAllVirtualMeters = function() {
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
|
|
@ -42,9 +50,9 @@ $scope.getAllEnergyItems = function() {
|
|||
|
||||
};
|
||||
$scope.getAllMeters = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
} else {
|
||||
$scope.meters = [];
|
||||
}
|
||||
|
|
@ -52,17 +60,15 @@ $scope.getAllEnergyItems = function() {
|
|||
};
|
||||
|
||||
$scope.getAllOfflineMeters = function() {
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
|
||||
$scope.addVirtualMeter = function() {
|
||||
var modalInstance = $uibModal.open({
|
||||
templateUrl: 'views/settings/meter/virtualmeter.model.html',
|
||||
|
|
@ -90,43 +96,21 @@ $scope.getAllEnergyItems = function() {
|
|||
virtualmeter.energy_item_id = undefined;
|
||||
}
|
||||
virtualmeter.cost_center_id = virtualmeter.cost_center.id;
|
||||
VirtualMeterService.addVirtualMeter(virtualmeter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "SETTING.VIRTUAL_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
VirtualMeterService.addVirtualMeter(virtualmeter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("SETTING.VIRTUAL_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllVirtualMeters();
|
||||
$scope.$emit('handleEmitVirtualMeterChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.VIRTUAL_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.VIRTUAL_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -165,43 +149,21 @@ $scope.getAllEnergyItems = function() {
|
|||
modifiedVirtualMeter.energy_item_id = undefined;
|
||||
}
|
||||
modifiedVirtualMeter.cost_center_id = modifiedVirtualMeter.cost_center.id;
|
||||
VirtualMeterService.editVirtualMeter(modifiedVirtualMeter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "SETTING.VIRTUAL_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
VirtualMeterService.editVirtualMeter(modifiedVirtualMeter, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.VIRTUAL_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllVirtualMeters();
|
||||
$scope.$emit('handleEmitVirtualMeterChanged');
|
||||
} else {
|
||||
var templateName = "SETTING.VIRTUAL_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.VIRTUAL_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -213,72 +175,42 @@ $scope.getAllEnergyItems = function() {
|
|||
|
||||
$scope.deleteVirtualMeter = function(virtualmeter) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
VirtualMeterService.deleteVirtualMeter(virtualmeter, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.VIRTUAL_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
VirtualMeterService.deleteVirtualMeter(virtualmeter, 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("SETTING.VIRTUAL_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllVirtualMeters();
|
||||
$scope.$emit('handleEmitVirtualMeterChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: popTit$translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "SETTING.VIRTUAL_METER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.VIRTUAL_METER")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SensorController', function($scope, $translate,$common, $uibModal, SensorService, toaster, SweetAlert) {
|
||||
app.controller('SensorController', function($scope, $translate, $uibModal, SensorService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllSensors = function() {
|
||||
SensorService.getAllSensors(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.sensors = data;
|
||||
SensorService.getAllSensors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.sensors = response.data;
|
||||
} else {
|
||||
$scope.sensors = [];
|
||||
}
|
||||
|
|
@ -27,43 +27,21 @@ app.controller('SensorController', function($scope, $translate,$common, $uibMod
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(sensor) {
|
||||
SensorService.addSensor(sensor, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "COMMON.SENSOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
SensorService.addSensor(sensor, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("COMMON.SENSOR")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllSensors();
|
||||
$scope.$emit('handleEmitSensorChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.SENSOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("COMMON.SENSOR")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -89,43 +67,21 @@ app.controller('SensorController', function($scope, $translate,$common, $uibMod
|
|||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedSensor) {
|
||||
SensorService.editSensor(modifiedSensor, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.SENSOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
SensorService.editSensor(modifiedSensor, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("COMMON.SENSOR")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllSensors();
|
||||
$scope.$emit('handleEmitSensorChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.SENSOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("COMMON.SENSOR")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -137,70 +93,40 @@ app.controller('SensorController', function($scope, $translate,$common, $uibMod
|
|||
|
||||
$scope.deleteSensor = function(sensor) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
SensorService.deleteSensor(sensor, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.SENSOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
SensorService.deleteSensor(sensor, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("COMMON.SENSOR")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllSensors();
|
||||
$scope.$emit('handleEmitSensorChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "COMMON.SENSOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("COMMON.SENSOR")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SensorPointController', function ($scope, $common, $uibModal, $timeout, $translate, SensorService, DataSourceService, PointService, SensorPointService, toaster, SweetAlert) {
|
||||
app.controller('SensorPointController', function ($scope, $timeout, $translate, SensorService, DataSourceService, PointService, SensorPointService, toaster, SweetAlert) {
|
||||
$scope.currentSensor = {selected:undefined};
|
||||
$scope.getAllDataSources = function () {
|
||||
DataSourceService.getAllDataSources(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -18,9 +18,9 @@ app.controller('SensorPointController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function (id) {
|
||||
PointService.getPointsByDataSourceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -29,9 +29,9 @@ app.controller('SensorPointController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getPointsBySensorID = function (id) {
|
||||
SensorPointService.getPointsBySensorID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.sensorpoints = data;
|
||||
SensorPointService.getPointsBySensorID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.sensorpoints = response.data;
|
||||
} else {
|
||||
$scope.sensorpoints = [];
|
||||
}
|
||||
|
|
@ -51,9 +51,9 @@ app.controller('SensorPointController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getAllSensors = function () {
|
||||
SensorService.getAllSensors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.sensors = data;
|
||||
SensorService.getAllSensors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.sensors = response.data;
|
||||
$timeout(function () {
|
||||
$scope.getPointsBySensorID($scope.currentSensor.id);
|
||||
}, 1000);
|
||||
|
|
@ -67,39 +67,20 @@ app.controller('SensorPointController', function ($scope, $common, $uibModal, $t
|
|||
$scope.pairPoint = function (dragEl, dropEl) {
|
||||
var pointid = angular.element('#' + dragEl).scope().point.id;
|
||||
var sensorid = $scope.currentSensor.id;
|
||||
SensorPointService.addPair(sensorid, pointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SensorPointService.addPair(sensorid, pointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant('TOASTER.BIND_POINT_SUCCESS'),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsBySensorID($scope.currentSensor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -112,37 +93,20 @@ app.controller('SensorPointController', function ($scope, $common, $uibModal, $t
|
|||
}
|
||||
var sensorpointid = angular.element('#' + dragEl).scope().sensorpoint.id;
|
||||
var sensorid = $scope.currentSensor.id;
|
||||
SensorPointService.deletePair(sensorid, sensorpointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SensorPointService.deletePair(sensorid, sensorpointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getPointsBySensorID($scope.currentSensor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('ShopfloorController', function ($scope, $common, $translate, $uibModal, CostCenterService, ContactService, ShopfloorService, toaster, SweetAlert) {
|
||||
app.controller('ShopfloorController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, ShopfloorService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllCostCenters = function () {
|
||||
CostCenterService.getAllCostCenters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('ShopfloorController', function ($scope, $common, $translate, $ui
|
|||
};
|
||||
|
||||
$scope.getAllContacts = function () {
|
||||
ContactService.getAllContacts(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.contacts = data;
|
||||
ContactService.getAllContacts(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.contacts = response.data;
|
||||
} else {
|
||||
$scope.contacts = [];
|
||||
}
|
||||
|
|
@ -23,9 +23,9 @@ app.controller('ShopfloorController', function ($scope, $common, $translate, $ui
|
|||
};
|
||||
|
||||
$scope.getAllShopfloors = function () {
|
||||
ShopfloorService.getAllShopfloors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloors = data;
|
||||
ShopfloorService.getAllShopfloors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloors = response.data;
|
||||
} else {
|
||||
$scope.shopfloors = [];
|
||||
}
|
||||
|
|
@ -53,43 +53,20 @@ app.controller('ShopfloorController', function ($scope, $common, $translate, $ui
|
|||
if (angular.isDefined(shopfloor.is_input_counted) == false) {
|
||||
shopfloor.is_input_counted = false;
|
||||
}
|
||||
ShopfloorService.addShopfloor(shopfloor, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "COMMON.SHOPFLOOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
ShopfloorService.addShopfloor(shopfloor, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", { template: $translate.instant("COMMON.SHOPFLOOR") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit('handleEmitShopfloorChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.SHOPFLOOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", { template: $translate.instant("COMMON.SHOPFLOOR") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -121,42 +98,20 @@ app.controller('ShopfloorController', function ($scope, $common, $translate, $ui
|
|||
if (angular.isDefined(shopfloor.is_input_counted) == false) {
|
||||
shopfloor.is_input_counted = false;
|
||||
}
|
||||
ShopfloorService.editShopfloor(modifiedShopfloor, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.SHOPFLOOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
ShopfloorService.editShopfloor(modifiedShopfloor, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("COMMON.SHOPFLOOR") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitShopfloorChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.SHOPFLOOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("COMMON.SHOPFLOOR") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -168,69 +123,39 @@ app.controller('ShopfloorController', function ($scope, $common, $translate, $ui
|
|||
|
||||
$scope.deleteShopfloor = function (shopfloor) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
ShopfloorService.deleteShopfloor(shopfloor, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.SHOPFLOOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
ShopfloorService.deleteShopfloor(shopfloor, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", { template: $translate.instant("COMMON.SHOPFLOOR") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitShopfloorChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "COMMON.SHOPFLOOR";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", { template: $translate.instant("COMMON.SHOPFLOOR") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('ShopfloorEquipmentController', function ($scope, $common, $uibModal, $timeout, $translate, ShopfloorService, EquipmentService, ShopfloorEquipmentService, toaster, SweetAlert) {
|
||||
app.controller('ShopfloorEquipmentController', function ($scope, $translate, ShopfloorService, EquipmentService, ShopfloorEquipmentService, toaster, SweetAlert) {
|
||||
$scope.currentShopfloor = {selected:undefined};
|
||||
|
||||
$scope.getAllEquipments = function () {
|
||||
EquipmentService.getAllEquipments(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.equipments = data;
|
||||
EquipmentService.getAllEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.equipments = response.data;
|
||||
} else {
|
||||
$scope.equipments = [];
|
||||
}
|
||||
|
|
@ -14,9 +14,9 @@ app.controller('ShopfloorEquipmentController', function ($scope, $common, $uibMo
|
|||
};
|
||||
|
||||
$scope.getEquipmentsByShopfloorID = function (id) {
|
||||
ShopfloorEquipmentService.getEquipmentsByShopfloorID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloorequipments = data;
|
||||
ShopfloorEquipmentService.getEquipmentsByShopfloorID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloorequipments = response.data;
|
||||
} else {
|
||||
$scope.shopfloorequipments = [];
|
||||
}
|
||||
|
|
@ -30,9 +30,9 @@ app.controller('ShopfloorEquipmentController', function ($scope, $common, $uibMo
|
|||
};
|
||||
|
||||
$scope.getAllShopfloors = function () {
|
||||
ShopfloorService.getAllShopfloors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloors = data;
|
||||
ShopfloorService.getAllShopfloors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloors = response.data;
|
||||
} else {
|
||||
$scope.shopfloors = [];
|
||||
}
|
||||
|
|
@ -42,38 +42,20 @@ app.controller('ShopfloorEquipmentController', function ($scope, $common, $uibMo
|
|||
$scope.pairEquipment = function (dragEl, dropEl) {
|
||||
var equipmentid = angular.element('#' + dragEl).scope().equipment.id;
|
||||
var shopfloorid = $scope.currentShopfloor.id;
|
||||
ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_EQUIPMENT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_EQUIPMENT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getEquipmentsByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -86,38 +68,20 @@ app.controller('ShopfloorEquipmentController', function ($scope, $common, $uibMo
|
|||
}
|
||||
var shopfloorequipmentid = angular.element('#' + dragEl).scope().shopfloorequipment.id;
|
||||
var shopfloorid = $scope.currentShopfloor.id;
|
||||
ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_EQUIPMENT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_EQUIPMENT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getEquipmentsByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('ShopfloorMeterController', function($scope,$common ,$timeout,$uibModal, $translate,
|
||||
app.controller('ShopfloorMeterController', function($scope,$timeout, $translate,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService,
|
||||
ShopfloorMeterService,
|
||||
ShopfloorService,
|
||||
toaster,SweetAlert) {
|
||||
toaster) {
|
||||
$scope.currentShopfloor = {selected:undefined};
|
||||
|
||||
$scope.getAllShopfloors = function(id) {
|
||||
ShopfloorService.getAllShopfloors(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloors = data;
|
||||
ShopfloorService.getAllShopfloors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloors = response.data;
|
||||
} else {
|
||||
$scope.shopfloors = [];
|
||||
}
|
||||
|
|
@ -29,12 +29,12 @@ app.controller('ShopfloorMeterController', function($scope,$common ,$timeout,$ui
|
|||
var metertypes=['meters','virtualmeters','offlinemeters'];
|
||||
$scope.shopfloormeters=[];
|
||||
angular.forEach(metertypes,function(value,index){
|
||||
ShopfloorMeterService.getMetersByShopfloorID(id, value,function(error, data) {
|
||||
if (!error) {
|
||||
angular.forEach(data,function(item,indx){
|
||||
data[indx].metertype=value;
|
||||
ShopfloorMeterService.getMetersByShopfloorID(id, value, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
angular.forEach(response.data, function (item, indx){
|
||||
response.data[indx].metertype = value;
|
||||
});
|
||||
$scope.shopfloormeters=$scope.shopfloormeters.concat(data);
|
||||
$scope.shopfloormeters = $scope.shopfloormeters.concat(response.data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -66,9 +66,9 @@ app.controller('ShopfloorMeterController', function($scope,$common ,$timeout,$ui
|
|||
|
||||
|
||||
$scope.getAllMeters = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.currentMeterType="meters";
|
||||
$timeout(function(){
|
||||
$scope.changeMeterType();
|
||||
|
|
@ -82,9 +82,9 @@ app.controller('ShopfloorMeterController', function($scope,$common ,$timeout,$ui
|
|||
|
||||
|
||||
$scope.getAllOfflineMeters = function() {
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
|
|
@ -93,9 +93,9 @@ app.controller('ShopfloorMeterController', function($scope,$common ,$timeout,$ui
|
|||
};
|
||||
|
||||
$scope.getAllVirtualMeters = function() {
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
|
|
@ -106,39 +106,20 @@ app.controller('ShopfloorMeterController', function($scope,$common ,$timeout,$ui
|
|||
$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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorMeterService.addPair(shopfloorid, meterid, $scope.currentMeterType, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -152,38 +133,20 @@ app.controller('ShopfloorMeterController', function($scope,$common ,$timeout,$ui
|
|||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorMeterService.deletePair(shopfloorid, shopfloormeterid, metertype, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('ShopfloorPointController', function ($scope, $common, $uibModal, $timeout, $translate, ShopfloorService, DataSourceService, PointService, ShopfloorPointService, toaster, SweetAlert) {
|
||||
app.controller('ShopfloorPointController', function ($scope, $translate, ShopfloorService, DataSourceService, PointService, ShopfloorPointService, toaster, SweetAlert) {
|
||||
$scope.currentShopfloor = {selected:undefined};
|
||||
$scope.getAllDataSources = function () {
|
||||
DataSourceService.getAllDataSources(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -17,9 +17,9 @@ app.controller('ShopfloorPointController', function ($scope, $common, $uibModal,
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function (id) {
|
||||
PointService.getPointsByDataSourceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -27,9 +27,9 @@ app.controller('ShopfloorPointController', function ($scope, $common, $uibModal,
|
|||
};
|
||||
|
||||
$scope.getPointsByShopfloorID = function (id) {
|
||||
ShopfloorPointService.getPointsByShopfloorID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloorpoints = data;
|
||||
ShopfloorPointService.getPointsByShopfloorID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloorpoints = response.data;
|
||||
} else {
|
||||
$scope.shopfloorpoints = [];
|
||||
}
|
||||
|
|
@ -49,9 +49,9 @@ app.controller('ShopfloorPointController', function ($scope, $common, $uibModal,
|
|||
};
|
||||
|
||||
$scope.getAllShopfloors = function () {
|
||||
ShopfloorService.getAllShopfloors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloors = data;
|
||||
ShopfloorService.getAllShopfloors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloors = response.data;
|
||||
} else {
|
||||
$scope.shopfloors = [];
|
||||
}
|
||||
|
|
@ -62,38 +62,20 @@ app.controller('ShopfloorPointController', function ($scope, $common, $uibModal,
|
|||
$scope.pairPoint = function (dragEl, dropEl) {
|
||||
var pointid = angular.element('#' + dragEl).scope().point.id;
|
||||
var shopfloorid = $scope.currentShopfloor.id;
|
||||
ShopfloorPointService.addPair(shopfloorid, pointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorPointService.addPair(shopfloorid, pointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -106,39 +88,20 @@ app.controller('ShopfloorPointController', function ($scope, $common, $uibModal,
|
|||
}
|
||||
var shopfloorpointid = angular.element('#' + dragEl).scope().shopfloorpoint.id;
|
||||
var shopfloorid = $scope.currentShopfloor.id;
|
||||
ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('ShopfloorSensorController', function ($scope, $common, $uibModal, $timeout, $translate, ShopfloorService, SensorService, ShopfloorSensorService, toaster, SweetAlert) {
|
||||
app.controller('ShopfloorSensorController', function ($scope, $translate, ShopfloorService, SensorService, ShopfloorSensorService, toaster, SweetAlert) {
|
||||
$scope.currentShopfloor = {selected:undefined};
|
||||
|
||||
$scope.getAllSensors = function () {
|
||||
SensorService.getAllSensors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.sensors = data;
|
||||
SensorService.getAllSensors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.sensors = response.data;
|
||||
} else {
|
||||
$scope.sensors = [];
|
||||
}
|
||||
|
|
@ -14,66 +14,48 @@ app.controller('ShopfloorSensorController', function ($scope, $common, $uibModal
|
|||
};
|
||||
|
||||
$scope.getSensorsByShopfloorID = function (id) {
|
||||
ShopfloorSensorService.getSensorsByShopfloorID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloorsensors = data;
|
||||
ShopfloorSensorService.getSensorsByShopfloorID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloorsensors = response.data;
|
||||
} else {
|
||||
$scope.shopfloorsensors = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.changeShopfloor=function(item,model){
|
||||
$scope.currentShopfloor=item;
|
||||
$scope.currentShopfloor.selected=model;
|
||||
$scope.getSensorsByShopfloorID($scope.currentShopfloor.id);
|
||||
};
|
||||
$scope.changeShopfloor=function(item,model){
|
||||
$scope.currentShopfloor=item;
|
||||
$scope.currentShopfloor.selected=model;
|
||||
$scope.getSensorsByShopfloorID($scope.currentShopfloor.id);
|
||||
};
|
||||
|
||||
$scope.getAllShopfloors = function () {
|
||||
ShopfloorService.getAllShopfloors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloors = data;
|
||||
} else {
|
||||
$scope.shopfloors = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
$scope.getAllShopfloors = function () {
|
||||
ShopfloorService.getAllShopfloors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloors = response.data;
|
||||
} else {
|
||||
$scope.shopfloors = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.pairSensor = function (dragEl, dropEl) {
|
||||
var sensorid = angular.element('#' + dragEl).scope().sensor.id;
|
||||
var shopfloorid = $scope.currentShopfloor.id;
|
||||
ShopfloorSensorService.addPair(shopfloorid, sensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorSensorService.addPair(shopfloorid, sensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -86,38 +68,20 @@ app.controller('ShopfloorSensorController', function ($scope, $common, $uibModal
|
|||
}
|
||||
var shopfloorsensorid = angular.element('#' + dragEl).scope().shopfloorsensor.id;
|
||||
var shopfloorid = $scope.currentShopfloor.id;
|
||||
ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsByShopfloorID($scope.currentShopfloor.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceService, CostCenterService, ContactService, toaster, $translate, SweetAlert) {
|
||||
app.controller('SpaceController', function ($scope, $uibModal, SpaceService, CostCenterService, ContactService, toaster, $translate, SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.currentSpace = {};
|
||||
$scope.currentSpaceChildren = [];
|
||||
|
||||
$scope.getAllCostCenters = function () {
|
||||
CostCenterService.getAllCostCenters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -17,9 +17,9 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
};
|
||||
|
||||
$scope.getAllContacts = function () {
|
||||
ContactService.getAllContacts(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.contacts = data;
|
||||
ContactService.getAllContacts(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.contacts = response.data;
|
||||
} else {
|
||||
$scope.contacts = [];
|
||||
}
|
||||
|
|
@ -27,9 +27,9 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
};
|
||||
|
||||
$scope.getAllSpaces = function () {
|
||||
SpaceService.getAllSpaces(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -63,9 +63,9 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
};
|
||||
|
||||
$scope.refreshSpaceTree = function () {
|
||||
SpaceService.getAllSpaces(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -95,10 +95,10 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
};
|
||||
|
||||
$scope.getSpaceChildren = function (spaceid) {
|
||||
SpaceService.getSpaceChildren(spaceid, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.currentSpace = data["current"];
|
||||
$scope.currentSpaceChildren = data["children"];
|
||||
SpaceService.getSpaceChildren(spaceid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.currentSpace = response.data["current"];
|
||||
$scope.currentSpaceChildren = response.data["children"];
|
||||
} else {
|
||||
$scope.currentSpace = {};
|
||||
$scope.currentSpaceChildren = [];
|
||||
|
|
@ -107,9 +107,9 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
};
|
||||
|
||||
$scope.getAllTimezones = function () {
|
||||
SpaceService.getAllTimezones(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.timezones = data;
|
||||
SpaceService.getAllTimezones(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.timezones = response.data;
|
||||
} else {
|
||||
$scope.timezones = [];
|
||||
}
|
||||
|
|
@ -139,42 +139,20 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
if (space.contact != null) {
|
||||
space.contact_id = space.contact.id;
|
||||
}
|
||||
SpaceService.addSpace(space, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "COMMON.SPACE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
SpaceService.addSpace(space, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", { template: $translate.instant("COMMON.SPACE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitSpaceChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.SPACE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", { template: $translate.instant("COMMON.SPACE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -214,42 +192,20 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
}
|
||||
|
||||
modifiedSpace.cost_center_id = modifiedSpace.cost_center.id;
|
||||
SpaceService.editSpace(modifiedSpace, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.SPACE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
SpaceService.editSpace(modifiedSpace, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("COMMON.SPACE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitSpaceChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.SPACE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("COMMON.SPACE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -261,69 +217,39 @@ app.controller('SpaceController', function ($scope, $common, $uibModal, SpaceSer
|
|||
|
||||
$scope.deleteSpace = function (space) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
SpaceService.deleteSpace(space, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.SPACE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
SpaceService.deleteSpace(space, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", { template: $translate.instant("COMMON.SPACE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitSpaceChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "COMMON.SPACE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", { template: $translate.instant("COMMON.SPACE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceCombinedEquipmentController', function($scope,$common ,$timeout, $translate, SpaceService, CombinedEquipmentService, SpaceCombinedEquipmentService, toaster,SweetAlert) {
|
||||
app.controller('SpaceCombinedEquipmentController', function($scope, $translate,
|
||||
SpaceService,
|
||||
CombinedEquipmentService,
|
||||
SpaceCombinedEquipmentService,
|
||||
toaster) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.combinedequipments = [];
|
||||
|
|
@ -8,11 +12,11 @@ app.controller('SpaceCombinedEquipmentController', function($scope,$common ,$tim
|
|||
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
$scope.spaces = [];
|
||||
}
|
||||
//create space tree
|
||||
var treedata = {'core': {'data': [], "multiple" : false,}, "plugins" : [ "wholerow" ]};
|
||||
|
|
@ -43,59 +47,42 @@ app.controller('SpaceCombinedEquipmentController', function($scope,$common ,$tim
|
|||
|
||||
$scope.getCombinedEquipmentsBySpaceID = function(id) {
|
||||
$scope.spacecombinedequipments=[];
|
||||
SpaceCombinedEquipmentService.getCombinedEquipmentsBySpaceID(id,function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spacecombinedequipments=$scope.spacecombinedequipments.concat(data);
|
||||
} else {
|
||||
$scope.spacecombinedequipments=[];
|
||||
}
|
||||
});
|
||||
SpaceCombinedEquipmentService.getCombinedEquipmentsBySpaceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spacecombinedequipments = $scope.spacecombinedequipments.concat(response.data);
|
||||
} else {
|
||||
$scope.spacecombinedequipments=[];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getAllCombinedEquipments = function() {
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.combinedequipments = data;
|
||||
} else {
|
||||
$scope.combinedequipments = [];
|
||||
}
|
||||
});
|
||||
CombinedEquipmentService.getAllCombinedEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.combinedequipments = response.data;
|
||||
} else {
|
||||
$scope.combinedequipments = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$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(error,status){
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.BIND_COMBINED_EQUIPMENT_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, function (response){
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_COMBINED_EQUIPMENT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getCombinedEquipmentsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -109,37 +96,20 @@ app.controller('SpaceCombinedEquipmentController', function($scope,$common ,$tim
|
|||
var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id;
|
||||
var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected();
|
||||
|
||||
SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.UNBIND_COMBINED_EQUIPMENT_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_COMBINED_EQUIPMENT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getCombinedEquipmentsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -150,9 +120,9 @@ app.controller('SpaceCombinedEquipmentController', function($scope,$common ,$tim
|
|||
$scope.getAllCombinedEquipments();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceEquipmentController', function($scope,$common ,$timeout, $translate, SpaceService, EquipmentService, SpaceEquipmentService, toaster,SweetAlert) {
|
||||
app.controller('SpaceEquipmentController', function($scope, $translate, SpaceService, EquipmentService, SpaceEquipmentService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.equipments = [];
|
||||
|
|
@ -8,9 +8,9 @@ app.controller('SpaceEquipmentController', function($scope,$common ,$timeout, $t
|
|||
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -43,19 +43,19 @@ app.controller('SpaceEquipmentController', function($scope,$common ,$timeout, $t
|
|||
|
||||
$scope.getEquipmentsBySpaceID = function(id) {
|
||||
$scope.spaceequipments=[];
|
||||
SpaceEquipmentService.getEquipmentsBySpaceID(id,function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaceequipments=$scope.spaceequipments.concat(data);
|
||||
} else {
|
||||
$scope.spaceequipments=[];
|
||||
}
|
||||
});
|
||||
SpaceEquipmentService.getEquipmentsBySpaceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaceequipments = $scope.spaceequipments.concat(response.data);
|
||||
} else {
|
||||
$scope.spaceequipments=[];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getAllEquipments = function() {
|
||||
EquipmentService.getAllEquipments(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.equipments = data;
|
||||
EquipmentService.getAllEquipments(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.equipments = response.data;
|
||||
} else {
|
||||
$scope.equipments = [];
|
||||
}
|
||||
|
|
@ -65,37 +65,20 @@ app.controller('SpaceEquipmentController', function($scope,$common ,$timeout, $t
|
|||
$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(error,status){
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.BIND_EQUIPMENT_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceEquipmentService.addPair(spaceid,equipmentid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_EQUIPMENT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getEquipmentsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -109,37 +92,20 @@ app.controller('SpaceEquipmentController', function($scope,$common ,$timeout, $t
|
|||
var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id;
|
||||
var spaceid = angular.element(spacetreewithequipment).jstree(true).get_top_selected();
|
||||
|
||||
SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.UNBIND_EQUIPMENT_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_EQUIPMENT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getEquipmentsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -150,9 +116,9 @@ app.controller('SpaceEquipmentController', function($scope,$common ,$timeout, $t
|
|||
$scope.getAllEquipments();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceMeterController', function($scope,$common ,$timeout, $translate, SpaceService, MeterService, VirtualMeterService, OfflineMeterService, SpaceMeterService, toaster,SweetAlert) {
|
||||
app.controller('SpaceMeterController', function($scope ,$timeout, $translate, SpaceService, MeterService, VirtualMeterService, OfflineMeterService, SpaceMeterService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.spacemeters = [];
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -44,12 +44,12 @@ app.controller('SpaceMeterController', function($scope,$common ,$timeout, $trans
|
|||
var metertypes=['meters','virtualmeters','offlinemeters'];
|
||||
$scope.spacemeters=[];
|
||||
angular.forEach(metertypes,function(value,index){
|
||||
console.log(id, value, index);
|
||||
SpaceMeterService.getMetersBySpaceID(id,value,function(error, data) {
|
||||
if (!error) {
|
||||
angular.forEach(data, function(item,indx) {data[indx].metertype=value;});
|
||||
$scope.spacemeters=$scope.spacemeters.concat(data);
|
||||
console.log($scope.spacemeters);
|
||||
SpaceMeterService.getMetersBySpaceID(id,value, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
angular.forEach(response.data, function(item,indx) {
|
||||
response.data[indx].metertype = value;
|
||||
});
|
||||
$scope.spacemeters = $scope.spacemeters.concat(response.data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -80,9 +80,9 @@ app.controller('SpaceMeterController', function($scope,$common ,$timeout, $trans
|
|||
};
|
||||
|
||||
$scope.getAllMeters = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.currentMeterType="meters";
|
||||
$timeout(function(){
|
||||
$scope.changeMeterType();
|
||||
|
|
@ -95,9 +95,9 @@ app.controller('SpaceMeterController', function($scope,$common ,$timeout, $trans
|
|||
};
|
||||
|
||||
$scope.getAllOfflineMeters = function() {
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
|
|
@ -106,9 +106,9 @@ app.controller('SpaceMeterController', function($scope,$common ,$timeout, $trans
|
|||
};
|
||||
|
||||
$scope.getAllVirtualMeters = function() {
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
|
|
@ -119,37 +119,20 @@ app.controller('SpaceMeterController', function($scope,$common ,$timeout, $trans
|
|||
$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(error,status){
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.BIND_METER_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceMeterService.addPair(spaceid,meterid, $scope.currentMeterType, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -163,37 +146,20 @@ app.controller('SpaceMeterController', function($scope,$common ,$timeout, $trans
|
|||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.UNBIND_METER_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceMeterService.deletePair(spaceid, spacemeterid, metertype, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getMetersBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -206,9 +172,9 @@ app.controller('SpaceMeterController', function($scope,$common ,$timeout, $trans
|
|||
$scope.getAllOfflineMeters();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpacePointController', function ($scope, $common, $uibModal, $timeout, $translate, SpaceService, DataSourceService, PointService, SpacePointService, toaster, SweetAlert) {
|
||||
app.controller('SpacePointController', function ($scope, $translate, SpaceService, DataSourceService, PointService, SpacePointService, toaster, SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.spacepoints = [];
|
||||
|
|
@ -8,9 +8,9 @@ app.controller('SpacePointController', function ($scope, $common, $uibModal, $ti
|
|||
$scope.points = [];
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -42,9 +42,9 @@ app.controller('SpacePointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getAllDataSources = function () {
|
||||
DataSourceService.getAllDataSources(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -56,9 +56,9 @@ app.controller('SpacePointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function (id) {
|
||||
PointService.getPointsByDataSourceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -66,9 +66,9 @@ app.controller('SpacePointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getPointsBySpaceID = function (id) {
|
||||
SpacePointService.getPointsBySpaceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.spacepoints = data;
|
||||
SpacePointService.getPointsBySpaceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spacepoints = response.data;
|
||||
} else {
|
||||
$scope.spacepoints = [];
|
||||
}
|
||||
|
|
@ -84,38 +84,20 @@ app.controller('SpacePointController', function ($scope, $common, $uibModal, $ti
|
|||
$scope.pairPoint = function (dragEl, dropEl) {
|
||||
var pointid = angular.element('#' + dragEl).scope().point.id;
|
||||
var spaceid = $scope.currentSpaceID;
|
||||
SpacePointService.addPair(spaceid, pointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpacePointService.addPair(spaceid, pointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsBySpaceID($scope.currentSpaceID);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -128,38 +110,20 @@ app.controller('SpacePointController', function ($scope, $common, $uibModal, $ti
|
|||
}
|
||||
var spacepointid = angular.element('#' + dragEl).scope().spacepoint.id;
|
||||
var spaceid = $scope.currentSpaceID;
|
||||
SpacePointService.deletePair(spaceid, spacepointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpacePointService.deletePair(spaceid, spacepointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsBySpaceID($scope.currentSpaceID);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -170,9 +134,9 @@ app.controller('SpacePointController', function ($scope, $common, $uibModal, $ti
|
|||
$scope.getAllSpaces();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceSensorController', function ($scope, $common, $uibModal, $timeout, $translate, SpaceService, SensorService, SpaceSensorService, toaster, SweetAlert) {
|
||||
app.controller('SpaceSensorController', function ($scope, $translate, SpaceService, SensorService, SpaceSensorService, toaster, SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.sensors = [];
|
||||
$scope.spacesensors = [];
|
||||
|
||||
$scope.getAllSensors = function () {
|
||||
SensorService.getAllSensors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.sensors = data;
|
||||
SensorService.getAllSensors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.sensors = response.data;
|
||||
} else {
|
||||
$scope.sensors = [];
|
||||
}
|
||||
|
|
@ -17,9 +17,9 @@ app.controller('SpaceSensorController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -51,9 +51,9 @@ app.controller('SpaceSensorController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getSensorsBySpaceID = function (id) {
|
||||
SpaceSensorService.getSensorsBySpaceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.spacesensors = data;
|
||||
SpaceSensorService.getSensorsBySpaceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spacesensors = response.data;
|
||||
} else {
|
||||
$scope.spacesensors = [];
|
||||
}
|
||||
|
|
@ -63,38 +63,20 @@ app.controller('SpaceSensorController', function ($scope, $common, $uibModal, $t
|
|||
$scope.pairSensor = function (dragEl, dropEl) {
|
||||
var sensorid = angular.element('#' + dragEl).scope().sensor.id;
|
||||
var spaceid = $scope.currentSpaceID;
|
||||
SpaceSensorService.addPair(spaceid, sensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceSensorService.addPair(spaceid, sensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsBySpaceID($scope.currentSpaceID);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -107,38 +89,19 @@ app.controller('SpaceSensorController', function ($scope, $common, $uibModal, $t
|
|||
}
|
||||
var spacesensorid = angular.element('#' + dragEl).scope().spacesensor.id;
|
||||
var spaceid = $scope.currentSpaceID;
|
||||
SpaceSensorService.deletePair(spaceid, spacesensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceSensorService.deletePair(spaceid, spacesensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsBySpaceID($scope.currentSpaceID);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -149,9 +112,9 @@ app.controller('SpaceSensorController', function ($scope, $common, $uibModal, $t
|
|||
$scope.getAllSpaces();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceShopfloorController', function($scope,$common ,$timeout, $translate, SpaceService, ShopfloorService, SpaceShopfloorService, toaster,SweetAlert) {
|
||||
app.controller('SpaceShopfloorController', function($scope, $translate, SpaceService, ShopfloorService, SpaceShopfloorService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.shopfloors = [];
|
||||
|
|
@ -8,9 +8,9 @@ app.controller('SpaceShopfloorController', function($scope,$common ,$timeout, $t
|
|||
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -43,9 +43,9 @@ app.controller('SpaceShopfloorController', function($scope,$common ,$timeout, $t
|
|||
|
||||
$scope.getShopfloorsBySpaceID = function(id) {
|
||||
$scope.spaceshopfloors=[];
|
||||
SpaceShopfloorService.getShopfloorsBySpaceID(id,function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaceshopfloors=$scope.spaceshopfloors.concat(data);
|
||||
SpaceShopfloorService.getShopfloorsBySpaceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaceshopfloors = $scope.spaceshopfloors.concat(response.data);
|
||||
} else {
|
||||
$scope.spaceshopfloors=[];
|
||||
}
|
||||
|
|
@ -53,9 +53,9 @@ app.controller('SpaceShopfloorController', function($scope,$common ,$timeout, $t
|
|||
};
|
||||
|
||||
$scope.getAllShopfloors = function() {
|
||||
ShopfloorService.getAllShopfloors(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.shopfloors = data;
|
||||
ShopfloorService.getAllShopfloors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.shopfloors = response.data;
|
||||
} else {
|
||||
$scope.shopfloors = [];
|
||||
}
|
||||
|
|
@ -65,37 +65,20 @@ app.controller('SpaceShopfloorController', function($scope,$common ,$timeout, $t
|
|||
$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(error,status){
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.BIND_SHOPFLOOR_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceShopfloorService.addPair(spaceid,shopfloorid, function (response){
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_SHOPFLOOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getShopfloorsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -109,37 +92,20 @@ app.controller('SpaceShopfloorController', function($scope,$common ,$timeout, $t
|
|||
var spaceshopfloorid = angular.element('#' + dragEl).scope().spaceshopfloor.id;
|
||||
var spaceid = angular.element(spacetreewithshopfloor).jstree(true).get_top_selected();
|
||||
|
||||
SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.UNBIND_SHOPFLOOR_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_SHOPFLOOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getShopfloorsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -150,9 +116,9 @@ app.controller('SpaceShopfloorController', function($scope,$common ,$timeout, $t
|
|||
$scope.getAllShopfloors();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceStoreController', function($scope,$common ,$timeout, $translate, SpaceService, StoreService, SpaceStoreService, toaster,SweetAlert) {
|
||||
app.controller('SpaceStoreController', function($scope, $translate, SpaceService, StoreService, SpaceStoreService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.stores = [];
|
||||
|
|
@ -8,9 +8,9 @@ app.controller('SpaceStoreController', function($scope,$common ,$timeout, $trans
|
|||
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -43,9 +43,9 @@ app.controller('SpaceStoreController', function($scope,$common ,$timeout, $trans
|
|||
|
||||
$scope.getStoresBySpaceID = function(id) {
|
||||
$scope.spacestores=[];
|
||||
SpaceStoreService.getStoresBySpaceID(id,function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spacestores=$scope.spacestores.concat(data);
|
||||
SpaceStoreService.getStoresBySpaceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spacestores = $scope.spacestores.concat(response.data);
|
||||
} else {
|
||||
$scope.spacestores=[];
|
||||
}
|
||||
|
|
@ -53,9 +53,9 @@ app.controller('SpaceStoreController', function($scope,$common ,$timeout, $trans
|
|||
};
|
||||
|
||||
$scope.getAllStores = function() {
|
||||
StoreService.getAllStores(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.stores = data;
|
||||
StoreService.getAllStores(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.stores = response.data;
|
||||
} else {
|
||||
$scope.stores = [];
|
||||
}
|
||||
|
|
@ -65,37 +65,21 @@ app.controller('SpaceStoreController', function($scope,$common ,$timeout, $trans
|
|||
$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(error,status){
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.BIND_STORE_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceStoreService.addPair(spaceid,storeid, function (response){
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_STORE_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getStoresBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -109,37 +93,20 @@ app.controller('SpaceStoreController', function($scope,$common ,$timeout, $trans
|
|||
var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id;
|
||||
var spaceid = angular.element(spacetreewithstore).jstree(true).get_top_selected();
|
||||
|
||||
SpaceStoreService.deletePair(spaceid, spacestoreid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.UNBIND_STORE_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceStoreService.deletePair(spaceid, spacestoreid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_STORE_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getStoresBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -150,9 +117,9 @@ app.controller('SpaceStoreController', function($scope,$common ,$timeout, $trans
|
|||
$scope.getAllStores();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('SpaceTenantController', function($scope,$common ,$timeout, $translate, SpaceService, TenantService, SpaceTenantService, toaster,SweetAlert) {
|
||||
app.controller('SpaceTenantController', function($scope, $translate, SpaceService, TenantService, SpaceTenantService, toaster,SweetAlert) {
|
||||
$scope.spaces = [];
|
||||
$scope.currentSpaceID = 1;
|
||||
$scope.tenants = [];
|
||||
|
|
@ -8,9 +8,9 @@ app.controller('SpaceTenantController', function($scope,$common ,$timeout, $tran
|
|||
|
||||
|
||||
$scope.getAllSpaces = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -43,9 +43,9 @@ app.controller('SpaceTenantController', function($scope,$common ,$timeout, $tran
|
|||
|
||||
$scope.getTenantsBySpaceID = function(id) {
|
||||
$scope.spacetenants=[];
|
||||
SpaceTenantService.getTenantsBySpaceID(id,function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spacetenants=$scope.spacetenants.concat(data);
|
||||
SpaceTenantService.getTenantsBySpaceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spacetenants = $scope.spacetenants.concat(response.data);
|
||||
} else {
|
||||
$scope.spacetenants=[];
|
||||
}
|
||||
|
|
@ -53,9 +53,9 @@ app.controller('SpaceTenantController', function($scope,$common ,$timeout, $tran
|
|||
};
|
||||
|
||||
$scope.getAllTenants = function() {
|
||||
TenantService.getAllTenants(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.tenants = data;
|
||||
TenantService.getAllTenants(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenants = response.data;
|
||||
} else {
|
||||
$scope.tenants = [];
|
||||
}
|
||||
|
|
@ -65,37 +65,20 @@ app.controller('SpaceTenantController', function($scope,$common ,$timeout, $tran
|
|||
$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(error,status){
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.BIND_TENANT_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceTenantService.addPair(spaceid,tenantid, function (response){
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_TENANT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getTenantsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -109,37 +92,20 @@ app.controller('SpaceTenantController', function($scope,$common ,$timeout, $tran
|
|||
var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id;
|
||||
var spaceid = angular.element(spacetreewithtenant).jstree(true).get_top_selected();
|
||||
|
||||
SpaceTenantService.deletePair(spaceid, spacetenantid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = "TOASTER.UNBIND_TENANT_SUCCESS";
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
SpaceTenantService.deletePair(spaceid, spacetenantid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_TENANT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getTenantsBySpaceID(spaceid);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -150,9 +116,9 @@ app.controller('SpaceTenantController', function($scope,$common ,$timeout, $tran
|
|||
$scope.getAllTenants();
|
||||
|
||||
$scope.refreshSpaceTree = function() {
|
||||
SpaceService.getAllSpaces(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('StoreController', function($scope,$common,$translate,$uibModal, CostCenterService, ContactService, StoreService, StoreTypeService, toaster,SweetAlert) {
|
||||
app.controller('StoreController', function($scope,$translate,$uibModal, CostCenterService, ContactService, StoreService, StoreTypeService, toaster,SweetAlert) {
|
||||
|
||||
$scope.getAllCostCenters = function() {
|
||||
CostCenterService.getAllCostCenters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('StoreController', function($scope,$common,$translate,$uibModal,
|
|||
};
|
||||
|
||||
$scope.getAllContacts = function() {
|
||||
ContactService.getAllContacts(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.contacts = data;
|
||||
ContactService.getAllContacts(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.contacts = response.data;
|
||||
} else {
|
||||
$scope.contacts = [];
|
||||
}
|
||||
|
|
@ -23,9 +23,9 @@ app.controller('StoreController', function($scope,$common,$translate,$uibModal,
|
|||
};
|
||||
|
||||
$scope.getAllStores = function() {
|
||||
StoreService.getAllStores(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.stores = data;
|
||||
StoreService.getAllStores(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.stores = response.data;
|
||||
} else {
|
||||
$scope.stores = [];
|
||||
}
|
||||
|
|
@ -33,9 +33,9 @@ app.controller('StoreController', function($scope,$common,$translate,$uibModal,
|
|||
};
|
||||
|
||||
$scope.getAllStoreTypes = function() {
|
||||
StoreTypeService.getAllStoreTypes(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.storetypes = data;
|
||||
StoreTypeService.getAllStoreTypes(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.storetypes = response.data;
|
||||
} else {
|
||||
$scope.storetypes = [];
|
||||
}
|
||||
|
|
@ -64,43 +64,20 @@ $scope.getAllStoreTypes = function() {
|
|||
if (angular.isDefined(store.is_input_counted) == false) {
|
||||
store.is_input_counted = false;
|
||||
}
|
||||
StoreService.addStore(store, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "COMMON.STORE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
StoreService.addStore(store, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("COMMON.STORE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit('handleEmitStoreChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.STORE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant(popBody,{"TOASTER.ERROR_ADD_BODY": $translate.instant("COMMON.STORE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -134,42 +111,20 @@ $scope.getAllStoreTypes = function() {
|
|||
if (angular.isDefined(store.is_input_counted) == false) {
|
||||
store.is_input_counted = false;
|
||||
}
|
||||
StoreService.editStore(modifiedStore, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.STORE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
StoreService.editStore(modifiedStore, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("COMMON.STORE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitStoreChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.STORE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("COMMON.STORE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -181,81 +136,51 @@ $scope.getAllStoreTypes = function() {
|
|||
|
||||
$scope.deleteStore=function(store){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true },
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
StoreService.deleteStore(store, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.STORE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitStoreChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
StoreService.deleteStore(store, 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("COMMON.STORE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitStoreChanged');
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}else {
|
||||
var templateName = "COMMON.STORE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("COMMON.STORE")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
$scope.getAllStores();
|
||||
$scope.getAllStoreTypes();
|
||||
$scope.getAllStores();
|
||||
$scope.getAllStoreTypes();
|
||||
$scope.getAllCostCenters();
|
||||
$scope.getAllContacts();
|
||||
$scope.$on('handleBroadcastStoreChanged', function(event) {
|
||||
$scope.getAllStores();
|
||||
$scope.getAllStores();
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('StoreMeterController', function($scope,$common ,$timeout,$uibModal, $translate,
|
||||
app.controller('StoreMeterController', function($scope,$timeout, $translate,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService,
|
||||
StoreMeterService,
|
||||
StoreService,
|
||||
toaster,SweetAlert) {
|
||||
toaster) {
|
||||
$scope.currentStore = {selected:undefined};
|
||||
|
||||
$scope.getAllStores = function(id) {
|
||||
StoreService.getAllStores(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.stores = data;
|
||||
StoreService.getAllStores(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.stores = response.data;
|
||||
} else {
|
||||
$scope.stores = [];
|
||||
}
|
||||
|
|
@ -29,12 +29,12 @@ app.controller('StoreMeterController', function($scope,$common ,$timeout,$uibMod
|
|||
var metertypes=['meters','virtualmeters','offlinemeters'];
|
||||
$scope.storemeters=[];
|
||||
angular.forEach(metertypes,function(value,index){
|
||||
StoreMeterService.getMetersByStoreID(id, value,function(error, data) {
|
||||
if (!error) {
|
||||
angular.forEach(data,function(item,indx){
|
||||
data[indx].metertype=value;
|
||||
StoreMeterService.getMetersByStoreID(id, value, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
angular.forEach(response.data,function(item,indx){
|
||||
response.data[indx].metertype = value;
|
||||
});
|
||||
$scope.storemeters=$scope.storemeters.concat(data);
|
||||
$scope.storemeters=$scope.storemeters.concat(response.data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -66,9 +66,9 @@ app.controller('StoreMeterController', function($scope,$common ,$timeout,$uibMod
|
|||
|
||||
|
||||
$scope.getAllMeters = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.currentMeterType="meters";
|
||||
$timeout(function(){
|
||||
$scope.changeMeterType();
|
||||
|
|
@ -82,9 +82,9 @@ app.controller('StoreMeterController', function($scope,$common ,$timeout,$uibMod
|
|||
|
||||
|
||||
$scope.getAllOfflineMeters = function() {
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
|
|
@ -93,9 +93,9 @@ app.controller('StoreMeterController', function($scope,$common ,$timeout,$uibMod
|
|||
};
|
||||
|
||||
$scope.getAllVirtualMeters = function() {
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
|
|
@ -106,39 +106,20 @@ app.controller('StoreMeterController', function($scope,$common ,$timeout,$uibMod
|
|||
$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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
StoreMeterService.addPair(storeid, meterid, $scope.currentMeterType, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant(popBody),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByStoreID($scope.currentStore.id);
|
||||
} else {
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -152,38 +133,20 @@ app.controller('StoreMeterController', function($scope,$common ,$timeout,$uibMod
|
|||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
StoreMeterService.deletePair(storeid, storemeterid, metertype, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByStoreID($scope.currentStore.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('StorePointController', function ($scope, $common, $uibModal, $timeout, $translate, StoreService, DataSourceService, PointService, StorePointService, toaster, SweetAlert) {
|
||||
app.controller('StorePointController', function ($scope, $translate, StoreService, DataSourceService, PointService, StorePointService, toaster, SweetAlert) {
|
||||
$scope.currentStore = {selected:undefined};
|
||||
$scope.getAllDataSources = function () {
|
||||
DataSourceService.getAllDataSources(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -17,9 +17,9 @@ app.controller('StorePointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function (id) {
|
||||
PointService.getPointsByDataSourceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -27,9 +27,9 @@ app.controller('StorePointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getPointsByStoreID = function (id) {
|
||||
StorePointService.getPointsByStoreID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.storepoints = data;
|
||||
StorePointService.getPointsByStoreID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.storepoints = response.data;
|
||||
} else {
|
||||
$scope.storepoints = [];
|
||||
}
|
||||
|
|
@ -49,9 +49,9 @@ app.controller('StorePointController', function ($scope, $common, $uibModal, $ti
|
|||
};
|
||||
|
||||
$scope.getAllStores = function () {
|
||||
StoreService.getAllStores(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.stores = data;
|
||||
StoreService.getAllStores(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.stores = response.data;
|
||||
} else {
|
||||
$scope.stores = [];
|
||||
}
|
||||
|
|
@ -62,38 +62,20 @@ app.controller('StorePointController', function ($scope, $common, $uibModal, $ti
|
|||
$scope.pairPoint = function (dragEl, dropEl) {
|
||||
var pointid = angular.element('#' + dragEl).scope().point.id;
|
||||
var storeid = $scope.currentStore.id;
|
||||
StorePointService.addPair(storeid, pointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
StorePointService.addPair(storeid, pointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByStoreID($scope.currentStore.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -106,39 +88,20 @@ app.controller('StorePointController', function ($scope, $common, $uibModal, $ti
|
|||
}
|
||||
var storepointid = angular.element('#' + dragEl).scope().storepoint.id;
|
||||
var storeid = $scope.currentStore.id;
|
||||
StorePointService.deletePair(storeid, storepointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
StorePointService.deletePair(storeid, storepointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByStoreID($scope.currentStore.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('StoreSensorController', function ($scope, $common, $uibModal, $timeout, $translate, StoreService, SensorService, StoreSensorService, toaster, SweetAlert) {
|
||||
app.controller('StoreSensorController', function ($scope, $translate, StoreService, SensorService, StoreSensorService, toaster, SweetAlert) {
|
||||
$scope.currentStore = {selected:undefined};
|
||||
|
||||
$scope.getAllSensors = function () {
|
||||
SensorService.getAllSensors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.sensors = data;
|
||||
SensorService.getAllSensors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.sensors = response.data;
|
||||
} else {
|
||||
$scope.sensors = [];
|
||||
}
|
||||
|
|
@ -14,66 +14,48 @@ app.controller('StoreSensorController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getSensorsByStoreID = function (id) {
|
||||
StoreSensorService.getSensorsByStoreID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.storesensors = data;
|
||||
StoreSensorService.getSensorsByStoreID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.storesensors = response.data;
|
||||
} else {
|
||||
$scope.storesensors = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.changeStore=function(item,model){
|
||||
$scope.currentStore=item;
|
||||
$scope.currentStore.selected=model;
|
||||
$scope.getSensorsByStoreID($scope.currentStore.id);
|
||||
};
|
||||
$scope.changeStore=function(item,model){
|
||||
$scope.currentStore=item;
|
||||
$scope.currentStore.selected=model;
|
||||
$scope.getSensorsByStoreID($scope.currentStore.id);
|
||||
};
|
||||
|
||||
$scope.getAllStores = function () {
|
||||
StoreService.getAllStores(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.stores = data;
|
||||
} else {
|
||||
$scope.stores = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
$scope.getAllStores = function () {
|
||||
StoreService.getAllStores(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.stores = response.data;
|
||||
} else {
|
||||
$scope.stores = [];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.pairSensor = function (dragEl, dropEl) {
|
||||
var sensorid = angular.element('#' + dragEl).scope().sensor.id;
|
||||
var storeid = $scope.currentStore.id;
|
||||
StoreSensorService.addPair(storeid, sensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
StoreSensorService.addPair(storeid, sensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsByStoreID($scope.currentStore.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -86,38 +68,20 @@ app.controller('StoreSensorController', function ($scope, $common, $uibModal, $t
|
|||
}
|
||||
var storesensorid = angular.element('#' + dragEl).scope().storesensor.id;
|
||||
var storeid = $scope.currentStore.id;
|
||||
StoreSensorService.deletePair(storeid, storesensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
StoreSensorService.deletePair(storeid, storesensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsByStoreID($scope.currentStore.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('FlatController', function($scope,$common,$uibModal,$translate, FlatService,toaster,SweetAlert) {
|
||||
app.controller('FlatController', function($scope,$uibModal,$translate, FlatService,toaster,SweetAlert) {
|
||||
|
||||
|
||||
$scope.getAllFlats = function() {
|
||||
FlatService.getAllFlats(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.flats = data;
|
||||
FlatService.getAllFlats(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.flats = response.data;
|
||||
} else {
|
||||
$scope.flats = [];
|
||||
}
|
||||
|
|
@ -28,42 +28,20 @@ app.controller('FlatController', function($scope,$common,$uibModal,$translate, F
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(flat) {
|
||||
FlatService.addFlat(flat, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "TOASTER.FLAT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
FlatService.addFlat(flat, function(response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
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 {
|
||||
var templateName = "TOASTER.FLAT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("TOASTER.FLAT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -89,42 +67,20 @@ app.controller('FlatController', function($scope,$common,$uibModal,$translate, F
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedFlat) {
|
||||
FlatService.editFlat(modifiedFlat,function(error,status){
|
||||
if(angular.isDefined(status) && status==200){
|
||||
var templateName = "TOASTER.FLAT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
FlatService.editFlat(modifiedFlat, function (response) {
|
||||
if(angular.isDefined(response.status) && response.status === 200){
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
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{
|
||||
var templateName = "TOASTER.FLAT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("TOASTER.FLAT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -136,53 +92,31 @@ app.controller('FlatController', function($scope,$common,$uibModal,$translate, F
|
|||
|
||||
$scope.deleteFlat=function(flat){
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
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(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "TOASTER.FLAT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
FlatService.deleteFlat(flat, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
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 {
|
||||
var templateName = "TOASTER.FLAT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("TOASTER.FLAT")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TariffController', function($scope, $common,$uibModal,$translate, TARIFF_TYPE, PEAK_TYPE, TariffService, CategoryService, toaster, SweetAlert) {
|
||||
app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_TYPE, PEAK_TYPE, TariffService, CategoryService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllCategories = function() {
|
||||
CategoryService.getAllCategories(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.categories = data;
|
||||
CategoryService.getAllCategories(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.categories = response.data;
|
||||
} else {
|
||||
$scope.categories = [];
|
||||
}
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('TariffController', function($scope, $common,$uibModal,$translate
|
|||
|
||||
};
|
||||
$scope.getAllTariffs = function() {
|
||||
TariffService.getAllTariffs(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.tariffs = data;
|
||||
TariffService.getAllTariffs(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tariffs = response.data;
|
||||
} else {
|
||||
$scope.tariffs = [];
|
||||
}
|
||||
|
|
@ -42,42 +42,20 @@ app.controller('TariffController', function($scope, $common,$uibModal,$translate
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function(tariff) {
|
||||
TariffService.addTariff(tariff, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "SETTING.TARIFF";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
TariffService.addTariff(tariff, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY",{template: $translate.instant("SETTING.TARIFF")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllTariffs();
|
||||
} else {
|
||||
var templateName = "SETTING.TARIFF";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("SETTING.TARIFF")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -104,42 +82,20 @@ app.controller('TariffController', function($scope, $common,$uibModal,$translate
|
|||
});
|
||||
|
||||
modalInstance.result.then(function(modifiedTariff) {
|
||||
TariffService.editTariff(modifiedTariff, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "SETTING.TARIFF";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
TariffService.editTariff(modifiedTariff, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("SETTING.TARIFF")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllTariffs();
|
||||
} else {
|
||||
var templateName = "SETTING.TARIFF";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody,{template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("SETTING.TARIFF")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -151,54 +107,32 @@ app.controller('TariffController', function($scope, $common,$uibModal,$translate
|
|||
|
||||
$scope.deleteTariff = function(tariff) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function(isConfirm) {
|
||||
if (isConfirm) {
|
||||
TariffService.deleteTariff(tariff, function(error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.TARIFF";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
TariffService.deleteTariff(tariff, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("SETTING.TARIFF")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllTariffs();
|
||||
} else {
|
||||
var templateName = "SETTING.TARIFF";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, {template: templateName});
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("SETTING.TARIFF")}),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TenantController', function ($scope, $common, $translate, $uibModal, CostCenterService, ContactService, TenantService, TenantTypeService, toaster, SweetAlert) {
|
||||
app.controller('TenantController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, TenantService, TenantTypeService, toaster, SweetAlert) {
|
||||
|
||||
$scope.getAllCostCenters = function () {
|
||||
CostCenterService.getAllCostCenters(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.costcenters = data;
|
||||
CostCenterService.getAllCostCenters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.costcenters = response.data;
|
||||
} else {
|
||||
$scope.costcenters = [];
|
||||
}
|
||||
|
|
@ -13,9 +13,9 @@ app.controller('TenantController', function ($scope, $common, $translate, $uibMo
|
|||
};
|
||||
|
||||
$scope.getAllContacts = function () {
|
||||
ContactService.getAllContacts(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.contacts = data;
|
||||
ContactService.getAllContacts(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.contacts = response.data;
|
||||
} else {
|
||||
$scope.contacts = [];
|
||||
}
|
||||
|
|
@ -23,9 +23,9 @@ app.controller('TenantController', function ($scope, $common, $translate, $uibMo
|
|||
};
|
||||
|
||||
$scope.getAllTenants = function () {
|
||||
TenantService.getAllTenants(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.tenants = data;
|
||||
TenantService.getAllTenants(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenants = response.data;
|
||||
} else {
|
||||
$scope.tenants = [];
|
||||
}
|
||||
|
|
@ -33,9 +33,9 @@ app.controller('TenantController', function ($scope, $common, $translate, $uibMo
|
|||
};
|
||||
|
||||
$scope.getAllTenantTypes = function () {
|
||||
TenantTypeService.getAllTenantTypes(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.tenanttypes = data;
|
||||
TenantTypeService.getAllTenantTypes(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenanttypes = response.data;
|
||||
} else {
|
||||
$scope.tenanttypes = [];
|
||||
}
|
||||
|
|
@ -70,43 +70,20 @@ app.controller('TenantController', function ($scope, $common, $translate, $uibMo
|
|||
if (angular.isDefined(tenant.is_in_lease) == false) {
|
||||
tenant.is_in_lease = false;
|
||||
}
|
||||
TenantService.addTenant(tenant, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var templateName = "COMMON.TENANT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
TenantService.addTenant(tenant, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", { template: $translate.instant("COMMON.TENANT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.$emit('handleEmitTenantChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.TENANT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", { template: $translate.instant("COMMON.TENANT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -146,42 +123,20 @@ app.controller('TenantController', function ($scope, $common, $translate, $uibMo
|
|||
if (angular.isDefined(tenant.is_in_lease) == false) {
|
||||
tenant.is_in_lease = false;
|
||||
}
|
||||
TenantService.editTenant(modifiedTenant, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "COMMON.TENANT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
TenantService.editTenant(modifiedTenant, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("COMMON.TENANT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitTenantChanged');
|
||||
} else {
|
||||
var templateName = "COMMON.TENANT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("COMMON.TENANT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -193,69 +148,39 @@ app.controller('TenantController', function ($scope, $common, $translate, $uibMo
|
|||
|
||||
$scope.deleteTenant = function (tenant) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
TenantService.deleteTenant(tenant, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "COMMON.TENANT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
TenantService.deleteTenant(tenant, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", { template: $translate.instant("COMMON.TENANT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.$emit('handleEmitTenantChanged');
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "COMMON.TENANT";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", { template: $translate.instant("COMMON.TENANT") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TenantMeterController', function($scope,$common ,$timeout,$uibModal, $translate,
|
||||
app.controller('TenantMeterController', function($scope,$timeout, $translate,
|
||||
MeterService,
|
||||
VirtualMeterService,
|
||||
OfflineMeterService,
|
||||
TenantMeterService,
|
||||
TenantService,
|
||||
toaster,SweetAlert) {
|
||||
toaster) {
|
||||
$scope.currentTenant = {selected:undefined};
|
||||
|
||||
$scope.getAllTenants = function(id) {
|
||||
TenantService.getAllTenants(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.tenants = data;
|
||||
TenantService.getAllTenants(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenants = response.data;
|
||||
} else {
|
||||
$scope.tenants = [];
|
||||
}
|
||||
|
|
@ -29,12 +29,12 @@ app.controller('TenantMeterController', function($scope,$common ,$timeout,$uibMo
|
|||
var metertypes=['meters','virtualmeters','offlinemeters'];
|
||||
$scope.tenantmeters=[];
|
||||
angular.forEach(metertypes,function(value,index){
|
||||
TenantMeterService.getMetersByTenantID(id, value,function(error, data) {
|
||||
if (!error) {
|
||||
angular.forEach(data,function(item,indx){
|
||||
data[indx].metertype=value;
|
||||
TenantMeterService.getMetersByTenantID(id, value, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
angular.forEach(response.data,function(item,indx){
|
||||
response.data[indx].metertype = value;
|
||||
});
|
||||
$scope.tenantmeters=$scope.tenantmeters.concat(data);
|
||||
$scope.tenantmeters=$scope.tenantmeters.concat(response.data);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -66,9 +66,9 @@ app.controller('TenantMeterController', function($scope,$common ,$timeout,$uibMo
|
|||
|
||||
|
||||
$scope.getAllMeters = function() {
|
||||
MeterService.getAllMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.meters = data;
|
||||
MeterService.getAllMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.meters = response.data;
|
||||
$scope.currentMeterType="meters";
|
||||
$timeout(function(){
|
||||
$scope.changeMeterType();
|
||||
|
|
@ -82,9 +82,9 @@ app.controller('TenantMeterController', function($scope,$common ,$timeout,$uibMo
|
|||
|
||||
|
||||
$scope.getAllOfflineMeters = function() {
|
||||
OfflineMeterService.getAllOfflineMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.offlinemeters = data;
|
||||
OfflineMeterService.getAllOfflineMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.offlinemeters = response.data;
|
||||
} else {
|
||||
$scope.offlinemeters = [];
|
||||
}
|
||||
|
|
@ -93,9 +93,9 @@ app.controller('TenantMeterController', function($scope,$common ,$timeout,$uibMo
|
|||
};
|
||||
|
||||
$scope.getAllVirtualMeters = function() {
|
||||
VirtualMeterService.getAllVirtualMeters(function(error, data) {
|
||||
if (!error) {
|
||||
$scope.virtualmeters = data;
|
||||
VirtualMeterService.getAllVirtualMeters(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.virtualmeters = response.data;
|
||||
} else {
|
||||
$scope.virtualmeters = [];
|
||||
}
|
||||
|
|
@ -106,39 +106,20 @@ app.controller('TenantMeterController', function($scope,$common ,$timeout,$uibMo
|
|||
$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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
TenantMeterService.addPair(tenantid, meterid, $scope.currentMeterType, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByTenantID($scope.currentTenant.id);
|
||||
} else {
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -152,38 +133,20 @@ app.controller('TenantMeterController', function($scope,$common ,$timeout,$uibMo
|
|||
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 (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_METER_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
TenantMeterService.deletePair(tenantid, tenantmeterid, metertype, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_METER_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getMetersByTenantID($scope.currentTenant.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(erresponse.dataror.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TenantPointController', function ($scope, $common, $uibModal, $timeout, $translate, TenantService, DataSourceService, PointService, TenantPointService, toaster, SweetAlert) {
|
||||
app.controller('TenantPointController', function ($scope, $translate, TenantService, DataSourceService, PointService, TenantPointService, toaster, SweetAlert) {
|
||||
$scope.currentTenant = {selected:undefined};
|
||||
$scope.getAllDataSources = function () {
|
||||
DataSourceService.getAllDataSources(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.datasources = data;
|
||||
DataSourceService.getAllDataSources(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.datasources = response.data;
|
||||
if ($scope.datasources.length > 0) {
|
||||
$scope.currentDataSource = $scope.datasources[0].id;
|
||||
$scope.getPointsByDataSourceID($scope.currentDataSource);
|
||||
|
|
@ -17,9 +17,9 @@ app.controller('TenantPointController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getPointsByDataSourceID = function (id) {
|
||||
PointService.getPointsByDataSourceID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.points = data;
|
||||
PointService.getPointsByDataSourceID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.points = response.data;
|
||||
} else {
|
||||
$scope.points = [];
|
||||
}
|
||||
|
|
@ -27,9 +27,9 @@ app.controller('TenantPointController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getPointsByTenantID = function (id) {
|
||||
TenantPointService.getPointsByTenantID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.tenantpoints = data;
|
||||
TenantPointService.getPointsByTenantID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenantpoints = response.data;
|
||||
} else {
|
||||
$scope.tenantpoints = [];
|
||||
}
|
||||
|
|
@ -49,9 +49,9 @@ app.controller('TenantPointController', function ($scope, $common, $uibModal, $t
|
|||
};
|
||||
|
||||
$scope.getAllTenants = function () {
|
||||
TenantService.getAllTenants(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.tenants = data;
|
||||
TenantService.getAllTenants(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenants = response.data;
|
||||
} else {
|
||||
$scope.tenants = [];
|
||||
}
|
||||
|
|
@ -62,38 +62,20 @@ app.controller('TenantPointController', function ($scope, $common, $uibModal, $t
|
|||
$scope.pairPoint = function (dragEl, dropEl) {
|
||||
var pointid = angular.element('#' + dragEl).scope().point.id;
|
||||
var tenantid = $scope.currentTenant.id;
|
||||
TenantPointService.addPair(tenantid, pointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
TenantPointService.addPair(tenantid, pointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByTenantID($scope.currentTenant.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -106,39 +88,20 @@ app.controller('TenantPointController', function ($scope, $common, $uibModal, $t
|
|||
}
|
||||
var tenantpointid = angular.element('#' + dragEl).scope().tenantpoint.id;
|
||||
var tenantid = $scope.currentTenant.id;
|
||||
TenantPointService.deletePair(tenantid, tenantpointid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_POINT_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
TenantPointService.deletePair(tenantid, tenantpointid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_POINT_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getPointsByTenantID($scope.currentTenant.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('TenantSensorController', function ($scope, $common, $uibModal, $timeout, $translate, TenantService, SensorService, TenantSensorService, toaster, SweetAlert) {
|
||||
app.controller('TenantSensorController', function ($scope, $translate, TenantService, SensorService, TenantSensorService, toaster, SweetAlert) {
|
||||
$scope.currentTenant = {selected:undefined};
|
||||
|
||||
$scope.getAllSensors = function () {
|
||||
SensorService.getAllSensors(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.sensors = data;
|
||||
SensorService.getAllSensors(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.sensors = response.data;
|
||||
} else {
|
||||
$scope.sensors = [];
|
||||
}
|
||||
|
|
@ -14,9 +14,9 @@ app.controller('TenantSensorController', function ($scope, $common, $uibModal, $
|
|||
};
|
||||
|
||||
$scope.getSensorsByTenantID = function (id) {
|
||||
TenantSensorService.getSensorsByTenantID(id, function (error, data) {
|
||||
if (!error) {
|
||||
$scope.tenantsensors = data;
|
||||
TenantSensorService.getSensorsByTenantID(id, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenantsensors = response.data;
|
||||
} else {
|
||||
$scope.tenantsensors = [];
|
||||
}
|
||||
|
|
@ -30,9 +30,9 @@ app.controller('TenantSensorController', function ($scope, $common, $uibModal, $
|
|||
};
|
||||
|
||||
$scope.getAllTenants = function () {
|
||||
TenantService.getAllTenants(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.tenants = data;
|
||||
TenantService.getAllTenants(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.tenants = response.data;
|
||||
} else {
|
||||
$scope.tenants = [];
|
||||
}
|
||||
|
|
@ -42,38 +42,20 @@ app.controller('TenantSensorController', function ($scope, $common, $uibModal, $
|
|||
$scope.pairSensor = function (dragEl, dropEl) {
|
||||
var sensorid = angular.element('#' + dragEl).scope().sensor.id;
|
||||
var tenantid = $scope.currentTenant.id;
|
||||
TenantSensorService.addPair(tenantid, sensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.BIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
TenantSensorService.addPair(tenantid, sensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.BIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsByTenantID($scope.currentTenant.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -86,38 +68,20 @@ app.controller('TenantSensorController', function ($scope, $common, $uibModal, $
|
|||
}
|
||||
var tenantsensorid = angular.element('#' + dragEl).scope().tenantsensor.id;
|
||||
var tenantid = $scope.currentTenant.id;
|
||||
TenantSensorService.deletePair(tenantid, tenantsensorid, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = 'TOASTER.UNBIND_SENSOR_SUCCESS';
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
TenantSensorService.deletePair(tenantid, tenantsensorid, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.UNBIND_SENSOR_SUCCESS"),
|
||||
showCloseButton: true,
|
||||
});
|
||||
|
||||
$scope.getSensorsByTenantID($scope.currentTenant.id);
|
||||
} else {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,18 +1,15 @@
|
|||
'use strict';
|
||||
|
||||
app.controller('PrivilegeController', function ($scope,
|
||||
$common,
|
||||
$uibModal,
|
||||
PrivilegeService,
|
||||
UserService,
|
||||
SpaceService,
|
||||
toaster,
|
||||
$translate,
|
||||
SweetAlert) {
|
||||
$scope.getAllPrivileges = function () {
|
||||
PrivilegeService.getAllPrivileges(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.privileges = data;
|
||||
PrivilegeService.getAllPrivileges(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.privileges = response.data;
|
||||
} else {
|
||||
$scope.privileges = [];
|
||||
}
|
||||
|
|
@ -34,42 +31,20 @@ app.controller('PrivilegeController', function ($scope,
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function (privilege) {
|
||||
PrivilegeService.addPrivilege(privilege, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "USER.PRIVILEGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
PrivilegeService.addPrivilege(privilege, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", { template: $translate.instant("USER.PRIVILEGE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllPrivileges();
|
||||
} else {
|
||||
var templateName = "USER.PRIVILEGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", { template: $translate.instant("USER.PRIVILEGE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -95,42 +70,20 @@ app.controller('PrivilegeController', function ($scope,
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedPrivilege) {
|
||||
PrivilegeService.editPrivilege(modifiedPrivilege, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "USER.PRIVILEGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
PrivilegeService.editPrivilege(modifiedPrivilege, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("USER.PRIVILEGE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllPrivileges();
|
||||
} else {
|
||||
var templateName = "USER.PRIVILEGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("USER.PRIVILEGE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -142,75 +95,45 @@ app.controller('PrivilegeController', function ($scope,
|
|||
|
||||
$scope.deletePrivilege = function (privilege) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
PrivilegeService.deletePrivilege(privilege, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "USER.PRIVILEGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllPrivileges();
|
||||
} else if (angular.isDefined(status) && status == 400) {
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = error.title;
|
||||
var popBody = error.description;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody);
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
var templateName = "USER.PRIVILEGE";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
PrivilegeService.deletePrivilege(privilege, 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("USER.PRIVILEGE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllPrivileges();
|
||||
} else if (angular.isDefined(response.status) && response.status === 400) {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant(response.data.title),
|
||||
body: $translate.instant(response.data.description),
|
||||
showCloseButton: true,
|
||||
});
|
||||
} else {
|
||||
toaster.pop({
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", { template: $translate.instant("USER.PRIVILEGE") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
$scope.getAllPrivileges();
|
||||
|
|
@ -230,9 +153,9 @@ app.controller('ModalAddPrivilegeCtrl', function ($scope,
|
|||
$scope.privilege = {};
|
||||
|
||||
$scope.getAllSpaces = function () {
|
||||
SpaceService.getAllSpaces(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
@ -289,9 +212,9 @@ app.controller('ModalEditPrivilegeCtrl', function ($scope,
|
|||
console.log($scope.currentSpaceID)
|
||||
|
||||
$scope.getAllSpaces = function () {
|
||||
SpaceService.getAllSpaces(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.spaces = data;
|
||||
SpaceService.getAllSpaces(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.spaces = response.data;
|
||||
} else {
|
||||
$scope.spaces = [];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
app.controller('UserController', function ($scope,
|
||||
$window,
|
||||
$common,
|
||||
$uibModal,
|
||||
UserService,
|
||||
PrivilegeService,
|
||||
|
|
@ -12,20 +11,19 @@ app.controller('UserController', function ($scope,
|
|||
|
||||
$scope.cur_user = JSON.parse($window.localStorage.getItem("currentUser"));
|
||||
$scope.getAllUsers = function () {
|
||||
UserService.getAllUsers(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.users = data;
|
||||
UserService.getAllUsers(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.users = response.data;
|
||||
} else {
|
||||
$scope.users = [];
|
||||
}
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
$scope.getAllPrivileges = function () {
|
||||
PrivilegeService.getAllPrivileges(function (error, data) {
|
||||
if (!error) {
|
||||
$scope.privileges = data;
|
||||
PrivilegeService.getAllPrivileges(function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
$scope.privileges = response.data;
|
||||
} else {
|
||||
$scope.privileges = [];
|
||||
}
|
||||
|
|
@ -47,42 +45,20 @@ app.controller('UserController', function ($scope,
|
|||
}
|
||||
});
|
||||
modalInstance.result.then(function (user) {
|
||||
UserService.addUser(user, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 201) {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
UserService.addUser(user, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 201) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllUsers();
|
||||
} else {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_add_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_ADD_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -108,42 +84,20 @@ app.controller('UserController', function ($scope,
|
|||
});
|
||||
|
||||
modalInstance.result.then(function (modifiedUser) {
|
||||
UserService.editUser(modifiedUser, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
UserService.editUser(modifiedUser, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllUsers();
|
||||
} else {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -174,42 +128,20 @@ app.controller('UserController', function ($scope,
|
|||
|
||||
let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token };
|
||||
|
||||
UserService.resetPassword(data, headers, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 200) {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
UserService.resetPassword(data, headers, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 200) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllUsers();
|
||||
} else {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_update_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_UPDATE_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
@ -221,54 +153,32 @@ app.controller('UserController', function ($scope,
|
|||
|
||||
$scope.deleteUser = function (user) {
|
||||
SweetAlert.swal({
|
||||
title: $translate.instant($common.sweet.title),
|
||||
text: $translate.instant($common.sweet.text),
|
||||
title: $translate.instant("SWEET.TITLE"),
|
||||
text: $translate.instant("SWEET.TEXT"),
|
||||
type: "warning",
|
||||
showCancelButton: true,
|
||||
confirmButtonColor: "#DD6B55",
|
||||
confirmButtonText: $translate.instant($common.sweet.confirmButtonText),
|
||||
cancelButtonText: $translate.instant($common.sweet.cancelButtonText),
|
||||
confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"),
|
||||
cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"),
|
||||
closeOnConfirm: true,
|
||||
closeOnCancel: true
|
||||
},
|
||||
function (isConfirm) {
|
||||
if (isConfirm) {
|
||||
UserService.deleteUser(user, function (error, status) {
|
||||
if (angular.isDefined(status) && status == 204) {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.SUCCESS';
|
||||
var popTitle = $common.toaster.success_title;
|
||||
var popBody = $common.toaster.success_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
UserService.deleteUser(user, function (response) {
|
||||
if (angular.isDefined(response.status) && response.status === 204) {
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "success",
|
||||
title: $translate.instant("TOASTER.SUCCESS_TITLE"),
|
||||
body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
$scope.getAllUsers();
|
||||
} else {
|
||||
var templateName = "SETTING.USER";
|
||||
templateName = $translate.instant(templateName);
|
||||
|
||||
var popType = 'TOASTER.ERROR';
|
||||
var popTitle = $common.toaster.error_title;
|
||||
var popBody = $common.toaster.error_delete_body;
|
||||
|
||||
popType = $translate.instant(popType);
|
||||
popTitle = $translate.instant(popTitle);
|
||||
popBody = $translate.instant(popBody, { template: templateName });
|
||||
|
||||
toaster.pop({
|
||||
type: popType,
|
||||
title: popTitle,
|
||||
body: popBody,
|
||||
type: "error",
|
||||
title: $translate.instant("TOASTER.FAILURE_TITLE"),
|
||||
body: $translate.instant("TOASTER.ERROR_DELETE_BODY", { template: $translate.instant("SETTING.USER") }),
|
||||
showCloseButton: true,
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,90 +1,90 @@
|
|||
var module = angular.module("hjc.directives.dragdrop", ['hjc.services']);
|
||||
|
||||
module.directive('hjcDraggable', ['$rootScope', 'uuid', function($rootScope, uuid) {
|
||||
return {
|
||||
restrict: 'A',
|
||||
link: function(scope, el, attrs, controller) {
|
||||
//console.log("linking draggable element");
|
||||
return {
|
||||
restrict: 'A',
|
||||
link: function(scope, el, attrs, controller) {
|
||||
//console.log("linking draggable element");
|
||||
|
||||
angular.element(el).attr("draggable", "true");
|
||||
var id = angular.element(el).attr("id");
|
||||
if (!id) {
|
||||
id = uuid.new()
|
||||
angular.element(el).attr("id", id);
|
||||
}
|
||||
|
||||
el.bind("dragstart", function(e) {
|
||||
//console.log("The dragstart event handler fired, and evt.target = " + e.target);
|
||||
e.dataTransfer.setData('text', id);
|
||||
angular.element(el).attr("draggable", "true");
|
||||
var id = angular.element(el).attr("id");
|
||||
if (!id) {
|
||||
id = uuid.new()
|
||||
angular.element(el).attr("id", id);
|
||||
}
|
||||
|
||||
el.bind("dragstart", function(e) {
|
||||
//console.log("The dragstart event handler fired, and evt.target = " + e.target);
|
||||
e.dataTransfer.setData('text', id);
|
||||
|
||||
$rootScope.$emit("HJC-DRAG-START");
|
||||
});
|
||||
|
||||
el.bind("dragend", function(e) {
|
||||
$rootScope.$emit("HJC-DRAG-END");
|
||||
});
|
||||
}
|
||||
}
|
||||
}]);
|
||||
$rootScope.$emit("HJC-DRAG-START");
|
||||
});
|
||||
|
||||
el.bind("dragend", function(e) {
|
||||
$rootScope.$emit("HJC-DRAG-END");
|
||||
});
|
||||
}
|
||||
}
|
||||
}]);
|
||||
|
||||
module.directive('hjcDropTarget', ['$rootScope', 'uuid', function($rootScope, uuid) {
|
||||
return {
|
||||
restrict: 'A',
|
||||
scope: {
|
||||
onDrop: '&'
|
||||
},
|
||||
link: function(scope, el, attrs, controller) {
|
||||
var id = angular.element(el).attr("id");
|
||||
if (!id) {
|
||||
id = uuid.new()
|
||||
angular.element(el).attr("id", id);
|
||||
}
|
||||
|
||||
el.bind("dragover", function(e) {
|
||||
if (e.preventDefault) {
|
||||
e.preventDefault(); // Necessary. Allows us to drop.
|
||||
}
|
||||
|
||||
e.dataTransfer.dropEffect = 'move'; // See the section on the DataTransfer object.
|
||||
return false;
|
||||
});
|
||||
|
||||
el.bind("dragenter", function(e) {
|
||||
// this / e.target is the current hover target.
|
||||
angular.element(e.target).addClass('hjc-over');
|
||||
});
|
||||
|
||||
el.bind("dragleave", function(e) {
|
||||
angular.element(e.target).removeClass('hjc-over'); // this / e.target is previous target element.
|
||||
});
|
||||
|
||||
el.bind("drop", function(e) {
|
||||
if (e.preventDefault) {
|
||||
e.preventDefault(); // Necessary. Allows us to drop.
|
||||
}
|
||||
return {
|
||||
restrict: 'A',
|
||||
scope: {
|
||||
onDrop: '&'
|
||||
},
|
||||
link: function(scope, el, attrs, controller) {
|
||||
var id = angular.element(el).attr("id");
|
||||
if (!id) {
|
||||
id = uuid.new()
|
||||
angular.element(el).attr("id", id);
|
||||
}
|
||||
|
||||
el.bind("dragover", function(e) {
|
||||
if (e.preventDefault) {
|
||||
e.preventDefault(); // Necessary. Allows us to drop.
|
||||
}
|
||||
|
||||
e.dataTransfer.dropEffect = 'move'; // See the section on the DataTransfer object.
|
||||
return false;
|
||||
});
|
||||
|
||||
el.bind("dragenter", function(e) {
|
||||
// this / e.target is the current hover target.
|
||||
angular.element(e.target).addClass('hjc-over');
|
||||
});
|
||||
|
||||
el.bind("dragleave", function(e) {
|
||||
angular.element(e.target).removeClass('hjc-over'); // this / e.target is previous target element.
|
||||
});
|
||||
|
||||
el.bind("drop", function(e) {
|
||||
if (e.preventDefault) {
|
||||
e.preventDefault(); // Necessary. Allows us to drop.
|
||||
}
|
||||
|
||||
if (e.stopPropogation) {
|
||||
e.stopPropogation(); // Necessary. Allows us to drop.
|
||||
}
|
||||
var data = e.dataTransfer.getData("text");
|
||||
//var dest = document.getElementById(id);
|
||||
//var src = document.getElementById(data);
|
||||
var dest=id;
|
||||
var src=data;
|
||||
|
||||
scope.onDrop({dragEl: src, dropEl: dest});
|
||||
});
|
||||
if (e.stopPropogation) {
|
||||
e.stopPropogation(); // Necessary. Allows us to drop.
|
||||
}
|
||||
var data = e.dataTransfer.getData("text");
|
||||
//var dest = document.getElementById(id);
|
||||
//var src = document.getElementById(data);
|
||||
var dest=id;
|
||||
var src=data;
|
||||
|
||||
scope.onDrop({dragEl: src, dropEl: dest});
|
||||
});
|
||||
|
||||
$rootScope.$on("HJC-DRAG-START", function() {
|
||||
var el = document.getElementById(id);
|
||||
angular.element(el).addClass("hjc-target");
|
||||
});
|
||||
|
||||
$rootScope.$on("HJC-DRAG-END", function() {
|
||||
var el = document.getElementById(id);
|
||||
angular.element(el).removeClass("hjc-target");
|
||||
angular.element(el).removeClass("hjc-over");
|
||||
});
|
||||
}
|
||||
}
|
||||
}]);
|
||||
$rootScope.$on("HJC-DRAG-START", function() {
|
||||
var el = document.getElementById(id);
|
||||
angular.element(el).addClass("hjc-target");
|
||||
});
|
||||
|
||||
$rootScope.$on("HJC-DRAG-END", function() {
|
||||
var el = document.getElementById(id);
|
||||
angular.element(el).removeClass("hjc-target");
|
||||
angular.element(el).removeClass("hjc-over");
|
||||
});
|
||||
}
|
||||
}
|
||||
}]);
|
||||
|
|
@ -6,22 +6,20 @@ app.factory('EmailMessageAnalysisService', function($http) {
|
|||
var base="emailmessages";
|
||||
var url=base+"/from/"+query.datestart+"/to/"+query.dateend;
|
||||
$http.get(getAPI()+url)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteEmailMessage: function(emailmessage, callback) {
|
||||
$http.delete(getAPI()+'emailmessages/'+emailmessage.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,58 +2,52 @@
|
|||
app.factory('RuleService', function($http) {
|
||||
return {
|
||||
getAllRules:function(callback){
|
||||
$http.get(getAPI()+'rules')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
$http.get(getAPI()+'rules')
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchRules: function(query, callback) {
|
||||
$http.get(getAPI()+'rules', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
$http.get(getAPI()+'rules', { params: { q: query } })
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addRule: function(rule, callback) {
|
||||
$http.post(getAPI()+'rules',{data:rule})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
$http.post(getAPI()+'rules',{data:rule})
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editRule: function(rule, callback) {
|
||||
$http.put(getAPI()+'rules/'+rule.id,{data:rule})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
$http.put(getAPI()+'rules/'+rule.id,{data:rule})
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteRule: function(rule, callback) {
|
||||
$http.delete(getAPI()+'rules/'+rule.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getRule: function(id, callback) {
|
||||
$http.get(getAPI()+'rules/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
$http.get(getAPI()+'rules/'+id)
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -6,22 +6,20 @@ app.factory('TextMessageAnalysisService', function($http) {
|
|||
var base="textmessages";
|
||||
var url=base+"/from/"+query.datestart+"/to/"+query.dateend;
|
||||
$http.get(getAPI()+url)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteTextMessage: function(textmessage, callback) {
|
||||
$http.delete(getAPI()+'textmessages/'+textmessage.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,43 +6,39 @@ app.factory('WebMessageAnalysisService', function($http) {
|
|||
var base="webmessages";
|
||||
var url=base+"/from/"+query.datestart+"/to/"+query.dateend;
|
||||
$http.get(getAPI()+url)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
getStatusNewResult: function(callback) {
|
||||
var base="webmessagesnew";
|
||||
$http.get(getAPI()+base)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
editWebMessage: function(webmessage, callback) {
|
||||
$http.put(getAPI()+'webmessages/'+webmessage.id, {data:webmessage})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteWebMessage: function(webmessage, callback) {
|
||||
$http.delete(getAPI()+'webmessages/'+webmessage.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -6,22 +6,20 @@ app.factory('WechatMessageAnalysisService', function($http) {
|
|||
var base="wechatmessages";
|
||||
var url=base+"/from/"+query.datestart+"/to/"+query.dateend;
|
||||
$http.get(getAPI()+url)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteWechatMessage: function(wechatmessage, callback) {
|
||||
$http.delete(getAPI()+'wechatmessages/'+wechatmessage.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,24 +3,22 @@ app.factory('LoginService', function($http) {
|
|||
return {
|
||||
|
||||
login: function(user, callback) {
|
||||
$http.put(getAPI()+'users/login',{data:user})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(response,null,status,headers);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
$http.put(getAPI()+'users/login',{data:user})
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
logout: function(data, headers, callback) {
|
||||
console.log(data);
|
||||
console.log(headers);
|
||||
$http.put(getAPI()+'users/logout', {data}, {headers})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null,status,headers);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,58 +2,52 @@
|
|||
app.factory('CategoryService', function($http) {
|
||||
return {
|
||||
getAllCategories:function(callback){
|
||||
$http.get(getAPI()+'energycategories')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
$http.get(getAPI()+'energycategories')
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchCategories: function(query, callback) {
|
||||
$http.get(getAPI()+'energycategories', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
$http.get(getAPI()+'energycategories', { params: { q: query } })
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addCategory: function(category, callback) {
|
||||
$http.post(getAPI()+'energycategories',{data:category})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editCategory: function(category, callback) {
|
||||
$http.put(getAPI()+'energycategories/'+category.id,{data:category})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
$http.put(getAPI()+'energycategories/'+category.id,{data:category})
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteCategory: function(category, callback) {
|
||||
$http.delete(getAPI()+'energycategories/'+category.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getCategory: function(id, callback) {
|
||||
$http.get(getAPI()+'energycategories/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -3,57 +3,51 @@ app.factory('EnergyItemService', function($http) {
|
|||
return {
|
||||
getAllEnergyItems:function(callback){
|
||||
$http.get(getAPI()+'energyitems')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchEnergyItems: function(query, callback) {
|
||||
$http.get(getAPI()+'energyitems', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addEnergyItem: function(energyItem, callback) {
|
||||
$http.post(getAPI()+'energyitems',{data:energyItem})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editEnergyItem: function(energyItem, callback) {
|
||||
$http.put(getAPI()+'energyitems/'+energyItem.id,{data:energyItem})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteEnergyItem: function(energyItem, callback) {
|
||||
$http.delete(getAPI()+'energyitems/'+energyItem.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getEnergyItem: function(id, callback) {
|
||||
$http.get(getAPI()+'energyitems/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,57 +3,51 @@ app.factory('CombinedEquipmentService', function($http) {
|
|||
return {
|
||||
getAllCombinedEquipments:function(callback){
|
||||
$http.get(getAPI()+'combinedequipments')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchCombinedEquipments: function(query, callback) {
|
||||
$http.get(getAPI()+'combinedequipments', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addCombinedEquipment: function(combinedequipment, callback) {
|
||||
$http.post(getAPI()+'combinedequipments',{data:combinedequipment})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editCombinedEquipment: function(combinedequipment, callback) {
|
||||
$http.put(getAPI()+'combinedequipments/'+combinedequipment.id,{data:combinedequipment})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteCombinedEquipment: function(combinedequipment, callback) {
|
||||
$http.delete(getAPI()+'combinedequipments/'+combinedequipment.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getCombinedEquipment: function(id, callback) {
|
||||
$http.get(getAPI()+'combinedequipments/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,31 +3,28 @@ app.factory('CombinedEquipmentEquipmentService', function($http) {
|
|||
return {
|
||||
addPair: function(combinedequipmentID,equipmentID,callback) {
|
||||
$http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deletePair: function(combinedequipmentID, equipmentID, callback) {
|
||||
$http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments/'+equipmentID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getEquipmentsByCombinedEquipmentID: function(id, callback) {
|
||||
$http.get(getAPI()+'combinedequipments/'+id+'/equipments')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,31 +11,28 @@ app.factory('CombinedEquipmentMeterService', function ($http) {
|
|||
meter = { 'offline_meter_id': meterID, is_output: is_output };
|
||||
}
|
||||
$http.post(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype, { data: meter })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deletePair: function (combinedequipmentID, meterID, metertype, callback) {
|
||||
$http.delete(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype + '/' + meterID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getMetersByCombinedEquipmentID: function (id, metertype, callback) {
|
||||
$http.get(getAPI() + 'combinedequipments/' + id + '/' + metertype)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -4,40 +4,36 @@ app.factory('CombinedEquipmentParameterService', function($http) {
|
|||
|
||||
getParametersByCombinedEquipmentID: function(id, callback) {
|
||||
$http.get(getAPI()+'combinedequipments/'+id+'/parameters')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addCombinedEquipmentParameter: function(combinedequipmentID, combinedequipmentparameter,callback) {
|
||||
$http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters',{data:combinedequipmentparameter})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter,callback) {
|
||||
$http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteCombinedEquipmentParameter: function(combinedequipmentID, parameterID, callback) {
|
||||
$http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+parameterID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,57 +3,51 @@ app.factory('ContactService', function($http) {
|
|||
return {
|
||||
getAllContacts:function(callback){
|
||||
$http.get(getAPI()+'contacts')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchContacts: function(query, callback) {
|
||||
$http.get(getAPI()+'contacts', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addContact: function(contact, callback) {
|
||||
$http.post(getAPI()+'contacts',{data:contact})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editContact: function(contact, callback) {
|
||||
$http.put(getAPI()+'contacts/'+contact.id,{data:contact})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteContact: function(contact, callback) {
|
||||
$http.delete(getAPI()+'contacts/'+contact.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getContact: function(id, callback) {
|
||||
$http.get(getAPI()+'contacts/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,57 +3,51 @@ app.factory('CostCenterService', function($http) {
|
|||
return {
|
||||
getAllCostCenters:function(callback){
|
||||
$http.get(getAPI()+'costcenters')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchCostCenters: function(query, callback) {
|
||||
$http.get(getAPI()+'costcenters', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addCostCenter: function(costcenter, callback) {
|
||||
$http.post(getAPI()+'costcenters',{data:costcenter})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editCostCenter: function(costcenter, callback) {
|
||||
$http.put(getAPI()+'costcenters/'+costcenter.id,{data:costcenter})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteCostCenter: function(costcenter, callback) {
|
||||
$http.delete(getAPI()+'costcenters/'+costcenter.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getCostCenter: function(id, callback) {
|
||||
$http.get(getAPI()+'costcenters/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -3,31 +3,28 @@ app.factory('CostCenterTariffService', function($http) {
|
|||
return {
|
||||
addPair: function(costcenterid,tariffid,callback) {
|
||||
$http.post(getAPI()+'costcenters/'+costcenterid+'/tariffs',{data:{'tariff_id':tariffid}})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deletePair: function(costcenterid,tariffid, callback) {
|
||||
$http.delete(getAPI()+'costcenters/'+costcenterid+'/tariffs/'+tariffid)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getTariffsByCostCenterID: function(id, callback) {
|
||||
$http.get(getAPI()+'costcenters/'+id+'/tariffs')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -3,40 +3,36 @@ app.factory('CostFileService', function($http) {
|
|||
return {
|
||||
getAllCostFiles:function(callback){
|
||||
$http.get(getAPI()+'costfiles')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
addCostFile: function(costfile, callback) {
|
||||
$http.post(getAPI()+'costfiles',{data:costfile})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
restoreCostFile: function (costfile, callback) {
|
||||
$http.get(getAPI() + 'costfiles/' + costfile.id + '/restore')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e, status) {
|
||||
callback(e, status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteCostFile: function(costfile, callback) {
|
||||
$http.delete(getAPI()+'costfiles/'+costfile.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -3,57 +3,51 @@ app.factory('DataSourceService', function($http) {
|
|||
return {
|
||||
getAllDataSources:function(callback){
|
||||
$http.get(getAPI()+'datasources')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchDataSources: function(query, callback) {
|
||||
$http.get(getAPI()+'datasources', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addDataSource: function(datasource, callback) {
|
||||
$http.post(getAPI()+'datasources',{data:datasource})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editDataSource: function(datasource, callback) {
|
||||
$http.put(getAPI()+'datasources/'+datasource.id,{data:datasource})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteDataSource: function(datasource, callback) {
|
||||
$http.delete(getAPI()+'datasources/'+datasource.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getDataSource: function(id, callback) {
|
||||
$http.get(getAPI()+'datasources/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -3,57 +3,51 @@ app.factory('PointService', function($http) {
|
|||
return {
|
||||
getAllPoints:function(callback){
|
||||
$http.get(getAPI()+'points')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchPoints: function(query, callback) {
|
||||
$http.get(getAPI()+'points', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addPoint: function(point, callback) {
|
||||
$http.post(getAPI()+'points',{data:point})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editPoint: function(point, callback) {
|
||||
$http.put(getAPI()+'points/'+point.id,{data:point})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deletePoint: function(point, callback) {
|
||||
$http.delete(getAPI()+'points/'+point.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getPointsByDataSourceID: function(id, callback) {
|
||||
$http.get(getAPI()+'datasources/'+id+'/points')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
@ -3,49 +3,44 @@ app.factory('DistributionCircuitService', function($http) {
|
|||
return {
|
||||
getAllDistributionCircuits: function(callback) {
|
||||
$http.get(getAPI()+'distributioncircuits')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getDistributionCircuitsByDistributionSystemID: function(id, callback) {
|
||||
$http.get(getAPI()+'distributionsystems/'+id+'/distributioncircuits')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addDistributionCircuit: function(distributioncircuit,callback) {
|
||||
$http.post(getAPI()+'/distributioncircuits',{data:distributioncircuit})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editDistributionCircuit: function(distributioncircuit,callback) {
|
||||
$http.put(getAPI()+'/distributioncircuits/'+distributioncircuit.id,{data:distributioncircuit})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteDistributionCircuit: function(distributioncircuitID, callback) {
|
||||
$http.delete(getAPI()+'/distributioncircuits/'+distributioncircuitID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,31 +3,28 @@ app.factory('DistributionCircuitPointService', function($http) {
|
|||
return {
|
||||
addPair: function(distributioncircuitID,pointID,callback) {
|
||||
$http.post(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points',{data:{'point_id':pointID}})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deletePair: function(distributioncircuitID,pointID, callback) {
|
||||
$http.delete(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points/'+pointID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getPointsByDistributionCircuitID: function(id, callback) {
|
||||
$http.get(getAPI()+'distributioncircuits/'+id+'/points')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,57 +3,51 @@ app.factory('DistributionSystemService', function($http) {
|
|||
return {
|
||||
getAllDistributionSystems:function(callback){
|
||||
$http.get(getAPI()+'distributionsystems')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchDistributionSystems: function(query, callback) {
|
||||
$http.get(getAPI()+'distributionsystems', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addDistributionSystem: function(distributionsystem, callback) {
|
||||
$http.post(getAPI()+'distributionsystems',{data:distributionsystem})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editDistributionSystem: function(distributionsystem, callback) {
|
||||
$http.put(getAPI()+'distributionsystems/'+distributionsystem.id,{data:distributionsystem})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteDistributionSystem: function(distributionsystem, callback) {
|
||||
$http.delete(getAPI()+'distributionsystems/'+distributionsystem.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getDistributionSystem: function(id, callback) {
|
||||
$http.get(getAPI()+'distributionsystems/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,57 +3,51 @@ app.factory('EmailServerService', function($http) {
|
|||
return {
|
||||
getAllEmailServers:function(callback){
|
||||
$http.get(getAPI()+'emailservers')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchEmailServers: function(query, callback) {
|
||||
$http.get(getAPI()+'emailservers', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addEmailServer: function(emailserver, callback) {
|
||||
$http.post(getAPI()+'emailservers',{data:emailserver})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editEmailServer: function(emailserver, callback) {
|
||||
$http.put(getAPI()+'emailservers/'+emailserver.id,{data:emailserver})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteEmailServer: function(emailserver, callback) {
|
||||
$http.delete(getAPI()+'emailservers/'+emailserver.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getEmailServer: function(id, callback) {
|
||||
$http.get(getAPI()+'emailservers/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,57 +3,51 @@ app.factory('EnergyFlowDiagramService', function($http) {
|
|||
return {
|
||||
getAllEnergyFlowDiagrams:function(callback){
|
||||
$http.get(getAPI()+'energyflowdiagrams')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchEnergyFlowDiagrams: function(query, callback) {
|
||||
$http.get(getAPI()+'energyflowdiagrams', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addEnergyFlowDiagram: function(energyflowdiagram, callback) {
|
||||
$http.post(getAPI()+'energyflowdiagrams',{data:energyflowdiagram})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editEnergyFlowDiagram: function(energyflowdiagram, callback) {
|
||||
$http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id,{data:energyflowdiagram})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteEnergyFlowDiagram: function(energyflowdiagram, callback) {
|
||||
$http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getEnergyFlowDiagram: function(id, callback) {
|
||||
$http.get(getAPI()+'energyflowdiagrams/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -4,40 +4,36 @@ app.factory('EnergyFlowDiagramLinkService', function($http) {
|
|||
|
||||
getLinksByEnergyFlowDiagramID: function(id, callback) {
|
||||
$http.get(getAPI()+'energyflowdiagrams/'+id+'/links')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addEnergyFlowDiagramLink: function(energyflowdiagramID, energyflowdiagramlink, callback) {
|
||||
$http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links',{data:energyflowdiagramlink})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editEnergyFlowDiagramLink: function(energyflowdiagramID,energyflowdiagramlink,callback) {
|
||||
$http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+energyflowdiagramlink.id,{data:energyflowdiagramlink})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteEnergyFlowDiagramLink: function(energyflowdiagramID, linkID, callback) {
|
||||
$http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+linkID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,40 +3,36 @@ app.factory('EnergyFlowDiagramNodeService', function($http) {
|
|||
return {
|
||||
getNodesByEnergyFlowDiagramID: function(id, callback) {
|
||||
$http.get(getAPI()+'energyflowdiagrams/'+id+'/nodes')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addEnergyFlowDiagramNode: function(energyflowdiagramID, energyflowdiagramnode,callback) {
|
||||
$http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes',{data:energyflowdiagramnode})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editEnergyFlowDiagramNode: function(energyflowdiagramID,energyflowdiagramnode,callback) {
|
||||
$http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+energyflowdiagramnode.id,{data:energyflowdiagramnode})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deleteEnergyFlowDiagramNode: function(energyflowdiagramID, nodeID, callback) {
|
||||
$http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+nodeID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,57 +3,51 @@ app.factory('EquipmentService', function($http) {
|
|||
return {
|
||||
getAllEquipments:function(callback){
|
||||
$http.get(getAPI()+'equipments')
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
searchEquipments: function(query, callback) {
|
||||
$http.get(getAPI()+'equipments', { params: { q: query } })
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
addEquipment: function(equipment, callback) {
|
||||
$http.post(getAPI()+'equipments',{data:equipment})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
editEquipment: function(equipment, callback) {
|
||||
$http.put(getAPI()+'equipments/'+equipment.id,{data:equipment})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
deleteEquipment: function(equipment, callback) {
|
||||
$http.delete(getAPI()+'equipments/'+equipment.id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getEquipment: function(id, callback) {
|
||||
$http.get(getAPI()+'equipments/'+id)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e,status) {
|
||||
callback(e,status);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,31 +11,28 @@ app.factory('EquipmentMeterService', function($http) {
|
|||
meter={'offline_meter_id':meterID,is_output:is_output};
|
||||
}
|
||||
$http.post(getAPI()+'equipments/'+equipmentID+'/'+metertype,{data:meter})
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
|
||||
deletePair: function(equipmentID,meterID,metertype, callback) {
|
||||
$http.delete(getAPI()+'equipments/'+equipmentID+'/'+metertype+'/'+meterID)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, status);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
},
|
||||
getMetersByEquipmentID: function(id,metertype, callback) {
|
||||
$http.get(getAPI()+'equipments/'+id+'/'+ metertype)
|
||||
.success(function (response, status, headers, config) {
|
||||
callback(null, response);
|
||||
})
|
||||
.error(function (e) {
|
||||
callback(e);
|
||||
});
|
||||
.then(function (response) {
|
||||
callback(response);
|
||||
}, function (response) {
|
||||
callback(response);
|
||||
});
|
||||
}
|
||||
};
|
||||
});
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue