X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fcontroller%2FdashboardCRUDController.js;h=d3f0936978163492dfbc19e49927dd13a3f0beb2;hb=a61c10945456dde51397d354379257c7d0d01fb2;hp=ce1af6b1a2f0d22993018bf03f5f70d99e75e959;hpb=d4832f75d3410139d62f29e1b2c91dd8d3636c99;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardCRUDController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardCRUDController.js
index ce1af6b1a..d3f093697 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardCRUDController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dashboardCRUDController.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.
@@ -19,20 +19,18 @@
  */
 
 app.controller('policyDashboardCRUDDataController', function ($scope, PolicyAppService, modalService, $modal){
-	console.log("policyDashboardCRUDDataController called");
-	
-	$('#dashBoardAdvanceSearch').hide();
-	
+    
+    $('#dashBoardAdvanceSearch').hide();
+    
     $scope.papCRUDTableDatasTemp = [];
     
     $scope.dashboardAdsearch = { isDelected: 'both', stage: 'both',  scope: "", ttlDate_after: "", ttlDate_before: ""};
 
     PolicyAppService.getData('get_DashboardPolicyCRUDData').then(function(data){
 
-		var j = data;
-		$scope.data = JSON.parse(j.data);
-		console.log($scope.data);
-		$scope.papStatusCRUDDatas =JSON.parse($scope.data.papStatusCRUDData);
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.papStatusCRUDDatas =JSON.parse($scope.data.papStatusCRUDData);
         if($scope.papStatusCRUDDatas != null){
             for(i = 0; i < $scope.papStatusCRUDDatas.length; i++){
                 $scope.papCRUDTableDatasTemp.push($scope.papStatusCRUDDatas[i].map);
@@ -40,117 +38,106 @@ app.controller('policyDashboardCRUDDataController', function ($scope, PolicyAppS
             
             $scope.papCRUDTableDatas = $scope.papCRUDTableDatasTemp;
         } 
-		
-	},function(error){
-		console.log("failed");
-	});
+        
+    });
 
-	$scope.papCRUDStatusDatas = {
-		data : 'papCRUDTableDatas',
-		enableFiltering: true,
-		columnDefs: [{ field: 'id', displayName :'id'},
-		 		 	{field: 'scope', displayName :'Scope'},
-					{field: 'policyName', displayName :'Policy Name'},
-					{field: 'version', displayName :'Version'},
-					{field: 'stage', displayName :'Stage'},
-					{field: 'createdBy', displayName :'Created By'},
-					{field: 'deleted', displayName :'Deleted'},
-					{field: 'deleteReasonCode', displayName :'Deleted Reason'},
-					{field: 'deletedBy' , displayName :'Deleted By'},
-					{field: 'modifiedBy' , displayName :'Modified By'},
-					{field: 'createdDate',  displayName :'Created Date'},
-					{field: 'modifiedDate',  displayName :'Modified Date'}
-		],
+    $scope.papCRUDStatusDatas = {
+        data : 'papCRUDTableDatas',
+        enableFiltering: true,
+        columnDefs: [{ field: 'id', displayName :'id'},
+                      {field: 'scope', displayName :'Scope'},
+                    {field: 'policyName', displayName :'Policy Name'},
+                    {field: 'version', displayName :'Version'},
+                    {field: 'stage', displayName :'Stage'},
+                    {field: 'createdBy', displayName :'Created By'},
+                    {field: 'deleted', displayName :'Deleted'},
+                    {field: 'deleteReasonCode', displayName :'Deleted Reason'},
+                    {field: 'deletedBy' , displayName :'Deleted By'},
+                    {field: 'modifiedBy' , displayName :'Modified By'},
+                    {field: 'createdDate',  displayName :'Created Date'},
+                    {field: 'modifiedDate',  displayName :'Modified Date'}
+        ],
         onRegisterApi: function(gridApi){
-        	$scope.gridApi = gridApi;
+            $scope.gridApi = gridApi;
         }
-	};
-	
+    };
+    
     $('#ttlDate_after').datepicker({
-    	dateFormat: 'yy-mm-dd',
-    	changeMonth: true,
-    	changeYear: true,
-    	onSelect: function(date) {
-    		angular.element($('#ttlDate_after')).triggerHandler('input');
-    	}
+        dateFormat: 'yy-mm-dd',
+        changeMonth: true,
+        changeYear: true,
+        onSelect: function(date) {
+            angular.element($('#ttlDate_after')).triggerHandler('input');
+        }
     });
     
     $('#ttlDate_before').datepicker({
-    	dateFormat: 'yy-mm-dd',
-    	changeMonth: true,
-    	changeYear: true,
-    	onSelect: function(date) {
-    		angular.element($('#ttlDate_before')).triggerHandler('input');
-    	}
+        dateFormat: 'yy-mm-dd',
+        changeMonth: true,
+        changeYear: true,
+        onSelect: function(date) {
+            angular.element($('#ttlDate_before')).triggerHandler('input');
+        }
     });
     
     $scope.refresh = function(){
-    	$scope.modal('advancedSearch', true);
-    	$scope.temp.policy = "";
+        $scope.modal('advancedSearch', true);
+        $scope.temp.policy = "";
     };
     
     
-	$scope.advancedSearch = function(){
+    $scope.advancedSearch = function(){
 
-		 $('#dashBoardAdvanceSearch').toggle();
-		 if($('#advancedSearchArrow').hasClass('arrowdown')){
-			 $('#advancedSearchArrow').removeClass("arrowdown");
-			 $('#advancedSearchArrow').addClass("arrowup"); 
-			 
-		 }else{
-			 $('#advancedSearchArrow').removeClass("arrowup");
-			 $('#advancedSearchArrow').addClass("arrowdown"); 
-		 }
-	}
-	
+         $('#dashBoardAdvanceSearch').toggle();
+         if($('#advancedSearchArrow').hasClass('arrowdown')){
+             $('#advancedSearchArrow').removeClass("arrowdown");
+             $('#advancedSearchArrow').addClass("arrowup"); 
+             
+         }else{
+             $('#advancedSearchArrow').removeClass("arrowup");
+             $('#advancedSearchArrow').addClass("arrowdown"); 
+         }
+    }
+    
    
     $scope.startAdvancedSearch = function(data){
-    	
-		 console.log("startAdvancedSearch called");
-		 console.log(data.isDelected);
-		 console.log(data.stage);
-		 console.log(data.scope);
-		 console.log(data.ttlDate_after);
-		 console.log(data.ttlDate_before);
-		 
-		 if(data.scope == null){
-			 return;
-		 }
-		 
+        
+         
+         if(data.scope == null){
+             return;
+         }
+         
        var uuu = "dashboardController/dashboardAdvancedSearch.htm";
         
         var postData={policyData: data};
- 		$.ajax({
- 			type : 'POST',
- 			url : uuu,
- 			dataType: 'json',
- 			contentType: 'application/json',
- 			data: JSON.stringify(postData),
- 			success : function(data){
- 				 console.log("dashboardAdvancedSearch data returned: " + data);
- 				
+         $.ajax({
+             type : 'POST',
+             url : uuu,
+             dataType: 'json',
+             contentType: 'application/json',
+             data: JSON.stringify(postData),
+             success : function(data){
+                 
                  $scope.$apply(function(){  
-                	
-     				var j = data;
-     				$scope.data = JSON.parse(j.data);
-     				console.log($scope.data);
-     				$scope.papStatusCRUDDatas =JSON.parse($scope.data.policyStatusCRUDData);
-     				
-     				$scope.papCRUDTableDatasTemp = [];
-     		       
-     	            for(i = 0; i < $scope.papStatusCRUDDatas.length; i++){
-     	                $scope.papCRUDTableDatasTemp.push($scope.papStatusCRUDDatas[i].map);
-     	            }
-     	            
-     	            $scope.papCRUDTableDatas = $scope.papCRUDTableDatasTemp;
-     	            
-     	           $scope.gridApi.grid.refresh();
+                    
+                     var j = data;
+                     $scope.data = JSON.parse(j.data);
+                     $scope.papStatusCRUDDatas =JSON.parse($scope.data.policyStatusCRUDData);
+                     
+                     $scope.papCRUDTableDatasTemp = [];
+                    
+                     for(i = 0; i < $scope.papStatusCRUDDatas.length; i++){
+                         $scope.papCRUDTableDatasTemp.push($scope.papStatusCRUDDatas[i].map);
+                     }
+                     
+                     $scope.papCRUDTableDatas = $scope.papCRUDTableDatasTemp;
+                     
+                    $scope.gridApi.grid.refresh();
                });
- 			},
- 			error : function(data){
- 				console.log("dashboardAdvancedSearch Failed: data returned as " + data);
- 			}
- 		});
+             },
+             error : function(data){
+             }
+         });
     };
 
 });
\ No newline at end of file