X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fpolicy-models%2FEditor%2FPolicyTemplateController%2FBRMSRawPolicyController.js;h=695cb423d5b2457612e0bd9bee1b622198508599;hp=451d2ea4f7982f944732580b3dfced096529ff68;hb=a61c10945456dde51397d354379257c7d0d01fb2;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
index 451d2ea4f..695cb423d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,145 +17,141 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-angular.module('abs').controller('brmsRawPolicyController', ['$scope', '$window', 'PolicyAppService', 'policyNavigator', 'modalService', '$modal', 'Notification', function ($scope, $window, PolicyAppService, PolicyNavigator, modalService, $modal, Notification) {
+angular.module('abs').controller('brmsRawPolicyController',
+    ['$scope', '$window', 'PolicyAppService', 'policyNavigator', 'modalService', '$modal', 'Notification', 
+    function ($scope, $window, PolicyAppService, PolicyNavigator, modalService, $modal, Notification) {
     $("#dialog").hide();
     
     $scope.policyNavigator;
     $scope.savebutton = true;
     $scope.refreshCheck = false;
     
+    if(!$scope.temp.policy.editPolicy  && !$scope.temp.policy.readOnly){
+    $scope.temp.policy = {
+        policyType : "Config",
+        configPolicyType : "BRMS_Raw"
+    }
+    }
+    
     $scope.refresh = function(){
-    	if($scope.refreshCheck){
-    		$scope.policyNavigator.refresh();
-    	}
-    	$scope.modal('createNewPolicy', true);
-    	$scope.temp.policy = "";
+    if($scope.refreshCheck){
+        $scope.policyNavigator.refresh();
+    }
+    $scope.modal('createNewPolicy', true);
+    $scope.temp.policy = "";
     };
     
     $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');
+    }
+    });
+    
     PolicyAppService.getData('getDictionary/get_BRMSControllerDataByName').then(function (data) {
-    	var j = data;
-    	$scope.data = JSON.parse(j.data);
-    	console.log($scope.data);
-    	$scope.brmsControllerDatas = JSON.parse($scope.data.brmsControllerDictionaryDatas);
-    	console.log($scope.brmsControllerDatas);
-    }, function (error) {
-    	console.log("failed");
+    var j = data;
+    $scope.data = JSON.parse(j.data);
+    $scope.brmsControllerDatas = JSON.parse($scope.data.brmsControllerDictionaryDatas);
     });
 
     PolicyAppService.getData('getDictionary/get_BRMSDependencyDataByName').then(function (data) {
-    	var j = data;
-    	$scope.data = JSON.parse(j.data);
-    	console.log($scope.data);
-    	$scope.brmsDependencyDatas = JSON.parse($scope.data.brmsDependencyDictionaryDatas);
-    	console.log($scope.brmsDependencyDatas);
-    }, function (error) {
-    	console.log("failed");
+    var j = data;
+    $scope.data = JSON.parse(j.data);
+    $scope.brmsDependencyDatas = JSON.parse($scope.data.brmsDependencyDictionaryDatas);
     });
 
     PolicyAppService.getData('getDictionary/get_RiskTypeDataByName').then(function (data) {
-    	var j = data;
-    	$scope.data = JSON.parse(j.data);
-    	console.log($scope.data);
-    	$scope.riskTypeDictionaryDatas = JSON.parse($scope.data.riskTypeDictionaryDatas);
-    	console.log($scope.riskTypeDictionaryDatas);
-    }, function (error) {
-    	console.log("failed");
+    var j = data;
+    $scope.data = JSON.parse(j.data);
+    $scope.riskTypeDictionaryDatas = JSON.parse($scope.data.riskTypeDictionaryDatas);
     });
 
     $scope.saveBrmsRawPolicy = function(policy){
-    	if(policy.itemContent != undefined){
-    		$scope.refreshCheck = true; 
-        	$scope.policyNavigator = policy.itemContent;
-        	policy.itemContent = "";
-    	}
+    if(policy.itemContent != undefined){
+        $scope.refreshCheck = true; 
+        $scope.policyNavigator = policy.itemContent;
+        policy.itemContent = "";
+    }
         $scope.savebutton = false;
         var uuu = "policycreation/save_policy";
-		var postData={policyData: policy};
-		$.ajax({
-			type : 'POST',
-			url : uuu,
-			dataType: 'json',
-			contentType: 'application/json',
-			data: JSON.stringify(postData),
-			success : function(data){
-				$scope.$apply(function(){
-					$scope.data=data.policyData;
-					if($scope.data == 'success'){
-						$scope.temp.policy.readOnly = 'true';
-						Notification.success("Policy Saved Successfully.");	
-					}else if ($scope.data == 'PolicyExists'){
-						$scope.savebutton = true;
-						Notification.error("Policy Already Exists with Same Name in Scope.");
-					}
-				});
-				console.log($scope.data);
-			},
-			error : function(data){
-				Notification.error("Error Occured while saving Policy.");
-				$scope.savebutton = true;
-			}
-		});
+    var postData={policyData: policy};
+    $.ajax({
+    type : 'POST',
+    url : uuu,
+    dataType: 'json',
+    contentType: 'application/json',
+    data: JSON.stringify(postData),
+    success : function(data){
+        $scope.$apply(function(){
+        $scope.data=data.policyData;
+        if($scope.data == 'success'){
+            $scope.temp.policy.readOnly = 'true';
+            Notification.success("Policy Saved Successfully.");	
+        }else if ($scope.data == 'PolicyExists'){
+            $scope.savebutton = true;
+            Notification.error("Policy Already Exists with Same Name in Scope.");
+        }
+        });
+    },
+    error : function(data){
+        Notification.error("Error Occured while saving Policy.");
+        $scope.savebutton = true;
+    }
+    });
     };
     
     $scope.validatePolicy = function(policy){
-    	console.log(policy);
-    	document.getElementById("validate").innerHTML = "";
+    document.getElementById("validate").innerHTML = "";
          var uuu = "policyController/validate_policy.htm";
- 		var postData={policyData: policy};
- 		$.ajax({
- 			type : 'POST',
- 			url : uuu,
- 			dataType: 'json',
- 			contentType: 'application/json',
- 			data: JSON.stringify(postData),
- 			success : function(data){
- 				$scope.$apply(function(){
- 					$scope.validateData = data.data.replace(/\"/g, "");
-						$scope.data=data.data.substring(1,8);
- 						var size = data.data.length;
- 						if($scope.data == 'success'){
- 							Notification.success("Validation Success.");
- 							$scope.savebutton = false;
- 							if (size > 18){
- 								var displayWarning = data.data.substring(19,size);
- 								document.getElementById("validate").innerHTML = "Safe Policy Warning Message  :  "+displayWarning;
- 								document.getElementById("validate").style.color = "white";
- 								document.getElementById("validate").style.backgroundColor = "skyblue";
- 							}	
- 						}else{
- 							Notification.error("Validation Failed.");
- 							document.getElementById("validate").innerHTML = $scope.validateData;
- 							document.getElementById("validate").style.color = "white";
- 							document.getElementById("validate").style.backgroundColor = "red";
- 							$scope.savebutton = true;
- 						}
- 						
- 				});
- 				console.log($scope.data);
- 			},
- 			error : function(data){
- 				Notification.error("Validation Failed.");
- 			}
- 		});
+     var postData={policyData: policy};
+     $.ajax({
+     type : 'POST',
+     url : uuu,
+     dataType: 'json',
+     contentType: 'application/json',
+     data: JSON.stringify(postData),
+     success : function(data){
+         $scope.$apply(function(){
+         $scope.validateData = data.data.replace(/\"/g, "");
+            $scope.data=data.data.substring(1,8);
+             var size = data.data.length;
+             if($scope.data == 'success'){
+             Notification.success("Validation Success.");
+             $scope.savebutton = false;
+             if (size > 18){
+                 var displayWarning = data.data.substring(19,size);
+                 document.getElementById("validate").innerHTML = "Safe Policy Warning Message  :  "+displayWarning;
+                 document.getElementById("validate").style.color = "white";
+                 document.getElementById("validate").style.backgroundColor = "skyblue";
+             }	
+             }else{
+             Notification.error("Validation Failed.");
+             document.getElementById("validate").innerHTML = $scope.validateData;
+             document.getElementById("validate").style.color = "white";
+             document.getElementById("validate").style.backgroundColor = "red";
+             $scope.savebutton = true;
+             }
+             
+         });
+     },
+     error : function(data){
+         Notification.error("Validation Failed.");
+     }
+     });
     };
     
-    function extend(obj, src) {
-        for (var key in src) {
-            if (src.hasOwnProperty(key)) obj[key] = src[key];
-        }
-        return obj;
-    }
-
     if(!$scope.temp.policy.editPolicy  && !$scope.temp.policy.readOnly){
-    	$scope.temp.policy.attributes = [];
+    $scope.temp.policy.attributes = [];
     }else{
-	   if($scope.temp.policy.attributes.length == 0){
-		   $scope.temp.policy.attributes = [];
-	   }
+    if($scope.temp.policy.attributes.length == 0){
+       $scope.temp.policy.attributes = [];
+    }
    }
     $scope.attributeDatas = [{"attributes" : $scope.temp.policy.attributes}];
     $scope.addNewChoice = function() {
@@ -166,4 +162,4 @@ angular.module('abs').controller('brmsRawPolicyController', ['$scope', '$window'
       var lastItem = $scope.temp.policy.attributes.length-1;
       $scope.temp.policy.attributes.splice(lastItem);
     };
-}]);
\ No newline at end of file
+}]);