X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fcontroller%2FAutoPushController.js;h=264ff567e87c6026b21b7b740324988323e4a3e4;hb=a61c10945456dde51397d354379257c7d0d01fb2;hp=9eb90333b8ff7817b4b3421cbcd7e20c2e3db4e3;hpb=a330af579866dacbe595e2e4ad1dd29cd3c96945;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.js
index 9eb90333b..264ff567e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/AutoPushController.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,7 +17,8 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-app.controller('policyPushController', function ($scope, PolicyAppService, modalService, $modal, Notification,$filter){
+app.controller('policyPushController', 
+    function ($scope, PolicyAppService, modalService, $modal, Notification,$filter){
     $( "#dialog" ).hide();
 
    $scope.isDisabled = true;
@@ -32,30 +33,24 @@ app.controller('policyPushController', function ($scope, PolicyAppService, modal
         }else{
             $scope.isDisabled = false;
         }
-        console.log($scope.data);
-    },function(error){
-        console.log("failed");
     });
 
     $scope.pdpdata;
-    PolicyAppService.getData('get_PDPGroupContainerData').then(function (data) {
+    PolicyAppService.getData('get_PDPGroupData').then(function (data) {
         var j = data;
         $scope.pdpdata = JSON.parse(j.data);
-        console.log($scope.pdpdata);
         $scope.pushTabPDPGrid.data = $scope.pdpdata;
-    }, function (error) {
-        console.log("failed");
     });
 
     $scope.getPDPData = function(){
-    	 $scope.pushTabPDPGrid.data = $scope.pdpdata;
+         $scope.pushTabPDPGrid.data = $scope.pdpdata;
     };
     $scope.filterPdpGroup;
     $scope.filterPDPGroupData = function() {
         $scope.pushTabPDPGrid.data = $filter('filter')($scope.pdpdata, $scope.filterPdpGroup, undefined);
     };
     
-    $scope.pushTabPDPGrid = {	
+    $scope.pushTabPDPGrid = {    
         onRegisterApi: function(gridApi) {
             $scope.gridApi = gridApi;
         },
@@ -78,7 +73,7 @@ app.controller('policyPushController', function ($scope, PolicyAppService, modal
             Notification.error("Policy Application has been LockDown.");
         }else{
             var modalInstance = $modal.open({
-            	backdrop: 'static', keyboard: false,
+                backdrop: 'static', keyboard: false,
                 templateUrl: 'remove_PDPGroupPolicies_popup.html',
                 controller: 'removeGroupPoliciesController',
                 resolve: {
@@ -91,7 +86,6 @@ app.controller('policyPushController', function ($scope, PolicyAppService, modal
                 }
             });
             modalInstance.result.then(function (response) {
-                console.log('response', response);
                 $scope.pdpdata = JSON.parse(response.data);
                 $scope.pushTabPDPGrid.data =  $scope.pdpdata;
             });
@@ -99,75 +93,66 @@ app.controller('policyPushController', function ($scope, PolicyAppService, modal
     };
 
     $scope.gridOptions = {
-    		data : 'policydatas',
-    		 onRegisterApi: function(gridApi) {
-    	            $scope.gridPolicyApi = gridApi;
-    	        },
-    		enableSorting: true,
-    		enableFiltering: true,
-    		showTreeExpandNoChildren: true,
-    		paginationPageSizes: [10, 20, 50, 100],
-    		paginationPageSize: 20,
-    		columnDefs: [{name: 'policyName', displayName : 'Policy Name', sort: { direction: 'asc', priority: 0 }}, 
-    		             {name: 'activeVersion', displayName : 'Version'}, 
-    		             {name: 'modifiedDate', displayName : 'Last Modified',type: 'date', cellFilter: 'date:\'yyyy-MM-dd HH:MM:ss a\'' }]
+        data : 'policydatas',
+         onRegisterApi: function(gridApi) {
+             $scope.gridPolicyApi = gridApi;
+               },
+        enableSorting: true,
+        enableFiltering: true,
+        showTreeExpandNoChildren: true,
+        paginationPageSizes: [10, 20, 50, 100],
+        paginationPageSize: 20,
+        columnDefs: [{name: 'policyName', displayName : 'Policy Name', sort: { direction: 'asc', priority: 0 }}, 
+                     {name: 'activeVersion', displayName : 'Version'}, 
+                     {name: 'modifiedDate', displayName : 'Last Modified',type: 'date', cellFilter: 'date:\'yyyy-MM-dd HH:MM:ss a\'' }]
     };
     
    
     PolicyAppService.getData('get_AutoPushPoliciesContainerData').then(function (data) {
-    	$scope.loading = false;
-    	var j = data;
-		$scope.data = JSON.parse(j.data);
-		console.log($scope.data);
-		$scope.policydatas =JSON.parse($scope.data.policydatas);
-		console.log($scope.policydatas);
-       }, function (error) {
-        console.log("failed");
-    });
+        $scope.loading = false;
+        var j = data;
+    $scope.data = JSON.parse(j.data);
+    $scope.policydatas =JSON.parse($scope.data.policydatas);
+       });
    
     $scope.pushPoliciesButton = function(){
-    	var policySelection = $scope.gridPolicyApi.selection.getSelectedRows();
-    	console.log(policySelection);
-    	var currentSelection = $scope.gridApi.selection.getSelectedRows();
-    	if(policySelection.length == 0 && currentSelection.length == 0){
-    		Notification.error("Please Select Policy and PDP Group to Push");
-    	}
-    	if(policySelection.length == 0 && currentSelection.length != 0){
-    		Notification.error("Please Select Policy to Push");
-    	}
-    	if(policySelection.length != 0 && currentSelection.length == 0){
-    		Notification.error("Please Select PDP Group to Push");
-    	}
-    	if(policySelection.length != 0 && currentSelection.length != 0){
-    		var finalData = {
-    				"pdpDatas": currentSelection,
-    				"policyDatas": policySelection
-    		};
-    		console.log(finalData);
-    		var uuu = "auto_Push/PushPolicyToPDP.htm";
-    		var postData={pushTabData: finalData};
-    		$.ajax({
-    			type : 'POST',
-    			url : uuu,
-    			dataType: 'json',
-    			contentType: 'application/json',
-    			data: JSON.stringify(postData),
-    			success : function(data){
-    				$scope.$apply(function(){
-    					$scope.data=data.data;
-    					$scope.pdpdata = JSON.parse(data.data);
-    					$scope.pushTabPDPGrid.data =  $scope.pdpdata;
-    					Notification.success("Policy Pushed Successfully");
-    				});
-    				console.log($scope.data);
-    			},
-    			error : function(data){
-    				Notification.error("Error Occured while Pushing Policy.");
-    			}
-    		});
+        var policySelection = $scope.gridPolicyApi.selection.getSelectedRows();
+        var currentSelection = $scope.gridApi.selection.getSelectedRows();
+        if(policySelection.length == 0 && currentSelection.length == 0){
+        Notification.error("Please Select Policy and PDP Group to Push");
+        }
+        if(policySelection.length == 0 && currentSelection.length != 0){
+        Notification.error("Please Select Policy to Push");
+        }
+        if(policySelection.length != 0 && currentSelection.length == 0){
+        Notification.error("Please Select PDP Group to Push");
+        }
+        if(policySelection.length != 0 && currentSelection.length != 0){
+        var finalData = {
+            "pdpDatas": currentSelection,
+            "policyDatas": policySelection
+        };
+        var uuu = "auto_Push/PushPolicyToPDP.htm";
+        var postData={pushTabData: finalData};
+        $.ajax({
+            type : 'POST',
+            url : uuu,
+            dataType: 'json',
+            contentType: 'application/json',
+            data: JSON.stringify(postData),
+            success : function(data){
+            $scope.$apply(function(){
+                $scope.data=data.data;
+                $scope.pdpdata = JSON.parse(data.data);
+                $scope.pushTabPDPGrid.data =  $scope.pdpdata;
+                Notification.success("Policy Pushed Successfully");
+            });
+            },
+            error : function(data){
+            Notification.error("Error Occured while Pushing Policy.");
+            }
+        });
 
-    	}
+        }
     };
-  
-
 });