X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fwebapp%2Fapp%2FpolicyApp%2Fcontroller%2FdictionaryGridController%2FattributeDictGridController.js;h=7459bd6e7b542fc2e5d3de20f7bbc84209579068;hb=refs%2Fchanges%2F10%2F97710%2F5;hp=d7b4c2b01ed2ef256d0782a5a256976f12b8c732;hpb=a330af579866dacbe595e2e4ad1dd29cd3c96945;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.js
index d7b4c2b01..7459bd6e7 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/dictionaryGridController/attributeDictGridController.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,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-app.controller('attributeDictGridController', function ($scope, PolicyAppService, modalService, $modal){
+app.controller('attributeDictGridController', function ($scope, PolicyAppService, modalService, $modal, Notification){
 	$( "#dialog" ).hide();
 
 	PolicyAppService.getData('getDictionary/get_AttributeData').then(function (data) {
@@ -88,6 +88,14 @@ app.controller('attributeDictGridController', function ($scope, PolicyAppService
 				docDefinition.styles.footerStyle = { fontSize: 10, bold: true };
 				return docDefinition;
 			},
+			exporterFieldCallback: function(grid, row, col, input) {
+           	 if( col.name == 'createdDate' || col.name == 'modifiedDate') {
+           		 var date = new Date(input);
+           		 return date.toString("yyyy-MM-dd HH:MM:ss a");
+           	 } else {
+           		 return input;
+           	 }
+            },
 			exporterPdfOrientation: 'portrait',
 			exporterPdfPageSize: 'LETTER',
 			exporterPdfMaxGridWidth: 500,
@@ -160,7 +168,7 @@ app.controller('attributeDictGridController', function ($scope, PolicyAppService
 				var i;
 				if($scope.searchDatas.length > 0){
 					for(i = 0 ; i < $scope.searchDatas.length; i++){
-						searchString += $scope.searchDatas[i].name + "\n";
+						searchString += $scope.searchDatas[i] + "\n";
 					}	
 				}else{
 					searchString += "No Policies is Using this Value"
@@ -190,7 +198,7 @@ app.controller('attributeDictGridController', function ($scope, PolicyAppService
 					})}
 			},
 			error : function(data){
-				alert("Error while Searching.");
+				Notification.error("Error while Searching.");
 			}
 		});
 	};