From 3a4b3642b99ca8201870702e5c3977c900e8e951 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 8 May 2014 15:33:07 -0400
Subject: [PATCH 1/4] BUG-14843 Process Tracker - Menu Sticks

I added the menu item in the remove event when the windows is clsed.
---
 workflow/engine/js/stagesmap/core/stagesmap.js            | 2 ++
 workflow/engine/xmlform/tracker/tracker_Configuration.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/js/stagesmap/core/stagesmap.js b/workflow/engine/js/stagesmap/core/stagesmap.js
index 6526ce071..34b4c23fc 100755
--- a/workflow/engine/js/stagesmap/core/stagesmap.js
+++ b/workflow/engine/js/stagesmap/core/stagesmap.js
@@ -22,6 +22,7 @@ var stagesmap=function(){
 					    {image:"/images/add.png",text:G_STRINGS.ID_PROCESSMAP_ADD_STAGE,launch:this.addStage.extend(this)}
 					  ]
 				  });
+				  menu_right = this.menu;
 				  this.observers.menu.register(this.parent.closure({instance:this.menu,method:this.menu.remove}),this.menu);
 				}
 				this.data.render.title();
@@ -318,6 +319,7 @@ var stagesmap=function(){
 				  	},args:index})}
 				  	]
 				  });
+				  menu_right = menu;
 				  this.observers.menu.register(menu.remove,menu);
 				}
 				this.panels.editor.elements.content.appendChild(a);
diff --git a/workflow/engine/xmlform/tracker/tracker_Configuration.xml b/workflow/engine/xmlform/tracker/tracker_Configuration.xml
index 1358ba9e6..b99366f09 100755
--- a/workflow/engine/xmlform/tracker/tracker_Configuration.xml
+++ b/workflow/engine/xmlform/tracker/tracker_Configuration.xml
@@ -62,7 +62,7 @@ var editStagesMap = function(sProcessUID) {
 		fx	:{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:false}
   };
   oPanel.events = {
-  	remove: function() { delete(oPanel); }.extend(this)
+  	remove: function() { delete(oPanel); menu_right.remove(); }.extend(this)
   };
 	oPanel.make();
 	oPanel.loader.show();

From 3d306b67075fde2c0dad1d275b870fb49e22b156 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Mon, 2 Jun 2014 10:53:51 -0400
Subject: [PATCH 2/4] Solving conflicts.

---
 .../engine/js/stagesmap/core/stagesmap.js     | 1024 +++++++++--------
 .../xmlform/tracker/tracker_Configuration.xml |  181 +--
 2 files changed, 609 insertions(+), 596 deletions(-)

diff --git a/workflow/engine/js/stagesmap/core/stagesmap.js b/workflow/engine/js/stagesmap/core/stagesmap.js
index 34b4c23fc..a4feebfd6 100755
--- a/workflow/engine/js/stagesmap/core/stagesmap.js
+++ b/workflow/engine/js/stagesmap/core/stagesmap.js
@@ -1,510 +1,516 @@
-var stagesmap=function(){
-	this.data={
-		load:function(){
-			var r = new leimnud.module.rpc.xmlhttp({
-				url:this.options.dataServer,
-				args:"action=load&data="+{uid:this.options.uid,mode:this.options.rw}.toJSONString()
-			});
-			r.callback=this.data.render.base;
-			r.make();
-		},
-		render:{
-			base:function(xml) {
-				this.panels.editor.loader.hide();
-				this.data.db=xml.xmlhttp.responseText.parseJSON().concatMaborak({});
-				if (this.options.rw===true) {
-				  this.menu = new this.parent.module.app.menuRight();
-				  this.menu.make({
-					  target:this.panels.editor.elements.content,//posiblemente hay que cambiar algo aqui para el menu contextual
-					  width:150,
-					  theme:this.options.theme,
-					  menu:[
-					    {image:"/images/add.png",text:G_STRINGS.ID_PROCESSMAP_ADD_STAGE,launch:this.addStage.extend(this)}
-					  ]
-				  });
-				  menu_right = this.menu;
-				  this.observers.menu.register(this.parent.closure({instance:this.menu,method:this.menu.remove}),this.menu);
-				}
-				this.data.render.title();
-				this.data.render.stage();
-				this.data.render.derivation();
-			},
-			stage:function() {
-				var lngt = this.data.db.stages.length;
-				for(var i =0;i<lngt;i++)
-				{
-					this.data.build.stage(i);
-				}
-			},
-			title:function() {
-				this.data.build.title();
-			},
-			derivation:function(uid,type) {
-				for(var i=0;i<this.data.db.stages.length;i++)
-				{
-					this.data.render.lineDerivation(i);
-				}
-				return true;
-			},
-			lineDerivation:function(index) {
-				var stage = this.data.db.stages[index];
-				for(var j=0;j<stage.derivation.to.length;j++)
-				{
-					var derivation  = stage.derivation.to[j];
-					if(derivation.stage==="-1" || derivation.stage==="-2")
-					{
-						var target=(stage.derivation.to.length>1)?'derivationBottom':'derivation';
-						this.parent.dom.setStyle(stage.object.elements[target],{
-							background:"url("+this.options.images_dir+derivation.stage+((target=="derivationBottom")?"bb.jpg":".gif")+"?aa="+Math.random()+")"
-						});
-					}
-					else
-					{
-						var uid	 = this.tools.getIndexOfUid(derivation.stage);
-						var stageF= stage.object.elements;
-						var stageT= this.data.db.stages[uid].object.elements;
-						var from = stage.object.elements.derivation;
-						var toStage=this.data.db.stages[uid];
-						var to	 = toStage.object.elements.stage;
-						if(stage.derivation.type!==5)
-						{
-							this.parent.dom.setStyle(stage.object.elements.derivation,{
-								background:"url("+this.options.images_dir+stage.derivation.type+"t.gif?aa="+Math.random()+")"
-							});
-						}
-						else
-						{
-							var ij = toStage.object.inJoin;
-							ij = (ij)?ij+1:1;
-							toStage.object.inJoin = ij;
-							this.parent.dom.setStyle(toStage.object.elements.init,{
-								background:"url("+this.options.images_dir+stage.derivation.type+"t.gif?aa="+Math.random()+")",
-								backgroundPosition:"2 0",
-								backgroundRepeat:"no-repeat"
-							});
-						}
-						var line = new this.parent.module.app.line({
-							indexRootSize:30,
-							indexRootLastSize:35,
-							elements:[stageF.stage,stageT.stage],
-							envolve:[
-								[stageF.stage],
-								[]
-							],
-							target:this.panels.editor.elements.content,
-							color:"#228AB0",
-							startA:50,
-							zIndex:5
-						});
-						line.make();
-						var cE=this.observers.lineas.register(line.update,line);
-						derivation.object={
-							line		: line,
-							indexObserver	: cE
-						};
-					}
-				}
-			},
-			deleteDerivation:function(uid,rec,spec) {
-				var stage = this.data.db.stages[this.tools.getIndexOfUid(uid)];
-				spec	 = (typeof spec!=="number")?false:spec;
-				var deri = stage.derivation;
-				for(var i=0;i<deri.to.length;i++)
-				{
-					if(spec===false || (spec!==false && spec===i))
-					{
-						deri.to[i].object.line.remove();
-						this.observers.lineas.unregister(deri.to[i].object.indexObserver);
-						if(deri.type===5)
-						{
-							var toStage = this.data.db.stages[this.tools.getIndexOfUid(deri.to[i].stage)];
-							toStage.object.inJoin = toStage.object.inJoin-1;
-							if(toStage.object.inJoin===0)
-							{
-								this.parent.dom.setStyle(toStage.object.elements.init,{
-									backgroundPosition:"0 0",
-									background:""
-								});
-							}
-						}
-					}
-				}
-				this.parent.dom.setStyle(stage.object.elements.derivation,{
-					background:""
-				});
-				stage.derivation={to:[]};
-				if(rec)
-				{
-					var tdb = this.data.db.stages;
-					for(var i=0;i<tdb.length;i++)
-					{
-						var der = tdb[i].derivation.to || [];
-						for(var j=0;j<der.length;j++)
-						{
-							if(der[j].stage===uid)
-							{
-								this.data.render.deleteDerivation(tdb[i].uid,false,j);
-							}
-						}
-					}
-				}
-			}
-		},
-		build:{
-		  title:function(index)
-			{
-				if(this.data.db.title)
-				{
-					var title=this.data.db.title;
-					var t = document.createElement("div");
-					t.className="processmap_title___"+this.options.theme;
-					this.parent.dom.setStyle(t,{
-						top:title.position.y,
-						left:title.position.x,
-						cursor:"default"
-					});
-					t.innerHTML=title.label;
-					this.panels.editor.elements.content.appendChild(t);
-					title.object={
-						elements:{
-							label:t
-						}
-					}
-				}
-			},
-			stage:function(index)
-			{
-				var options 	= this.data.db.stages[index];
-				var db		= this.data.db, stage=db.stages[index];
-				var derivation 	= stage.derivation.to;
-				var a = document.createElement("div");
-				a.className="processmap_task___"+this.options.theme;
-				this.parent.dom.setStyle(a,{
-					top:options.position.y,
-					left:options.position.x,
-					cursor:((this.options.rw===true)?"move":"default"),
-					backgroundColor:(options.color ? options.color : 'auto')
-				});
-				var b = document.createElement("div");
-				b.className="processmap_task_label___"+this.options.theme;
-				this.parent.dom.setStyle(b,{
-					cursor:((this.options.rw===true)?"move":"default")
-				});
-				b.innerHTML = options.label;
-
-				var c = document.createElement("div");
-				this.parent.dom.setStyle(c,{
-					position:"absolute",
-					top: options.position.y+38,
-					left:options.position.x+(81-12),
-					height:25,
-					width:25,
-					border:"0px solid black",
-					overflow:"hidden",
-          cursor:'default',
-					zIndex:9
-				});
-				var d = document.createElement("div");
-				this.parent.dom.setStyle(d,{
-					position:"absolute",
-					top: options.position.y+49,
-					left:options.position.x+(93),
-					height:38,
-					width:38,
-					border:"0px solid black",
-					overflow:"hidden",
-					zIndex:9
-				});
-				var t = document.createElement("div");
-				this.parent.dom.setStyle(t,{
-					position:"absolute",
-					top:options.position.y-30,
-					left:options.position.x+(81-14),
-					height:30,
-					width:30,
-					overflow:"hidden",
-					zIndex:9
-				});
-				if(this.options.rw===true)
-				{
-				  var menu = new this.parent.module.app.menuRight();
-				  menu.make({
-				  	target:a,
-				  	width:201,
-				  	theme:this.options.theme,
-				  	menu:[
-				  	{image:"/images/edit.gif",text:G_STRINGS.ID_PROCESSMAP_EDIT,launch:function(event,index){
-					  	var panel;
-					  	this.tmp.stagePanel = panel = new leimnud.module.panel();
-					  	panel.options={
-					  		limit	:true,
-					  		size	:{w:450,h:160},
-					  		position:{x:50,y:50,center:true},
-					  		title	:G_STRINGS.ID_PROCESSMAP_EDIT+": "+stage.label,
-					  		theme	:this.options.theme,
-					  		control	:{close:true,resize:false},fx:{modal:true},
-					  		statusBar:false,
-					  		fx	:{modal:true}
-					  	};
-					  	panel.make();
-					  	panel.loader.show();
-					  	var r;
-					  	panel.currentRPC = r = new leimnud.module.rpc.xmlhttp({
-					  		url:this.options.dataServer,
-					  		args:"action=editStage&data="+{
-					  			stg_uid	:stage.uid,
-					  			pro_uid	:this.options.uid,
-					  			theindex:index
-					  		}.toJSONString()
-					  	});
-					  	r.callback=function(rpc,panel)
-					  	{
-					  		panel.loader.hide();
-					  		var scs = rpc.xmlhttp.responseText.extractScript();
-					  		panel.addContent(rpc.xmlhttp.responseText);
-					  		scs.evalScript();
-					  	}.extend(this,panel);
-					  	r.make();
-					  }.extend(this,index)},
-					  {image:"/images/task.gif",text:G_STRINGS.ID_PROCESSMAP_TASKS_ASSIGNED,launch:function(event,index){
-					  	var panel;
-					  	this.tmp.stagePanel = panel = new leimnud.module.panel();
-					  	panel.options={
-					  		limit	:true,
-					  		size	:{w:450,h:400},
-					  		position:{x:50,y:50,center:true},
-					  		title	:G_STRINGS.ID_PROCESSMAP_TASKS_ASSIGNED_FOR+": "+stage.label,
-					  		theme	:this.options.theme,
-					  		control	:{close:true,resize:false},fx:{modal:true},
-					  		statusBar:false,
-					  		fx	:{modal:true}
-					  	};
-					  	panel.make();
-					  	panel.loader.show();
-					  	var r;
-					  	panel.currentRPC = r = new leimnud.module.rpc.xmlhttp({
-					  		url:this.options.dataServer,
-					  		args:"action=tasksAssigned&data="+{
-					  			stg_uid	:stage.uid,
-					  			pro_uid	:this.options.uid,
-					  			theindex:index
-					  		}.toJSONString()
-					  	});
-					  	r.callback=function(rpc,panel)
-					  	{
-					  		panel.loader.hide();
-					  		var scs = rpc.xmlhttp.responseText.extractScript();
-					  		panel.addContent(rpc.xmlhttp.responseText);
-					  		scs.evalScript();
-					  	}.extend(this,panel);
-					  	r.make();
-					  }.extend(this,index)},
-					  {image:"/images/delete.png",text:G_STRINGS.ID_PROCESSMAP_DELETE_STAGE,launch:this.parent.closure({instance:this,method:function(index){
-				  		var data = this.data.db.stages[index];
-				  		new this.parent.module.app.confirm().make({
-				  			label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_STAGE+data.label,
-				  			action:function()
-				  			{
-				  				var r = new leimnud.module.rpc.xmlhttp({
-				  					url:this.options.dataServer,
-				  					args:"action=deleteStage&data="+{pro_uid:this.options.uid,stg_uid:data.uid}.toJSONString()
-				  				});
-				  				r.callback = function() {
-				  				  this.panels.editor.clearContent();
-				  				  this.data.load();
-				  			  }.extend(this);
-				  				r.make();
-				  			}.extend(this)
-				  		});
-				  	},args:index})}
-				  	]
-				  });
-				  menu_right = menu;
-				  this.observers.menu.register(menu.remove,menu);
-				}
-				this.panels.editor.elements.content.appendChild(a);
-				a.appendChild(b);
-				this.panels.editor.elements.content.appendChild(c);
-				this.panels.editor.elements.content.appendChild(d);
-				this.panels.editor.elements.content.appendChild(t);
-
-				options.object={
-					elements:{
-						stage	: a,
-						label	: b,
-						derivation: c,
-						derivationBottom: d,
-						init	: t
-					}
-				};
-				options.object.dropIndex=this.dropables.derivation.register({
-					element	: a,
-					value	: index,
-					events	: {
-						over	:this.parent.closure({instance:this.dropables.derivation,method:function(e,o,u){
-							this.parent.dom.setStyle(e,{
-								border:"1px solid #006699"
-							});
-						},args:[a,options,index]}),
-						out		:this.parent.closure({instance:this.dropables.derivation,method:function(e,o,u){
-							this.parent.dom.setStyle(e,{
-								border:"0px solid #006699"
-							});
-						},args:[a,options,index]})
-					}
-				});
-				if(this.options.rw===true)
-				{
-					options.object.drag = new this.parent.module.drag({
-						link:{
-							elements:a,
-							ref:[a,c,d,t]
-						},
-						limit:true
-					});
-					this.observers.lineas.register(this.parent.closure({instance:options.object.drag,method:function(){}}),options.object.drag);
-					options.object.drag.events={
-						move	:this.parent.closure({instance:this,method:function(div,divC,uid,drag) {
-						  options.object.drag.observer.update();
-							var db = this.data.db;
-						  },args:[a,c,index,options.object.drag]}),
-
-						finish	:this.parent.closure({instance:this,method:function(div,divC,uid,drag){
-							if(!drag.moved){return false;}
-							var pos  = this.parent.dom.position(div);
-							var h=pos;
-							var data = this.data.db.stages[uid];
-							var db = this.data.db;
-							var r = new leimnud.module.rpc.xmlhttp({
-									url:this.options.dataServer,
-									args:"action=saveStagePosition&data="+{uid:data.uid,position:pos}.toJSONString()
-								});
-							r.make();
-						},args:[a,c,index,options.object.drag]})
-					};
-					options.object.drag.make();
-				}
-			},
-			derivation:function(options)
-			{
-				tt=options;
-				var index=this.tools.getIndexOfUid(options.stg_uid);
-				var from=this.data.db.stages[index];
-				this.data.render.deleteDerivation(options.stg_uid);
-				var affe=options.data;
-				from.derivation.type=options.type;
-				for(var i=0;i<affe.length;i++)
-				{
-					from.derivation.to[i]={
-						stage:affe[i]
-					};
-				}
-				this.data.render.lineDerivation(index);
-			}
-	  }
-	}.expand(this,true);
-	this.tools={
-		getIndexOfUid:function(uid)
-		{
-			for(var i=0;i<this.data.db.stages.length;i++)
-			{
-				if(this.data.db.stages[i].uid===uid){return i;}
-			}
-		},
-		getUidOfIndex:function(index)
-		{
-			return this.data.db.stages[index].uid || false;
-		}
-	}.expand(this);
-	this.expand(this);
-};
-
-stagesmap.prototype={
-	parent:leimnud,
-	tmp:{},
-	info:{
-		name		: "stagesmap"
-	},
-	panels:{},dragables:{},dropables:{},
-	make:function() {
-		this.options = {
-			theme	:"firefox",
-			rw	:true,
-			mi  :true,
-			hideMenu:true
-		}.concatMaborak(this.options || {});
-		this.options.target = this.parent.dom.element(this.options.target);
-		if(!this.validate()){return false;}
-		this.observers = {
-			menu 		: this.parent.factory(this.parent.pattern.observer,true),
-			lineas 		: this.parent.factory(this.parent.pattern.observer,true)
-		};
-		this.dropables.derivation = new this.parent.module.drop();
-		this.dropables.derivation.make();
-		if (this.options.rw === true) {
-		  var bd = this.parent.dom.capture("tag.body 0");
-		  var sm = this.parent.dom.element("pm_submenu");
-		  this.parent.dom.setStyle(bd,{
-		  	backgroundColor:"buttonface"
-		  });
-		  this.parent.dom.setStyle(sm,{
-		  	height:25
-		  });
-	  }
-		this.panels.editor=new leimnud.module.panel();
-		this.panels.editor.options={
-			limit:true,
-			size:{w:this.options.size.w,h:this.options.size.h - 10},
-			position:{x:0,y:0},
-			title:"",
-			titleBar:false,
-			control:{
-				resize:false
-			},
-			fx:{
-				opacity:false,
-				shadow:false,
-				blinkToFront:false
-			},
-			theme:this.options.theme,
-			target:this.options.target,
-			modal:true,
-			limit:true
-		};
-		this.panels.editor.setStyle={
-			content:{
-					background:"white url('"+this.options.images_dir+"bg_pm.gif') repeat fixed",
-					backgroundPosition:"10 0"
-				},
-			containerWindow	:{borderWidth:0,padding:0,backgroundColor:"buttonface"},
-			titleBar	:{background:"transparent",borderWidth:0,height:5},
-			frontend	:{backgroundColor:"buttonface"},
-			backend		:{backgroundColor:"buttonface"},
-			status		:{textAlign:"center"}
-		};
-		this.panels.editor.make();
-		this.panels.editor.loader.show();
-		this.data.load();
-	},
-	validate:function() {
-		return (!this.options.target || !this.options.dataServer || !this.options.lang)?false:true;
-	},
-	addStage:function(evt) {
-		var m = this.menu.cursor;
-		var cpos = this.parent.dom.position($('sm_target'));
-		var scl = {
-			x:$('sm_target').scrollLeft,
-			y:$('sm_target').scrollTop
-		};
-		var pos = {x:scl.x+(m.x-cpos.x)+100,y:scl.y+(m.y-cpos.y)};
-		var r = new leimnud.module.rpc.xmlhttp({
-			url:this.options.dataServer,
-			args:"action=addStage&data="+{uid:this.options.uid,position:pos}.toJSONString()
-		});
-		r.callback = function() {
-		  this.panels.editor.clearContent();
-		  this.data.load();
-		}.extend(this);
-		r.make();
-	}
+var stagesmap=function(){
+	var menu_edit_items = [];
+	this.data={
+		load:function(){
+			var r = new leimnud.module.rpc.xmlhttp({
+				url:this.options.dataServer,
+				args:"action=load&data="+{uid:this.options.uid,mode:this.options.rw}.toJSONString()
+			});
+			r.callback=this.data.render.base;
+			r.make();
+		},
+		render:{
+			base:function(xml) {
+				this.panels.editor.loader.hide();
+				this.data.db=xml.xmlhttp.responseText.parseJSON().concatMaborak({});
+				if (this.options.rw===true) {
+				  this.menu = new this.parent.module.app.menuRight();
+				  this.menu.make({
+					  target:this.panels.editor.elements.content,//posiblemente hay que cambiar algo aqui para el menu contextual
+					  width:150,
+					  theme:this.options.theme,
+					  menu:[
+					    {image:"/images/add.png",text:G_STRINGS.ID_PROCESSMAP_ADD_STAGE,launch:this.addStage.extend(this)}
+					  ]
+				  });
+				  menu_add = this.menu;
+				  this.observers.menu.register(this.parent.closure({instance:this.menu,method:this.menu.remove}),this.menu);
+				}
+				this.data.render.title();
+				this.data.render.stage();
+				this.data.render.derivation();
+			},
+			stage:function() {
+				var lngt = this.data.db.stages.length;
+				for(var i =0;i<lngt;i++)
+				{
+					this.data.build.stage(i);
+				}
+			},
+			title:function() {
+				this.data.build.title();
+			},
+			derivation:function(uid,type) {
+				for(var i=0;i<this.data.db.stages.length;i++)
+				{
+					this.data.render.lineDerivation(i);
+				}
+				return true;
+			},
+			lineDerivation:function(index) {
+				var stage = this.data.db.stages[index];
+				for(var j=0;j<stage.derivation.to.length;j++)
+				{
+					var derivation  = stage.derivation.to[j];
+					if(derivation.stage==="-1" || derivation.stage==="-2")
+					{
+						var target=(stage.derivation.to.length>1)?'derivationBottom':'derivation';
+						this.parent.dom.setStyle(stage.object.elements[target],{
+							background:"url("+this.options.images_dir+derivation.stage+((target=="derivationBottom")?"bb.jpg":".gif")+"?aa="+Math.random()+")"
+						});
+					}
+					else
+					{
+						var uid	 = this.tools.getIndexOfUid(derivation.stage);
+						var stageF= stage.object.elements;
+						var stageT= this.data.db.stages[uid].object.elements;
+						var from = stage.object.elements.derivation;
+						var toStage=this.data.db.stages[uid];
+						var to	 = toStage.object.elements.stage;
+						if(stage.derivation.type!==5)
+						{
+							this.parent.dom.setStyle(stage.object.elements.derivation,{
+								background:"url("+this.options.images_dir+stage.derivation.type+"t.gif?aa="+Math.random()+")"
+							});
+						}
+						else
+						{
+							var ij = toStage.object.inJoin;
+							ij = (ij)?ij+1:1;
+							toStage.object.inJoin = ij;
+							this.parent.dom.setStyle(toStage.object.elements.init,{
+								background:"url("+this.options.images_dir+stage.derivation.type+"t.gif?aa="+Math.random()+")",
+								backgroundPosition:"2 0",
+								backgroundRepeat:"no-repeat"
+							});
+						}
+						var line = new this.parent.module.app.line({
+							indexRootSize:30,
+							indexRootLastSize:35,
+							elements:[stageF.stage,stageT.stage],
+							envolve:[
+								[stageF.stage],
+								[]
+							],
+							target:this.panels.editor.elements.content,
+							color:"#228AB0",
+							startA:50,
+							zIndex:5
+						});
+						line.make();
+						var cE=this.observers.lineas.register(line.update,line);
+						derivation.object={
+							line		: line,
+							indexObserver	: cE
+						};
+					}
+				}
+			},
+			deleteDerivation:function(uid,rec,spec) {
+				var stage = this.data.db.stages[this.tools.getIndexOfUid(uid)];
+				spec	 = (typeof spec!=="number")?false:spec;
+				var deri = stage.derivation;
+				for(var i=0;i<deri.to.length;i++)
+				{
+					if(spec===false || (spec!==false && spec===i))
+					{
+						deri.to[i].object.line.remove();
+						this.observers.lineas.unregister(deri.to[i].object.indexObserver);
+						if(deri.type===5)
+						{
+							var toStage = this.data.db.stages[this.tools.getIndexOfUid(deri.to[i].stage)];
+							toStage.object.inJoin = toStage.object.inJoin-1;
+							if(toStage.object.inJoin===0)
+							{
+								this.parent.dom.setStyle(toStage.object.elements.init,{
+									backgroundPosition:"0 0",
+									background:""
+								});
+							}
+						}
+					}
+				}
+				this.parent.dom.setStyle(stage.object.elements.derivation,{
+					background:""
+				});
+				stage.derivation={to:[]};
+				if(rec)
+				{
+					var tdb = this.data.db.stages;
+					for(var i=0;i<tdb.length;i++)
+					{
+						var der = tdb[i].derivation.to || [];
+						for(var j=0;j<der.length;j++)
+						{
+							if(der[j].stage===uid)
+							{
+								this.data.render.deleteDerivation(tdb[i].uid,false,j);
+							}
+						}
+					}
+				}
+			}
+		},
+		build:{
+		  title:function(index)
+			{
+				if(this.data.db.title)
+				{
+					var title=this.data.db.title;
+					var t = document.createElement("div");
+					t.className="processmap_title___"+this.options.theme;
+					this.parent.dom.setStyle(t,{
+						top:title.position.y,
+						left:title.position.x,
+						cursor:"default"
+					});
+					t.innerHTML=title.label;
+					this.panels.editor.elements.content.appendChild(t);
+					title.object={
+						elements:{
+							label:t
+						}
+					}
+				}
+			},
+			stage:function(index)
+			{
+				var options 	= this.data.db.stages[index];
+				var db		= this.data.db, stage=db.stages[index];
+				var derivation 	= stage.derivation.to;
+				var a = document.createElement("div");
+				a.className="processmap_task___"+this.options.theme;
+				this.parent.dom.setStyle(a,{
+					top:options.position.y,
+					left:options.position.x,
+					cursor:((this.options.rw===true)?"move":"default"),
+					backgroundColor:(options.color ? options.color : 'auto')
+				});
+				var b = document.createElement("div");
+				b.className="processmap_task_label___"+this.options.theme;
+				this.parent.dom.setStyle(b,{
+					cursor:((this.options.rw===true)?"move":"default")
+				});
+				b.innerHTML = options.label;
+
+				var c = document.createElement("div");
+				this.parent.dom.setStyle(c,{
+					position:"absolute",
+					top: options.position.y+38,
+					left:options.position.x+(81-12),
+					height:25,
+					width:25,
+					border:"0px solid black",
+					overflow:"hidden",
+          cursor:'default',
+					zIndex:9
+				});
+				var d = document.createElement("div");
+				this.parent.dom.setStyle(d,{
+					position:"absolute",
+					top: options.position.y+49,
+					left:options.position.x+(93),
+					height:38,
+					width:38,
+					border:"0px solid black",
+					overflow:"hidden",
+					zIndex:9
+				});
+				var t = document.createElement("div");
+				this.parent.dom.setStyle(t,{
+					position:"absolute",
+					top:options.position.y-30,
+					left:options.position.x+(81-14),
+					height:30,
+					width:30,
+					overflow:"hidden",
+					zIndex:9
+				});
+				if(this.options.rw===true)
+				{
+				  this.menuEdit = new this.parent.module.app.menuRight();
+				  this.menuEdit.make({
+				  	target:a,
+				  	width:201,
+				  	theme:this.options.theme,
+				  	menu:[
+				  	{image:"/images/edit.gif",text:G_STRINGS.ID_PROCESSMAP_EDIT,launch:function(event,index){
+					  	var panel;
+					  	this.tmp.stagePanel = panel = new leimnud.module.panel();
+					  	panel.options={
+					  		limit	:true,
+					  		size	:{w:450,h:160},
+					  		position:{x:50,y:50,center:true},
+					  		title	:G_STRINGS.ID_PROCESSMAP_EDIT+": "+stage.label,
+					  		theme	:this.options.theme,
+					  		control	:{close:true,resize:false},fx:{modal:true},
+					  		statusBar:false,
+					  		fx	:{modal:true}
+					  	};
+					  	panel.make();
+					  	panel.loader.show();
+					  	var r;
+					  	panel.currentRPC = r = new leimnud.module.rpc.xmlhttp({
+					  		url:this.options.dataServer,
+					  		args:"action=editStage&data="+{
+					  			stg_uid	:stage.uid,
+					  			pro_uid	:this.options.uid,
+					  			theindex:index
+					  		}.toJSONString()
+					  	});
+					  	r.callback=function(rpc,panel)
+					  	{
+					  		panel.loader.hide();
+					  		var scs = rpc.xmlhttp.responseText.extractScript();
+					  		panel.addContent(rpc.xmlhttp.responseText);
+					  		scs.evalScript();
+					  	}.extend(this,panel);
+					  	r.make();
+					  }.extend(this,index)},
+					  {image:"/images/task.gif",text:G_STRINGS.ID_PROCESSMAP_TASKS_ASSIGNED,launch:function(event,index){
+					  	var panel;
+					  	this.tmp.stagePanel = panel = new leimnud.module.panel();
+					  	panel.options={
+					  		limit	:true,
+					  		size	:{w:450,h:400},
+					  		position:{x:50,y:50,center:true},
+					  		title	:G_STRINGS.ID_PROCESSMAP_TASKS_ASSIGNED_FOR+": "+stage.label,
+					  		theme	:this.options.theme,
+					  		control	:{close:true,resize:false},fx:{modal:true},
+					  		statusBar:false,
+					  		fx	:{modal:true}
+					  	};
+					  	panel.make();
+					  	panel.loader.show();
+					  	var r;
+					  	panel.currentRPC = r = new leimnud.module.rpc.xmlhttp({
+					  		url:this.options.dataServer,
+					  		args:"action=tasksAssigned&data="+{
+					  			stg_uid	:stage.uid,
+					  			pro_uid	:this.options.uid,
+					  			theindex:index
+					  		}.toJSONString()
+					  	});
+					  	r.callback=function(rpc,panel)
+					  	{
+					  		panel.loader.hide();
+					  		var scs = rpc.xmlhttp.responseText.extractScript();
+					  		panel.addContent(rpc.xmlhttp.responseText);
+					  		scs.evalScript();
+					  	}.extend(this,panel);
+					  	r.make();
+					  }.extend(this,index)},
+					  {image:"/images/delete.png",text:G_STRINGS.ID_PROCESSMAP_DELETE_STAGE,launch:this.parent.closure({instance:this,method:function(index){
+				  		var data = this.data.db.stages[index];
+				  		new this.parent.module.app.confirm().make({
+				  			label:G_STRINGS.ID_PROCESSMAP_CONFIRM_DELETE_STAGE+data.label,
+				  			action:function()
+				  			{
+				  				var r = new leimnud.module.rpc.xmlhttp({
+				  					url:this.options.dataServer,
+				  					args:"action=deleteStage&data="+{pro_uid:this.options.uid,stg_uid:data.uid}.toJSONString()
+				  				});
+				  				r.callback = function() {
+				  				  this.panels.editor.clearContent();
+				  				  this.data.load();
+				  			  }.extend(this);
+				  				r.make();
+				  			}.extend(this)
+				  		});
+				  	},args:index})}
+				  	]
+				  });
+				  menu_edit_items.push(this.menuEdit);	  
+				  this.observers.menu.register(this.menuEdit.remove,this.menuEdit);
+				}
+				this.panels.editor.elements.content.appendChild(a);
+				a.appendChild(b);
+				this.panels.editor.elements.content.appendChild(c);
+				this.panels.editor.elements.content.appendChild(d);
+				this.panels.editor.elements.content.appendChild(t);
+
+				options.object={
+					elements:{
+						stage	: a,
+						label	: b,
+						derivation: c,
+						derivationBottom: d,
+						init	: t
+					}
+				};
+				options.object.dropIndex=this.dropables.derivation.register({
+					element	: a,
+					value	: index,
+					events	: {
+						over	:this.parent.closure({instance:this.dropables.derivation,method:function(e,o,u){
+							this.parent.dom.setStyle(e,{
+								border:"1px solid #006699"
+							});
+						},args:[a,options,index]}),
+						out		:this.parent.closure({instance:this.dropables.derivation,method:function(e,o,u){
+							this.parent.dom.setStyle(e,{
+								border:"0px solid #006699"
+							});
+						},args:[a,options,index]})
+					}
+				});
+				if(this.options.rw===true)
+				{
+					options.object.drag = new this.parent.module.drag({
+						link:{
+							elements:a,
+							ref:[a,c,d,t]
+						},
+						limit:true
+					});
+					this.observers.lineas.register(this.parent.closure({instance:options.object.drag,method:function(){}}),options.object.drag);
+					options.object.drag.events={
+						move	:this.parent.closure({instance:this,method:function(div,divC,uid,drag) {
+						  options.object.drag.observer.update();
+							var db = this.data.db;
+						  },args:[a,c,index,options.object.drag]}),
+
+						finish	:this.parent.closure({instance:this,method:function(div,divC,uid,drag){
+							for(var j=0;j<this.data.db.stages.length;j++){
+								if(menu_edit_items[j].options.target.textContent == options.label){
+									menu_edit = menu_edit_items[j];
+								}
+							}
+							if(!drag.moved){return false;}
+							var pos  = this.parent.dom.position(div);
+							var h=pos;
+							var data = this.data.db.stages[uid];
+							var db = this.data.db;
+							var r = new leimnud.module.rpc.xmlhttp({
+									url:this.options.dataServer,
+									args:"action=saveStagePosition&data="+{uid:data.uid,position:pos}.toJSONString()
+								});
+							r.make();
+						},args:[a,c,index,options.object.drag]})
+					};
+					options.object.drag.make();
+				}
+			},
+			derivation:function(options)
+			{
+				tt=options;
+				var index=this.tools.getIndexOfUid(options.stg_uid);
+				var from=this.data.db.stages[index];
+				this.data.render.deleteDerivation(options.stg_uid);
+				var affe=options.data;
+				from.derivation.type=options.type;
+				for(var i=0;i<affe.length;i++)
+				{
+					from.derivation.to[i]={
+						stage:affe[i]
+					};
+				}
+				this.data.render.lineDerivation(index);
+			}
+	  }
+	}.expand(this,true);
+	this.tools={
+		getIndexOfUid:function(uid)
+		{
+			for(var i=0;i<this.data.db.stages.length;i++)
+			{
+				if(this.data.db.stages[i].uid===uid){return i;}
+			}
+		},
+		getUidOfIndex:function(index)
+		{
+			return this.data.db.stages[index].uid || false;
+		}
+	}.expand(this);
+	this.expand(this);
+};
+
+stagesmap.prototype={
+	parent:leimnud,
+	tmp:{},
+	info:{
+		name		: "stagesmap"
+	},
+	panels:{},dragables:{},dropables:{},
+	make:function() {
+		this.options = {
+			theme	:"firefox",
+			rw	:true,
+			mi  :true,
+			hideMenu:true
+		}.concatMaborak(this.options || {});
+		this.options.target = this.parent.dom.element(this.options.target);
+		if(!this.validate()){return false;}
+		this.observers = {
+			menu 		: this.parent.factory(this.parent.pattern.observer,true),
+			lineas 		: this.parent.factory(this.parent.pattern.observer,true)
+		};
+		this.dropables.derivation = new this.parent.module.drop();
+		this.dropables.derivation.make();
+		if (this.options.rw === true) {
+		  var bd = this.parent.dom.capture("tag.body 0");
+		  var sm = this.parent.dom.element("pm_submenu");
+		  this.parent.dom.setStyle(bd,{
+		  	backgroundColor:"buttonface"
+		  });
+		  this.parent.dom.setStyle(sm,{
+		  	height:25
+		  });
+	  }
+		this.panels.editor=new leimnud.module.panel();
+		this.panels.editor.options={
+			limit:true,
+			size:{w:this.options.size.w,h:this.options.size.h - 10},
+			position:{x:0,y:0},
+			title:"",
+			titleBar:false,
+			control:{
+				resize:false
+			},
+			fx:{
+				opacity:false,
+				shadow:false,
+				blinkToFront:false
+			},
+			theme:this.options.theme,
+			target:this.options.target,
+			modal:true,
+			limit:true
+		};
+		this.panels.editor.setStyle={
+			content:{
+					background:"white url('"+this.options.images_dir+"bg_pm.gif') repeat fixed",
+					backgroundPosition:"10 0"
+				},
+			containerWindow	:{borderWidth:0,padding:0,backgroundColor:"buttonface"},
+			titleBar	:{background:"transparent",borderWidth:0,height:5},
+			frontend	:{backgroundColor:"buttonface"},
+			backend		:{backgroundColor:"buttonface"},
+			status		:{textAlign:"center"}
+		};
+		this.panels.editor.make();
+		this.panels.editor.loader.show();
+		this.data.load();
+	},
+	validate:function() {
+		return (!this.options.target || !this.options.dataServer || !this.options.lang)?false:true;
+	},
+	addStage:function(evt) {
+		var m = this.menu.cursor;
+		var cpos = this.parent.dom.position($('sm_target'));
+		var scl = {
+			x:$('sm_target').scrollLeft,
+			y:$('sm_target').scrollTop
+		};
+		var pos = {x:scl.x+(m.x-cpos.x)+100,y:scl.y+(m.y-cpos.y)};
+		var r = new leimnud.module.rpc.xmlhttp({
+			url:this.options.dataServer,
+			args:"action=addStage&data="+{uid:this.options.uid,position:pos}.toJSONString()
+		});
+		r.callback = function() {
+		  this.panels.editor.clearContent();
+		  this.data.load();
+		}.extend(this);
+		r.make();
+	}
 };
\ No newline at end of file
diff --git a/workflow/engine/xmlform/tracker/tracker_Configuration.xml b/workflow/engine/xmlform/tracker/tracker_Configuration.xml
index b99366f09..dba0e4cde 100755
--- a/workflow/engine/xmlform/tracker/tracker_Configuration.xml
+++ b/workflow/engine/xmlform/tracker/tracker_Configuration.xml
@@ -1,87 +1,94 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dynaForm name="tracker_Configuration" width="100%" labelWidth="35%" enableTemplate="1">
-  <PRO_UID type="hidden"/>
-  <CT_MAP_TYPE type="dropdown">
-    <en><![CDATA[Map type]]><option name="NONE"><![CDATA[None]]></option><option name="PROCESSMAP"><![CDATA[Process Map]]></option><option name="STAGES"><![CDATA[Stages Map]]></option></en>
-  </CT_MAP_TYPE>
-  <CT_STAGES_MAP_EDIT type="link" link="#" onclick="editStagesMap(@QPRO_UID);">
-    <en><![CDATA[Edit]]></en>
-  </CT_STAGES_MAP_EDIT>
-  <CT_DERIVATION_HISTORY type="checkbox" value="1">
-    <en><![CDATA[Routing History]]></en>
-  </CT_DERIVATION_HISTORY>
-  <CT_MESSAGE_HISTORY type="checkbox" value="1">
-    <en><![CDATA[Messages History]]></en>
-  </CT_MESSAGE_HISTORY>
-  <BTN_CANCEL type="button" onclick="cancel();">
-    <en><![CDATA[Cancel]]></en>
-  </BTN_CANCEL>
-  <SAVE type="button" onclick="updateCaseTracker(this.form);">
-    <en><![CDATA[Save]]></en>
-  </SAVE>
-  <JS type="javascript"><![CDATA[
-
-var CT_MAP_TYPE = getField('CT_MAP_TYPE');
-switch (CT_MAP_TYPE.value) {
-  case 'NONE':
-  case 'PROCESSMAP':
-    document.getElementById('MAP_EDIT_LINK').style.display = 'none';
-  break;
-  case 'STAGES':
-    document.getElementById('MAP_EDIT_LINK').style.display = '';
-  break;
-}
-
-leimnud.event.add(CT_MAP_TYPE, 'change', function() {
-  switch (getField('CT_MAP_TYPE').value) {
-    case 'NONE':
-    case 'PROCESSMAP':
-      document.getElementById('MAP_EDIT_LINK').style.display = 'none';
-    break;
-    case 'STAGES':
-      document.getElementById('MAP_EDIT_LINK').style.display = '';
-    break;
-  }
-});
-
-var updateCaseTracker = function(oForm) {
-  ajax_post(oForm.action, oForm, 'POST');
-  Pm.tmp.caseTrackerPanel.remove();
-};
-
-var oPanel;
-var editStagesMap = function(sProcessUID) {
-  oPanel = new leimnud.module.panel();
-	oPanel.options = {
-		size	:{w:800,h:580},
-		position:{x:0,y:0,center:true},
-		title	:G_STRINGS.ID_EDIT_STAGES_MAP,
-		theme	:'processmaker',
-		statusBar:false,
-		control	:{resize:false,roll:false},
-		fx	:{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:false}
-  };
-  oPanel.events = {
-  	remove: function() { delete(oPanel); menu_right.remove(); }.extend(this)
-  };
-	oPanel.make();
-	oPanel.loader.show();
-	var oRPC = new leimnud.module.rpc.xmlhttp({
-		url : '../tracker/tracker_Ajax',
-		args: 'action=editStagesMap&PRO_UID=' + sProcessUID
-  });
-  oRPC.callback = function(rpc) {
-		oPanel.loader.hide();
-		oPanel.addContent(rpc.xmlhttp.responseText);
-		var scs = rpc.xmlhttp.responseText.extractScript();
-		scs.evalScript();
-  }.extend(this);
-	oRPC.make();
-};
-
-function cancel(){
-    Pm.tmp.caseTrackerPanel.remove();
-}
-
-]]></JS>
-</dynaForm>
+<?xml version="1.0" encoding="UTF-8"?>
+<dynaForm name="tracker_Configuration" width="100%" labelWidth="35%" enableTemplate="1">
+  <PRO_UID type="hidden"/>
+  <CT_MAP_TYPE type="dropdown">
+    <en><![CDATA[Map type]]><option name="NONE"><![CDATA[None]]></option><option name="PROCESSMAP"><![CDATA[Process Map]]></option><option name="STAGES"><![CDATA[Stages Map]]></option></en>
+  </CT_MAP_TYPE>
+  <CT_STAGES_MAP_EDIT type="link" link="#" onclick="editStagesMap(@QPRO_UID);">
+    <en><![CDATA[Edit]]></en>
+  </CT_STAGES_MAP_EDIT>
+  <CT_DERIVATION_HISTORY type="checkbox" value="1">
+    <en><![CDATA[Routing History]]></en>
+  </CT_DERIVATION_HISTORY>
+  <CT_MESSAGE_HISTORY type="checkbox" value="1">
+    <en><![CDATA[Messages History]]></en>
+  </CT_MESSAGE_HISTORY>
+  <BTN_CANCEL type="button" onclick="cancel();">
+    <en><![CDATA[Cancel]]></en>
+  </BTN_CANCEL>
+  <SAVE type="button" onclick="updateCaseTracker(this.form);">
+    <en><![CDATA[Save]]></en>
+  </SAVE>
+  <JS type="javascript"><![CDATA[
+
+var CT_MAP_TYPE = getField('CT_MAP_TYPE');
+switch (CT_MAP_TYPE.value) {
+  case 'NONE':
+  case 'PROCESSMAP':
+    document.getElementById('MAP_EDIT_LINK').style.display = 'none';
+  break;
+  case 'STAGES':
+    document.getElementById('MAP_EDIT_LINK').style.display = '';
+  break;
+}
+
+leimnud.event.add(CT_MAP_TYPE, 'change', function() {
+  switch (getField('CT_MAP_TYPE').value) {
+    case 'NONE':
+    case 'PROCESSMAP':
+      document.getElementById('MAP_EDIT_LINK').style.display = 'none';
+    break;
+    case 'STAGES':
+      document.getElementById('MAP_EDIT_LINK').style.display = '';
+    break;
+  }
+});
+
+var updateCaseTracker = function(oForm) {
+  ajax_post(oForm.action, oForm, 'POST');
+  Pm.tmp.caseTrackerPanel.remove();
+};
+
+var oPanel;
+var editStagesMap = function(sProcessUID) {
+  oPanel = new leimnud.module.panel();
+	oPanel.options = {
+		size	:{w:800,h:580},
+		position:{x:0,y:0,center:true},
+		title	:G_STRINGS.ID_EDIT_STAGES_MAP,
+		theme	:'processmaker',
+		statusBar:false,
+		control	:{resize:false,roll:false},
+		fx	:{modal:true,opacity:true,blinkToFront:false,fadeIn:false,drag:false}
+  };
+  oPanel.events = {
+  	remove: function() { 
+  	  delete(oPanel); 
+  	  if(menu_edit.maked === true){
+  	      menu_edit.remove();
+  	  } else if (menu_add.maked === true) {
+  	      menu_add.remove();
+  	  }
+  	}.extend(this)
+  };
+	oPanel.make();
+	oPanel.loader.show();
+	var oRPC = new leimnud.module.rpc.xmlhttp({
+		url : '../tracker/tracker_Ajax',
+		args: 'action=editStagesMap&PRO_UID=' + sProcessUID
+  });
+  oRPC.callback = function(rpc) {
+		oPanel.loader.hide();
+		oPanel.addContent(rpc.xmlhttp.responseText);
+		var scs = rpc.xmlhttp.responseText.extractScript();
+		scs.evalScript();
+  }.extend(this);
+	oRPC.make();
+};
+
+function cancel(){
+    Pm.tmp.caseTrackerPanel.remove();
+}
+
+]]></JS>
+</dynaForm>
\ No newline at end of file

From dbc3504737fa341134a77f2febac2f18bb5e02fc Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 5 Jun 2014 09:57:36 -0400
Subject: [PATCH 3/4] Translation error for mafe.

---
 workflow/engine/classes/model/Translation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/workflow/engine/classes/model/Translation.php b/workflow/engine/classes/model/Translation.php
index 7d647513c..2b1df119e 100755
--- a/workflow/engine/classes/model/Translation.php
+++ b/workflow/engine/classes/model/Translation.php
@@ -207,7 +207,7 @@ class Translation extends BaseTranslation
         $c->add( TranslationPeer::TRN_ID, '%ID_MAFE_%', Criteria::LIKE );
         $c->addAscendingOrderByColumn( 'TRN_CATEGORY' );
         $c->addAscendingOrderByColumn( 'TRN_ID' );
-        $c->addAscendingOrderByColumn( 'TRN_LANG' );
+        //$c->addAscendingOrderByColumn( 'TRN_LANG' );
         $tranlations = TranslationPeer::doSelect( $c );
 
         $mafeFolder = PATH_HTML . "translations";

From 77412ef66333b84b85c43a612bdb766a6cfb0dc2 Mon Sep 17 00:00:00 2001
From: jennylee <jennylee@colosa.com>
Date: Thu, 5 Jun 2014 16:56:16 -0400
Subject: [PATCH 4/4] Solving conflicts

---
 .../xmlform/tracker/tracker_Configuration.xml | 49 ++++++++-----------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/workflow/engine/xmlform/tracker/tracker_Configuration.xml b/workflow/engine/xmlform/tracker/tracker_Configuration.xml
index 9e4fc888c..0b5233b3c 100755
--- a/workflow/engine/xmlform/tracker/tracker_Configuration.xml
+++ b/workflow/engine/xmlform/tracker/tracker_Configuration.xml
@@ -1,33 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dynaForm name="tracker_Configuration" width="100%" labelWidth="35%" enableTemplate="1">
-
-<PRO_UID type="hidden"/>
-
-<CT_MAP_TYPE type="dropdown">
-  <en>Map type <option name="NONE">None</option><option name="PROCESSMAP">Process Map</option><option name="STAGES">Stages Map</option></en>
-</CT_MAP_TYPE>
-
-<CT_STAGES_MAP_EDIT type="link" link="#" onclick="editStagesMap(@QPRO_UID);">
-  <en>Edit</en>
-</CT_STAGES_MAP_EDIT>
-
-<CT_DERIVATION_HISTORY type="checkbox" value="1">
-  <en>Routing History</en>
-</CT_DERIVATION_HISTORY>
-
-<CT_MESSAGE_HISTORY type="checkbox" value="1">
-  <en>Messages History</en>
-</CT_MESSAGE_HISTORY>
-
-<BTN_CANCEL type="button" onclick="cancel();">
-  <en>Cancel</en>
-</BTN_CANCEL>
-
-<SAVE type="button" onclick="updateCaseTracker(this.form);">
-  <en>Save</en>
-</SAVE>
-
-<JS type="javascript"><![CDATA[
+  <PRO_UID type="hidden"/>
+  <CT_MAP_TYPE type="dropdown">
+    <en><![CDATA[Map type]]><option name="NONE"><![CDATA[None]]></option><option name="PROCESSMAP"><![CDATA[Process Map]]></option><option name="STAGES"><![CDATA[Stages Map]]></option></en>
+  </CT_MAP_TYPE>
+  <CT_STAGES_MAP_EDIT type="link" link="#" onclick="editStagesMap(@QPRO_UID);">
+    <en><![CDATA[Edit]]></en>
+  </CT_STAGES_MAP_EDIT>
+  <CT_DERIVATION_HISTORY type="checkbox" value="1">
+    <en><![CDATA[Routing History]]></en>
+  </CT_DERIVATION_HISTORY>
+  <CT_MESSAGE_HISTORY type="checkbox" value="1">
+    <en><![CDATA[Messages History]]></en>
+  </CT_MESSAGE_HISTORY>
+  <BTN_CANCEL type="button" onclick="cancel();">
+    <en><![CDATA[Cancel]]></en>
+  </BTN_CANCEL>
+  <SAVE type="button" onclick="updateCaseTracker(this.form);">
+    <en><![CDATA[Save]]></en>
+  </SAVE>
+  <JS type="javascript"><![CDATA[
 
 var CT_MAP_TYPE = getField('CT_MAP_TYPE');
 switch (CT_MAP_TYPE.value) {
@@ -99,5 +91,4 @@ function cancel(){
 }
 
 ]]></JS>
-
 </dynaForm>
\ No newline at end of file