1 files changed, 262 insertions, 305 deletions

diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js
index 4ccc7a57..2d1eeaa8 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js
@@ -20,314 +20,271 @@
  * ===================================================================
  * 
  */
-app.controller('CldsOpenModelCtrl',
-	['$scope', '$rootScope', '$modalInstance','cldsModelService', '$location', 'dialogs','cldsTemplateService',
-		function($scope, $rootScope, $modalInstance, cldsModelService, $location,dialogs,cldsTemplateService) {
-			
-			$scope.typeModel='template';
-			$scope.error = {
-				flag : false,
-				message: ""
- 			};	
-			
-			cldsModelService.getSavedModel().then(function(pars) {
-				
-				$scope.modelNamel=[]
-				for(var i=0;i<pars.length;i++){
-					$scope.modelNamel.push(pars[i].value);		 
-				}
-				setTimeout(function(){
-
-		     setMultiSelect(); }, 100);
-				
-			});
-
-			$scope.paramsRetry = function() {
-				//$("#paramsWarn").hide();
-				var currentValue = $("#service").val() == null ? previous : $("#service").val();	
-			$("#ridinSpinners").css("display","")
-				loadSharedPropertyByService(currentValue,true,callBack);
-				$("#ridinSpinners").css("display","none")
-			};
-			 $scope.paramsCancel =function() {
-				loadSharedPropertyByServiceProperties(callBack);
-				$("#paramsWarnrefresh").hide();
-				
-			};
-
-			function completeClose(){
-					//if(flag)	{
-						$scope.close();
-					//}
-				}
-			
-			function callBack(flag){
-					if(flag)	{
-						$scope.close();
-					}
-				}
-			$scope.refreshASDC=function(){
-				$("#ridinSpinners").css("display","")
-				var bool=loadSharedPropertyByService(undefined,true,callBack);
-				$("#ridinSpinners").css("display","none");
-				
-				
-			}
-			
-			cldsTemplateService.getSavedTemplate().then(function(pars) {
-				$scope.templateNamel=[]
-				for(var i=0;i<pars.length;i++){
-					$scope.templateNamel.push(pars[i].value);
-				}
-				setTimeout(function(){
-					setMultiSelect();}, 100);
-			});
-			
-			function contains(a, obj) {
-			    var i = a&& a.length>0 ? a.length : 0;
-			    while (i--) {
-			       if (a[i].toLowerCase() === obj.toLowerCase()) {
-			           return true;
-			       }
-			    }
-			    return false;
-			}
-			$scope.checkExisting=function(){
-				var name = $('#modelName').val();								
-				if(contains($scope.modelNamel,name)){
-					$scope.nameinUse=true;
-				}else{
-					$scope.nameinUse=false;
-				}
-				specialCharacters();
-			}
-			 function specialCharacters (){
-				$scope.spcl = false;
-				if(angular.element("#modelName") && 
-					angular.element("#modelName").scope().model.$error.pattern && 
-					angular.element("#modelName").scope().model.$error.pattern.length>0){
-					$scope.spcl =  true;
-				}
+app
+.controller(
+'CldsOpenModelCtrl',
+[
+'$scope',
+'$rootScope',
+'$uibModalInstance',
+'cldsModelService',
+'$location',
+'dialogs',
+'cldsTemplateService',
+function($scope, $rootScope, $uibModalInstance, cldsModelService, $location,
+         dialogs, cldsTemplateService) {
+	$scope.typeModel = 'template';
+	$scope.error = {
+	flag : false,
+	message : ""
+	};
+	cldsModelService.getSavedModel().then(function(pars) {
+		$scope.modelNamel = []
+		for (var i = 0; i < pars.length; i++) {
+			$scope.modelNamel.push(pars[i].value);
+		}
+		setTimeout(function() {
+			setMultiSelect();
+		}, 100);
+	});
+	$scope.paramsRetry = function() {
+		// $("#paramsWarn").hide();
+		var currentValue = $("#service").val() == null ? previous : $(
+		"#service").val();
+		$("#ridinSpinners").css("display", "")
+		loadSharedPropertyByService(currentValue, true, callBack);
+		$("#ridinSpinners").css("display", "none")
+	};
+	$scope.paramsCancel = function() {
+		loadSharedPropertyByServiceProperties(callBack);
+		$("#paramsWarnrefresh").hide();
+	};
+	function completeClose() {
+		// if(flag) {
+		$scope.close();
+		// }
+	}
+	function callBack(flag) {
+		if (flag) {
+			$scope.close();
+		}
+	}
+	$scope.refreshASDC = function() {
+		$("#ridinSpinners").css("display", "")
+		var bool = loadSharedPropertyByService(undefined, true, callBack);
+		$("#ridinSpinners").css("display", "none");
+	}
+	cldsTemplateService.getSavedTemplate().then(function(pars) {
+		$scope.templateNamel = []
+		for (var i = 0; i < pars.length; i++) {
+			$scope.templateNamel.push(pars[i].value);
+		}
+		setTimeout(function() {
+			setMultiSelect();
+		}, 100);
+	});
+	function contains(a, obj) {
+		var i = a && a.length > 0 ? a.length : 0;
+		while (i--) {
+			if (a[i].toLowerCase() === obj.toLowerCase()) {
+				return true;
 			}
-
-			$scope.setTypeModel=function(_type){
-				$scope.error.flag = false;
-				$scope.typeModel=_type;
+		}
+		return false;
+	}
+	$scope.checkExisting = function() {
+		var name = $('#modelName').val();
+		if (contains($scope.modelNamel, name)) {
+			$scope.nameinUse = true;
+		} else {
+			$scope.nameinUse = false;
+		}
+		specialCharacters();
+	}
+	function specialCharacters() {
+		$scope.spcl = false;
+		if (angular.element("#modelName")
+		&& angular.element("#modelName").scope().model.$error.pattern
+		&& angular.element("#modelName").scope().model.$error.pattern.length > 0) {
+			$scope.spcl = true;
+		}
+	}
+	$scope.setTypeModel = function(_type) {
+		$scope.error.flag = false;
+		$scope.typeModel = _type;
+	}
+	$scope.close = function() {
+		$rootScope.isNewClosed = false;
+		$uibModalInstance.close("closed");
+	};
+	$scope.createNewModelOffTemplate = function(formModel) {
+		reloadDefaultVariables(false)
+		var modelName = document.getElementById("modelName").value;
+		var templateName = document.getElementById("templateName").value;
+		if (!modelName) {
+			$scope.error.flag = true;
+			$scope.error.message = "Please enter any closed template name for proceeding";
+			return false;
+		}
+		// init UTM items
+		$scope.utmModelsArray = [];
+		$scope.selectedParent = {};
+		$scope.currentUTMModel = {};
+		$scope.currentUTMModel.selectedParent = {};
+		$rootScope.oldUTMModels = [];
+		$rootScope.projectName = "clds_default_project";
+		var utmModels = {};
+		utmModels.name = modelName;
+		utmModels.subModels = [];
+		$rootScope.utmModels = utmModels;
+		cldsTemplateService.getTemplate(templateName).then(function(pars) {
+			var tempImageText = pars.imageText;
+			var authorizedToUp = pars.userAuthorizedToUpdate;
+			pars = {}
+			pars.imageText = tempImageText
+			pars.status = "DESIGN";
+			if (readMOnly) {
+				pars.permittedActionCd = [ "" ];
+			} else {
+				pars.permittedActionCd = [ "TEST", "SUBMIT" ];
 			}
-			
-			$scope.close = function(){
-				$rootScope.isNewClosed = false;
-				$modalInstance.close("closed");
-			};
-			$scope.createNewModelOffTemplate=function(formModel){
-				reloadDefaultVariables(false)
- 				var modelName = document.getElementById("modelName").value;
- 				var templateName=document.getElementById("templateName").value;
- 				
-				if(!modelName){
- 					$scope.error.flag =true;
- 					$scope.error.message = "Please enter any closed template name for proceeding";
- 				    return false;
- 				}
-				// init UTM items
-				$scope.utmModelsArray = [];
-				$scope.selectedParent = {};
-				$scope.currentUTMModel = {};
-				$scope.currentUTMModel.selectedParent = {};
-				$rootScope.oldUTMModels =[];
-				$rootScope.projectName="clds_default_project";		
-				var utmModels = {};
-				utmModels.name = modelName;
-				utmModels.subModels = [];
-				$rootScope.utmModels = utmModels;
-				
-
-				cldsTemplateService.getTemplate( templateName ).then(function(pars) {
-        			
-        		  var tempImageText=pars.imageText;
-        			var authorizedToUp = pars.userAuthorizedToUpdate;
-        			pars={}
-        			
-        			pars.imageText=tempImageText
-        			pars.status= "DESIGN";
-        			if (readMOnly){
-        				pars.permittedActionCd=[""];
-        			} else {
-        				pars.permittedActionCd=["TEST", "SUBMIT"];
-        			}
-        			
-        			selected_template= templateName
-         			selected_model = modelName;
-        			
-        			cldsModelService.processActionResponse(modelName, pars);
-    				
-    				// set model bpmn and open diagram
-        			$rootScope.isPalette = true;
-        		},
-        		function(data) {
-        			//alert("getModel failed");
-        		});
-				allPolicies = {};
-				elementMap = {};
-				$modalInstance.close("closed");
-			
+			selected_template = templateName
+			selected_model = modelName;
+			cldsModelService.processActionResponse(modelName, pars);
+			// set model bpmn and open diagram
+			$rootScope.isPalette = true;
+		}, function(data) {
+			// alert("getModel failed");
+		});
+		allPolicies = {};
+		elementMap = {};
+		$uibModalInstance.close("closed");
+	}
+	$scope.cloneModel = function() {
+		reloadDefaultVariables(false)
+		var modelName = document.getElementById("modelName").value;
+		var originalModel = document.getElementById("modelList").value;
+		if (!modelName) {
+			$scope.error.flag = true;
+			$scope.error.message = "Please enter any name for proceeding";
+			return false;
+		}
+		// init UTM items
+		$scope.utmModelsArray = [];
+		$scope.selectedParent = {};
+		$scope.currentUTMModel = {};
+		$scope.currentUTMModel.selectedParent = {};
+		$rootScope.oldUTMModels = [];
+		$rootScope.projectName = "clds_default_project";
+		var utmModels = {};
+		utmModels.name = modelName;
+		utmModels.subModels = [];
+		$rootScope.utmModels = utmModels;
+		cldsModelService.getModel(originalModel).then(function(pars) {
+			// process data returned
+			var propText = pars.propText;
+			var status = pars.status;
+			var controlNamePrefix = pars.controlNamePrefix;
+			var controlNameUuid = pars.controlNameUuid;
+			selected_template = pars.templateName;
+			typeID = pars.typeId;
+			pars.status = "DESIGN";
+			if (readMOnly) {
+				pars.permittedActionCd = [ "" ];
+			} else {
+				pars.permittedActionCd = [ "TEST", "SUBMIT" ];
 			}
-			
-			$scope.cloneModel=function(){
-				reloadDefaultVariables(false)
- 				var modelName = document.getElementById("modelName").value;
-				var originalModel=document.getElementById("modelList").value;
-				if(!modelName){
- 					$scope.error.flag =true;
- 					$scope.error.message = "Please enter any name for proceeding";
- 				    return false;
- 				}   
-				
-				// init UTM items
-				$scope.utmModelsArray = [];
-				$scope.selectedParent = {};
-				$scope.currentUTMModel = {};
-				$scope.currentUTMModel.selectedParent = {};
-				$rootScope.oldUTMModels =[];
-				$rootScope.projectName="clds_default_project";		
-				var utmModels = {};
-				utmModels.name = modelName;
-				utmModels.subModels = [];
-				$rootScope.utmModels = utmModels;
-				
-
-				cldsModelService.getModel( originalModel ).then(function(pars) {
-        			
-        			// process data returned
-        			var propText = pars.propText;
-        			var status = pars.status;
-        			var controlNamePrefix = pars.controlNamePrefix;
-        			var controlNameUuid = pars.controlNameUuid;
-        			selected_template=pars.templateName;
-        			typeID = pars.typeId;
-        			pars.status="DESIGN";
-        			if (readMOnly){
-        				pars.permittedActionCd=[""];
-        			} else {
-        				pars.permittedActionCd=["TEST", "SUBMIT"];
-        			}
-        			pars.controlNameUuid="";
-        			modelEventService = pars.event;
-        			//actionCd = pars.event.actionCd;
-        			actionStateCd = pars.event.actionStateCd;
-        			deploymentId = pars.deploymentId;
-        				
-        			var authorizedToUp = pars.userAuthorizedToUpdate;
-        			
-        			cldsModelService.processActionResponse(modelName, pars);
-        			
-        			// deserialize model properties
-        			if ( propText == null ) {
-        			} else {
-        				elementMap =  JSON.parse(propText);
-        			}
-
-         			selected_model = modelName;
-    				
-    				// set model bpmn and open diagram
-        			$rootScope.isPalette = true;
-        		},
-        		function(data) {
-        			//alert("getModel failed");
-        		});
-       
-				$modalInstance.close("closed");
+			pars.controlNameUuid = "";
+			modelEventService = pars.event;
+			// actionCd = pars.event.actionCd;
+			actionStateCd = pars.event.actionStateCd;
+			deploymentId = pars.deploymentId;
+			var authorizedToUp = pars.userAuthorizedToUpdate;
+			cldsModelService.processActionResponse(modelName, pars);
+			// deserialize model properties
+			if (propText == null) {
+			} else {
+				elementMap = JSON.parse(propText);
 			}
-			$scope.createNewModel=function(){
-				reloadDefaultVariables(false)
- 				var modelName = document.getElementById("modelName").value;  
-				
-				// BEGIN env
-				// init UTM items
-				$scope.utmModelsArray = [];
-				$scope.selectedParent = {};
-				$scope.currentUTMModel = {};
-				$scope.currentUTMModel.selectedParent = {};
-				$rootScope.oldUTMModels =[];
-				$rootScope.projectName="clds_default_project";		
-				var utmModels = {};
-				utmModels.name = modelName;
-				utmModels.subModels = [];
-				$rootScope.utmModels = utmModels;
-				
-    			// enable appropriate menu options
-    			var pars = {status: "DESIGN"};
-    			
-				cldsModelService.processActionResponse(modelName, pars);
-    			
-				selected_model = modelName;
-
-				// set model bpmn and open diagram
-    			$rootScope.isPalette = true;
-
-    			$modalInstance.close("closed");
+			selected_model = modelName;
+			// set model bpmn and open diagram
+			$rootScope.isPalette = true;
+		}, function(data) {
+		});
+		$uibModalInstance.close("closed");
+	}
+	$scope.createNewModel = function() {
+		reloadDefaultVariables(false)
+		var modelName = document.getElementById("modelName").value;
+		// BEGIN env
+		// init UTM items
+		$scope.utmModelsArray = [];
+		$scope.selectedParent = {};
+		$scope.currentUTMModel = {};
+		$scope.currentUTMModel.selectedParent = {};
+		$rootScope.oldUTMModels = [];
+		$rootScope.projectName = "clds_default_project";
+		var utmModels = {};
+		utmModels.name = modelName;
+		utmModels.subModels = [];
+		$rootScope.utmModels = utmModels;
+		// enable appropriate menu options
+		var pars = {
+			status : "DESIGN"
+		};
+		cldsModelService.processActionResponse(modelName, pars);
+		selected_model = modelName;
+		// set model bpmn and open diagram
+		$rootScope.isPalette = true;
+		$uibModalInstance.close("closed");
+	}
+	$scope.revertChanges = function() {
+		$scope.openModel();
+	}
+	$scope.openModel = function() {
+		reloadDefaultVariables(false)
+		if (document.getElementById("readOnly")) {
+			readMOnly = document.getElementById("readOnly").checked;
+		}
+		var modelName = document.getElementById("modelName").value;
+		// init UTM items
+		$scope.utmModelsArray = [];
+		$scope.selectedParent = {};
+		$scope.currentUTMModel = {};
+		$scope.currentUTMModel.selectedParent = {};
+		$rootScope.oldUTMModels = [];
+		$rootScope.projectName = "clds_default_project";
+		var utmModels = {};
+		utmModels.name = modelName;
+		utmModels.subModels = [];
+		$rootScope.utmModels = utmModels;
+		cldsModelService.getModel(modelName).then(function(pars) {
+			// process data returned
+			var propText = pars.propText;
+			var status = pars.status;
+			controlNamePrefix = pars.controlNamePrefix;
+			var authorizedToUp = pars.userAuthorizedToUpdate;
+			typeID = pars.typeId;
+			controlNameUuid = pars.controlNameUuid;
+			selected_template = pars.templateName;
+			modelEventService = pars.event;
+			actionStateCd = pars.event.actionStateCd;
+			deploymentId = pars.deploymentId;
+			if (readMOnly) {
+				pars.permittedActionCd = [ "" ];
 			}
-			$scope.revertChanges=function(){
-				$scope.openModel();
+			cldsModelService.processActionResponse(modelName, pars);
+			// deserialize model properties
+			if (propText == null) {
+			} else {
+				elementMap = JSON.parse(propText);
 			}
-			$scope.openModel = function(){
-				reloadDefaultVariables(false)
-				if(document.getElementById("readOnly")){
-					readMOnly=document.getElementById("readOnly").checked;
-				}
- 				var modelName = document.getElementById("modelName").value;    
-				
-				// init UTM items
-				$scope.utmModelsArray = [];
-				$scope.selectedParent = {};
-				$scope.currentUTMModel = {};
-				$scope.currentUTMModel.selectedParent = {};
-				$rootScope.oldUTMModels =[];
-				$rootScope.projectName="clds_default_project";		
-				var utmModels = {};
-				utmModels.name = modelName;
-				utmModels.subModels = [];
-				$rootScope.utmModels = utmModels;
-				
-				cldsModelService.getModel( modelName ).then(function(pars) {
-        			// process data returned
-        			var propText = pars.propText;
-        			var status = pars.status;
-        			controlNamePrefix = pars.controlNamePrefix;
-        			// var controlNameUuid = pars.controlNameUuid;
-        			var authorizedToUp = pars.userAuthorizedToUpdate;
-        			typeID = pars.typeId;
-        			controlNameUuid = pars.controlNameUuid;
-        			selected_template=pars.templateName;
-        			modelEventService = pars.event;
-        			//actionCd = pars.event.actionCd;
-        			actionStateCd = pars.event.actionStateCd;
-        			deploymentId = pars.deploymentId;
-
-        			if (readMOnly){
-        				pars.permittedActionCd= [""];
-        			}
-        			cldsModelService.processActionResponse(modelName, pars);
-        			
-        			// deserialize model properties
-        			if ( propText == null ) {
-        			} else {
-        				elementMap =  JSON.parse(propText);
-        			}
-
-         			selected_model = modelName;
-    				
-    				// set model bpmn and open diagram
-        			$rootScope.isPalette = true;
-        		},
-        		function(data) {
-        			//alert("getModel failed");
-        		});
-       
-				$modalInstance.close("closed");
-			};
-
-			setMultiSelect();
-		}
-	]
-);
+			selected_model = modelName;
+			// set model bpmn and open diagram
+			$rootScope.isPalette = true;
+		}, function(data) {
+		});
+		$uibModalInstance.close("closed");
+	};
+	setMultiSelect();
+} ]);