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%2FBaseConfigPolicyController.js;h=f950e74349f70bdbdb11ccabe15d0234731537c7;hb=a61c10945456dde51397d354379257c7d0d01fb2;hp=9f286357986a22d95e788c51a8ddfd06ca207fdc;hpb=e0addf5b588a1244f9679becd90999dfcb4c3a94;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
index 9f2863579..f950e7434 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
@@ -1,8 +1,8 @@
 /*-
  * ============LICENSE_START=======================================================
- * ECOMP Policy Engine
+ * 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,17 +17,48 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-app.controller('baseConfigController', function ($scope, PolicyAppService, modalService, $modal, Notification) {
+app.controller('baseConfigController', ['$scope', 'PolicyAppService', 'policyNavigator', 'modalService', '$modal', 'Notification',  function ($scope, PolicyAppService, PolicyNavigator, modalService, $modal, Notification) {
     $("#dialog").hide();
     
+   
+    $scope.policyNavigator;
     $scope.savebutton = true;
-		
-    PolicyAppService.getData('getDictionary/get_EcompNameDataByName').then(function (data) {
+    $scope.refreshCheck = false;
+    
+    if(!$scope.temp.policy.editPolicy  && !$scope.temp.policy.readOnly){
+    	$scope.temp.policy = {
+    		policyType : "Config",
+    		configPolicyType : "Base"
+    	}
+    }
+    
+    $scope.refresh = function(){
+    	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_OnapNameDataByName').then(function (data) {
     	var j = data;  
     	$scope.data = JSON.parse(j.data);
     	console.log($scope.data);
-    	$scope.ecompNameDictionaryDatas = JSON.parse($scope.data.ecompNameDictionaryDatas);
-    	console.log($scope.ecompNameDictionaryDatas);
+    	$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
+    	console.log($scope.onapNameDictionaryDatas);
     }, function (error) {
     	console.log("failed");
     });
@@ -51,18 +82,14 @@ app.controller('baseConfigController', function ($scope, PolicyAppService, modal
     }, function (error) {
     	console.log("failed");
     });
-
-	
-    function extend(obj, src) {
-        for (var key in src) {
-            if (src.hasOwnProperty(key)) obj[key] = src[key];
-        }
-        return obj;
-    }
     
     $scope.savePolicy = function(policy){
+    	if(policy.itemContent != undefined){
+    		$scope.refreshCheck = true; 
+        	$scope.policyNavigator = policy.itemContent;
+        	policy.itemContent = "";
+    	}
     	$scope.savebutton = false;
-        console.log(policy);
         var uuu = "policycreation/save_policy";
 		var postData={policyData: policy};
 		$.ajax({
@@ -92,7 +119,7 @@ app.controller('baseConfigController', function ($scope, PolicyAppService, modal
     
  
     $scope.validatePolicy = function(policy){
-    	console.log(policy);
+    	$scope.scope = policy.domain;
     	document.getElementById("validate").innerHTML = "";
         var uuu = "policyController/validate_policy.htm";
 		var postData={policyData: policy};
@@ -150,5 +177,4 @@ app.controller('baseConfigController', function ($scope, PolicyAppService, modal
         var lastItem = $scope.temp.policy.attributes.length-1;
         $scope.temp.policy.attributes.splice(lastItem);
     };
-    
-});
\ No newline at end of file
+}]);