X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fpolicy-models%2FEditor%2FPolicyTemplateController%2FOptimizationPolicyController.js;h=8de78fc091a7ac0495da3035769c0a6fd25697d2;hb=710011b4fb147bf100c52c4b0425160bba88a0fd;hp=e499c9ff50ee6440dc758ad4c6782a57172f9eca;hpb=54d873eda668d7c0dbd79f1ca7764cab75753ec6;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
index e499c9ff5..8de78fc09 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.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.
@@ -30,7 +30,7 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
     			policyType : "Config",
     			configPolicyType : "Optimization"
     	}
-    };
+    }
     
     $scope.refresh = function(){
     	if($scope.refreshCheck){
@@ -73,7 +73,7 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
 		console.log("failed");
 	});
 
-	PolicyAppService.getData('get_PriorityValues').then(function (data) {
+	PolicyAppService.getData('get_DCAEPriorityValues').then(function (data) {
 		var j = data;
 		$scope.data = JSON.parse(j.data);
 		console.log($scope.data);
@@ -270,11 +270,9 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
 		 }
 	 };
     
-    var splitDash = '-';
 	var splitEqual = '=';
 	var splitComma = ',';
 	var splitcolon = ':';
-	var splitsemicolon = ";";
 	var splitEnum = "],";
 	var plainAttributeKeys = [];
 	var matching = [];
@@ -298,7 +296,6 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
                 data: JSON.stringify(postData),
                 success : function(data){
                     $scope.$apply(function(){
-                    	var plainAttributeKeys = [];
                     	$scope.optimizationModelData = data[0].optimizationModelData;
                     	$scope.optimizationJsonDate = data[0].jsonValue;
                         $scope.dataOrderInfo = null;
@@ -332,7 +329,6 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
 	               			 $scope.temp.policy.priority = "";
                     	}
                     	
-                       	var enumAttributes = $scope.optimizationModelData.enumValues;
                        	var annotation = $scope.optimizationModelData.annotation;
                        	var dictionary = $scope.microServiceAttributeDictionaryDatas;
 
@@ -352,7 +348,6 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
 
                        	if (dictionary!= null && dictionary.length>1){
                        		for (m=0; m < dictionary.length; m += 1){
-                       			var keyCompare = dictionary[m].name;
                        			var valueCompare = dictionary[m].value;
                        			var valueModel = dictionary[m].modelName;
                        			var conpairService = serviceName;
@@ -439,7 +434,6 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
 			              	    		    var label = $scope.labelManyKeys[i];
 			              	    				// first add parent/label level
 			             	 	    			for (k = 0; k < unique.length; k++){
-					                    			var newindex = unique[k].lastIndexOf("@");
 					                    			var newKey = unique[k].substring(0, index);
 	 		             	 	    			    if(label == newKey){
                                                         //Check this label has bee created or not
@@ -1159,11 +1153,11 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
 			listField.appendChild(optionFirst);	
 		}
 		
-		for (i=0; i < listemunerateValues.length; i += 1) {
-			if(listemunerateValues[i].includes("equal-sign")){
+		for (var i=0; i < listemunerateValues.length; i += 1) {
+			if(typeof listemunerateValues[i] == "string" && listemunerateValues[i].includes("equal-sign")){
 				listemunerateValues[i] = listemunerateValues[i].replace('equal-sign','=');
 			}
-		    option = document.createElement('option');
+		    var option = document.createElement('option');
 		    option.setAttribute('value', listemunerateValues[i]);
 		    option.appendChild(document.createTextNode(listemunerateValues[i]));
 		    option.setAttribute('value', listemunerateValues[i]);
@@ -1386,4 +1380,4 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
     }
 }]);/**
  * 
- */
\ No newline at end of file
+ */