Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Resolved Policy GUI Issues
[policy/engine.git]
/
POLICY-SDK-APP
/
src
/
main
/
webapp
/
app
/
policyApp
/
policy-models
/
Editor
/
PolicyTemplateController
/
ClosedLoopFaultController.js
diff --git
a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
index
8f054ed
..
b3f702f
100644
(file)
--- a/
POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
+++ b/
POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
@@
-1,6
+1,6
@@
/*-
* ============LICENSE_START=======================================================
/*-
* ============LICENSE_START=======================================================
- *
ECOM
P Policy Engine
+ *
ONA
P Policy Engine
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* ================================================================================
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
* ================================================================================
@@
-35,6
+35,15
@@
angular.module("abs").controller('clFaultController', ['$scope', '$window', 'Pol
$scope.modal = function(id, hide) {
return $('#' + id).modal(hide ? 'hide' : 'show');
};
$scope.modal = function(id, hide) {
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
if($scope.temp.policy.triggerTrapSignatures == undefined){
$scope.temp.policy.triggerTrapSignatures = [];
if($scope.temp.policy.triggerTrapSignatures == undefined){
$scope.temp.policy.triggerTrapSignatures = [];
@@
-234,7
+243,7
@@
angular.module("abs").controller('clFaultController', ['$scope', '$window', 'Pol
}
if($scope.jsonData.verificationSignaturesUsedForUI != null){
if($scope.jsonData.verificationSignaturesUsedForUI.signatures != null){
}
if($scope.jsonData.verificationSignaturesUsedForUI != null){
if($scope.jsonData.verificationSignaturesUsedForUI.signatures != null){
- $scope.temp.policy.triggerfaultSignatures = {Fault1 : [], Fault2 : [], Fault3 : [], Fault4 : [], Fault5 : [], Fault6 : []
,
};
+ $scope.temp.policy.triggerfaultSignatures = {Fault1 : [], Fault2 : [], Fault3 : [], Fault4 : [], Fault5 : [], Fault6 : []};
var splitTraps = $scope.jsonData.verificationSignaturesUsedForUI.signatures.split("#!?!");
if(splitTraps.length > 1){
$scope.verificationdisabled = false;
var splitTraps = $scope.jsonData.verificationSignaturesUsedForUI.signatures.split("#!?!");
if(splitTraps.length > 1){
$scope.verificationdisabled = false;
@@
-429,12
+438,12
@@
angular.module("abs").controller('clFaultController', ['$scope', '$window', 'Pol
}
}
- PolicyAppService.getData('getDictionary/get_
Ecom
pNameDataByName').then(function (data) {
+ PolicyAppService.getData('getDictionary/get_
Ona
pNameDataByName').then(function (data) {
var j = data;
$scope.data = JSON.parse(j.data);
console.log($scope.data);
var j = data;
$scope.data = JSON.parse(j.data);
console.log($scope.data);
- $scope.
ecompNameDictionaryDatas = JSON.parse($scope.data.ecom
pNameDictionaryDatas);
- console.log($scope.
ecom
pNameDictionaryDatas);
+ $scope.
onapNameDictionaryDatas = JSON.parse($scope.data.ona
pNameDictionaryDatas);
+ console.log($scope.
ona
pNameDictionaryDatas);
}, function (error) {
console.log("failed");
});
}, function (error) {
console.log("failed");
});
@@
-530,7
+539,7
@@
angular.module("abs").controller('clFaultController', ['$scope', '$window', 'Pol
}
if($scope.temp.policy.triggerTrapSignatures.length == 3 || $scope.temp.policy.triggerTrapSignatures["Trap3"] != null){
var data = {trap1 : $scope.temp.policy.triggerTrapSignatures.Trap1, trap2 : $scope.temp.policy.triggerTrapSignatures.Trap2,
}
if($scope.temp.policy.triggerTrapSignatures.length == 3 || $scope.temp.policy.triggerTrapSignatures["Trap3"] != null){
var data = {trap1 : $scope.temp.policy.triggerTrapSignatures.Trap1, trap2 : $scope.temp.policy.triggerTrapSignatures.Trap2,
- trap
2
: $scope.temp.policy.triggerTrapSignatures.Trap3}
+ trap
3
: $scope.temp.policy.triggerTrapSignatures.Trap3}
}
if($scope.temp.policy.triggerTrapSignatures.length == 4 || $scope.temp.policy.triggerTrapSignatures["Trap4"] != null){
var data = {trap1 : $scope.temp.policy.triggerTrapSignatures.Trap1, trap2 : $scope.temp.policy.triggerTrapSignatures.Trap2,
}
if($scope.temp.policy.triggerTrapSignatures.length == 4 || $scope.temp.policy.triggerTrapSignatures["Trap4"] != null){
var data = {trap1 : $scope.temp.policy.triggerTrapSignatures.Trap1, trap2 : $scope.temp.policy.triggerTrapSignatures.Trap2,
@@
-555,7
+564,7
@@
angular.module("abs").controller('clFaultController', ['$scope', '$window', 'Pol
}
if($scope.temp.policy.triggerfaultSignatures.length == 3 || $scope.temp.policy.triggerfaultSignatures["Fault3"] != null){
var faultData = {trap1 : $scope.temp.policy.triggerfaultSignatures.Fault1, trap2 : $scope.temp.policy.triggerfaultSignatures.Fault2,
}
if($scope.temp.policy.triggerfaultSignatures.length == 3 || $scope.temp.policy.triggerfaultSignatures["Fault3"] != null){
var faultData = {trap1 : $scope.temp.policy.triggerfaultSignatures.Fault1, trap2 : $scope.temp.policy.triggerfaultSignatures.Fault2,
- trap
2
: $scope.temp.policy.triggerfaultSignatures.Fault3}
+ trap
3
: $scope.temp.policy.triggerfaultSignatures.Fault3}
}
if($scope.temp.policy.triggerTrapSignatures.length == 4 || $scope.temp.policy.triggerfaultSignatures["Fault4"] != null){
var faultData = {trap1 : $scope.temp.policy.triggerfaultSignatures.Fault1, trap2 : $scope.temp.policy.triggerfaultSignatures.Fault2,
}
if($scope.temp.policy.triggerTrapSignatures.length == 4 || $scope.temp.policy.triggerfaultSignatures["Fault4"] != null){
var faultData = {trap1 : $scope.temp.policy.triggerfaultSignatures.Fault1, trap2 : $scope.temp.policy.triggerfaultSignatures.Fault2,