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%2Fcontroller%2FdictionaryController%2FMSHeaderDefaultValuesDictController.js;h=ce84afd84ce4f3fdcc7b629e22488323f417997e;hp=883ac2508001a971b85bbf8790093b1221492dde;hb=a61c10945456dde51397d354379257c7d0d01fb2;hpb=cb802d83533ff13886f08b6b9ecb8827bb86d90c

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js
index 883ac2508..ce84afd84 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryController/MSHeaderDefaultValuesDictController.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018, 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,117 +17,91 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-app.controller('editMSHeaderDefaultValuesController' ,  function ($scope, $modalInstance, message, PolicyAppService, UserInfoServiceDS2, Notification){
-	   if(message.modelAttributeDictionaryData==null)
-	        $scope.label='Set Header Default Values'
-	    else{
-	        $scope.label='Edit Header Default Values'
-	        $scope.disableCd=true;
-	    }
+app.controller('editMSHeaderDefaultValuesController' ,  
+    function ($scope, $modalInstance, message, PolicyAppService, UserInfoServiceDS2, Notification){
+       if(message.modelAttributeDictionaryData==null)
+            $scope.label='Set Header Default Values'
+        else{
+            $scope.label='Edit Header Default Values'
+            $scope.disableCd=true;
+        }
 
-	    PolicyAppService.getData('getDictionary/get_MicroServiceHeaderDefaultsData').then(function (data) {
-	    	var j = data;
-	    	$scope.data = JSON.parse(j.data);
-	    	console.log($scope.data);
-	    	$scope.microServiceHeaderDefaultDatas = JSON.parse($scope.data.microServiceHeaderDefaultDatas);
-	    	console.log("microServiceHeaderDefaultDatas:" + $scope.microServiceHeaderDefaultDatas);
-	    }, function (error) {
-	    	console.log("failed");
-	    });
+        PolicyAppService.getData('getDictionary/get_MicroServiceHeaderDefaultsData').then(function (data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            $scope.microServiceHeaderDefaultDatas = JSON.parse($scope.data.microServiceHeaderDefaultDatas);
+        });
 
-	    PolicyAppService.getData('getDictionary/get_MicroServiceModelsDataServiceVersion').then(function (data) {
-	    	var j = data;
-	    	$scope.data = JSON.parse(j.data);
-	    	console.log($scope.data);
-	    	$scope.microServiceModelsDictionaryDatas = JSON.parse($scope.data.microServiceModelsDictionaryDatas);
-	    	console.log($scope.microServiceModelsDictionaryDatas);
-	    }, function (error) {
-	    	console.log("failed");
-	    });
-	    
-		PolicyAppService.getData('getDictionary/get_RiskTypeDataByName').then(function (data) {
-			var j = data;
-			$scope.data = JSON.parse(j.data);
-			console.log("riskTypeDictionaryDatas = " + $scope.data);
-			$scope.riskTypeDictionaryDatas = JSON.parse($scope.data.riskTypeDictionaryDatas);
-			console.log($scope.riskTypeDictionaryDatas);
-		}, function (error) {
-			console.log("failed");
-		});
+        PolicyAppService.getData('getDictionary/get_MicroServiceModelsDataServiceVersion').then(function (data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            $scope.microServiceModelsDictionaryDatas = JSON.parse($scope.data.microServiceModelsDictionaryDatas);
+        });
+        
+    PolicyAppService.getData('getDictionary/get_RiskTypeDataByName').then(function (data) {
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.riskTypeDictionaryDatas = JSON.parse($scope.data.riskTypeDictionaryDatas);
+    });
 
-		PolicyAppService.getData('getDictionary/get_RiskTypeDataByName').then(function (data) {
-			var j = data;
-			$scope.data = JSON.parse(j.data);
-			console.log("riskTypeDictionaryDatas: " + $scope.data);
-			$scope.riskTypeDictionaryDatas = JSON.parse($scope.data.riskTypeDictionaryDatas);
-			console.log($scope.riskTypeDictionaryDatas);
-		}, function (error) {
-			console.log("failed");
-		});
-		
-		PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
-			var j = data;
-			$scope.data = JSON.parse(j.data);
-			console.log($scope.data);
-			$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
-			console.log($scope.onapNameDictionaryDatas);
-		}, function (error) {
-			console.log("failed");
-		});
+    PolicyAppService.getData('getDictionary/get_RiskTypeDataByName').then(function (data) {
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.riskTypeDictionaryDatas = JSON.parse($scope.data.riskTypeDictionaryDatas);
+    });
+    
+    PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+    });
 
-		PolicyAppService.getData('get_DCAEPriorityValues').then(function (data) {
-			var j = data;
-			$scope.data = JSON.parse(j.data);
-			console.log($scope.data);
-			$scope.priorityDatas = JSON.parse($scope.data.priorityDatas);
-			console.log($scope.priorityDatas);
-		}, function (error) {
-			console.log("failed");
-		});
-				
-		/*getting user info from session*/
-		var userid = null;
-		UserInfoServiceDS2.getFunctionalMenuStaticDetailSession()
-		  	.then(function (response) {	  		
-		  		userid = response.userid;	  	
-		 });
-		
-	    $scope.editHeaderDefaults = message.modelAttributeDictionaryData;
-	    $scope.editModelAttribute1 = {microservice: []};
-	    if($scope.edit){
-	    	if(message.modelAttributeDictionaryData.groupList != null){
-	    		var splitValue = message.modelAttributeDictionaryData.groupList.split(",");
-	    		console.log(splitValue);
-	    	}	
-	    }
-	    $scope.saveHeaderDefaults = function(editHeaderDefaultsData) {
-	    	console.log("editHeaderDefaultsData :" + editHeaderDefaultsData);
-	        var uuu = "saveDictionary/ms_dictionary/save_headerDefaults";
-	    	var postData={modelAttributeDictionaryData: editHeaderDefaultsData, userid: userid};
-	    	$.ajax({
-	    			type : 'POST',
-	    			url : uuu,
-	    			dataType: 'json',
-	    			contentType: 'application/json',
-	    			data: JSON.stringify(postData),
-	    			success : function(data){
-	    				$scope.$apply(function(){
-	    					$scope.microServiceAttributeDictionaryDatas=data.microServiceHeaderDefaultDatas;});
-	    				if($scope.microServiceAttributeDictionaryDatas == "Duplicate"){
-	    					Notification.error("Model Attribute Dictionary exists with Same Attribute Name.")
-	    				}else{      
-	    					console.log($scope.microServiceAttributeDictionaryDatas);
-	    					$modalInstance.close({microServiceAttributeDictionaryDatas:$scope.microServiceAttributeDictionaryDatas});
-	    				}
-	    			},
-	    			error : function(data){
-	    				alert("Error while saving.");
-	    			}
-	    	});
-	    	
-	    };
+    PolicyAppService.getData('get_DCAEPriorityValues').then(function (data) {
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.priorityDatas = JSON.parse($scope.data.priorityDatas);
+    });
+        
+    /*getting user info from session*/
+    var userid = null;
+    UserInfoServiceDS2.getFunctionalMenuStaticDetailSession()
+          .then(function (response) {          
+          userid = response.userid;          
+     });
+    
+        $scope.editHeaderDefaults = message.modelAttributeDictionaryData;
+        $scope.editModelAttribute1 = {microservice: []};
+        if($scope.edit){
+            if(message.modelAttributeDictionaryData.groupList != null){
+            var splitValue = message.modelAttributeDictionaryData.groupList.split(",");
+            }    
+        }
+        $scope.saveHeaderDefaults = function(editHeaderDefaultsData) {
+            var uuu = "saveDictionary/ms_dictionary/save_headerDefaults";
+            var postData={modelAttributeDictionaryData: editHeaderDefaultsData, userid: userid};
+            $.ajax({
+                type : 'POST',
+                url : uuu,
+                dataType: 'json',
+                contentType: 'application/json',
+                data: JSON.stringify(postData),
+                success : function(data){
+                $scope.$apply(function(){
+                    $scope.microServiceHeaderDefaultDatas=data.microServiceHeaderDefaultDatas;});
+                if($scope.microServiceAttributeDictionaryDatas == "Duplicate"){
+                    Notification.error("Model Attribute Dictionary exists with Same Attribute Name.")
+                }else{      
+                    $modalInstance.close({microServiceHeaderDefaultDatas:$scope.microServiceHeaderDefaultDatas});
+                }
+                },
+                error : function(data){
+                Notification.error("Error while saving.");
+                }
+            });
+            
+        };
 
-	    $scope.close = function() {
-	        $modalInstance.close();
-	    };
-	});
\ No newline at end of file
+        $scope.close = function() {
+            $modalInstance.close();
+        };
+    });
\ No newline at end of file