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%2FDCAEMicroServicePolicyController.js;h=a983d2f4e7a0bc9d91f9780da371e8c17a205242;hb=84b95a134c61217667b7eb7b7e774a485d2406ba;hp=5d81bc10d2a9146cfad15a7c9c8f18f1eeb9e93b;hpb=073cc188efe9abb4c010cf674e34e2cf46ef1c52;p=policy%2Fengine.git

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
index 5d81bc10d..a983d2f4e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
@@ -37,6 +37,15 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
         return $('#' + id).modal(hide ? 'hide' : 'show');
     };
     
+    $('#ttlDate').datepicker({
+    	dateFormat: 'dd/mm/yy',
+    	changeMonth: true,
+    	changeYear: true,
+    	onSelect: function(date) {
+    		angular.element($('#ttlDate')).triggerHandler('input');
+    	}
+    });
+    
 	if ($scope.temp.policy.editPolicy != undefined|| $scope.temp.policy.readOnly  != undefined){
 		if ($scope.temp.policy.configName == undefined){
 			$scope.isCheck = false;
@@ -323,25 +332,23 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
 
                        	}
 
-                       	if (dictionary!= null || dictionary>1){
-                    		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;
-                    				if (valueModel.includes('-v')){
-                    					conpairService = service;
-                    				}
-                    				if(valueModel.localeCompare(conpairService) == 0){
-                    					console.log(valueCompare);	
-                    					dictionaryList.push(dictionary[m]);
-                    					if (!dictionaryNameList.includes(dictionary[m].name)){
-                    						dictionaryNameList.push(dictionary[m].name)
-                    					}
-                    				}
-                    			}
-                    		}
+                       	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;
+                       			if (valueModel.includes('-v')){
+                       				conpairService = service;
+                       			}
+                       			if(valueModel.localeCompare(conpairService) == 0){
+                       				console.log(valueCompare);	
+                       				dictionaryList.push(dictionary[m]);
+                       				if (!dictionaryNameList.includes(dictionary[m].name)){
+                       					dictionaryNameList.push(dictionary[m].name)
+                       				}
+                       			}
+                       		}
                        	}
 
                 		$scope.temp.policy.ruleGridData = [];