X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.webapp%2Fsrc%2Fmain%2Fwebapp%2Fargeo-ria-lib%2Fslc%2Fclass%2Forg%2Fargeo%2Fslc%2Fria%2FSlcExecutionMessage.js;h=b81d86bc66d9f906b78d883c905313d3eb3aeda0;hb=9fa32e016b61bccc61ae7aff9c70beec9e68f9e6;hp=1ef1b5ae9af87218d202be7bbdb58ffe383c048f;hpb=ad362af53b227d1ed89e9b46f0fee5b23e400488;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js
index 1ef1b5ae9..b81d86bc6 100644
--- a/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js
+++ b/org.argeo.slc.webapp/src/main/webapp/argeo-ria-lib/slc/class/org/argeo/slc/ria/SlcExecutionMessage.js
@@ -42,6 +42,10 @@ qx.Class.define("org.argeo.slc.ria.SlcExecutionMessage", {
 			check : "String",
 			init : "user"
 		},
+		date : {
+			check : "String", 
+			init : new Date().toString()
+		},
 		/**
 		 * Additionnal attributes as map of key/values
 		 */
@@ -64,21 +68,37 @@ qx.Class.define("org.argeo.slc.ria.SlcExecutionMessage", {
 		 */
 		toXml : function (){
 			var builder = new qx.util.StringBuilder();
-			builder.add('<slc-execution uuid="'+this.getUuid()+'">');
-			builder.add('<slc-status>'+this.getStatus()+'</slc-status>');
-			builder.add('<slc-type>'+this.getType()+'</slc-type>');
-			builder.add('<slc-host>'+this.getHost()+'</slc-host>');
-			builder.add('<slc-user>'+this.getUser()+'</slc-user>');
+			builder.add('<slc:slc-execution  xmlns:slc="http://argeo.org/projects/slc/schemas" uuid="'+this.getUuid()+'">');
+			builder.add('<slc:status>'+this.getStatus()+'</slc:status>');
+			builder.add('<slc:type>'+this.getType()+'</slc:type>');
+			builder.add('<slc:host>'+this.getHost()+'</slc:host>');
+			builder.add('<slc:user>'+this.getUser()+'</slc:user>');
 			var attr = this.getAttributes();
 			if(qx.lang.Object.getLength(attr)){
-				builder.add('<slc-attributes>');
+				builder.add('<slc:attributes>');
 				for(var key in attr){
-					builder.add('<slc-attribute name="'+key+'">'+attr[key]+'</slc-attribute>');
+					builder.add('<slc:attribute name="'+key+'">'+attr[key]+'</slc:attribute>');
 				}
-				builder.add('</slc-attributes>');
+				builder.add('</slc:attributes>');
 			}
-			builder.add('</slc-execution>');
+			builder.add('</slc:slc-execution>');
 			return builder.get();
+		},
+		
+		fromXml : function(slcExecXml){
+			var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};			
+			this.setStatus(org.argeo.ria.util.Element.getSingleNodeText(slcExecXml, "slc:status", NSMap));
+			this.setType(org.argeo.ria.util.Element.getSingleNodeText(slcExecXml, "slc:type", NSMap));
+			this.setHost(org.argeo.ria.util.Element.getSingleNodeText(slcExecXml, "slc:host", NSMap));
+			this.setUser(org.argeo.ria.util.Element.getSingleNodeText(slcExecXml, "slc:user", NSMap));
+			var attributes = org.argeo.ria.util.Element.selectNodes(slcExecXml, "slc:attribute", NSMap);
+			for(var i=0;i<attributes.length;i++){
+				this.addAttribute(attribute.getAttribute("name"), attribute.firstChild);
+			}
+			var stepsDates = org.argeo.ria.util.Element.selectNodes(slcExecXml, "slc:steps/slc:slc-execution-step/slc:begin", NSMap);
+			if(stepsDates.length){
+				this.setDate(org.argeo.ria.util.Element.getSingleNodeText(stepsDates[stepsDates.length-1], ".", NSMap));
+			}
 		}
 	}	
 });
\ No newline at end of file