X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=server%2Forg.argeo.slc.ria%2Fsrc%2Fargeo-ria-lib%2Fslc%2Fclass%2Forg%2Fargeo%2Fslc%2Fria%2FBatchView.js;h=30a5e76c705bd52d8916f73a4419fe8cdbe1df8f;hb=38eb8dfdacea488c75d79158afbfb349374d3c8c;hp=c9bbc706d5ed49760655a2440ba72e6bd2f87243;hpb=b376cfc0c90c738d1ee4d01643dd215cb1d202c8;p=gpl%2Fargeo-slc.git

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
index c9bbc706d..30a5e76c7 100644
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/BatchView.js
@@ -17,6 +17,11 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 				label : "Autoclear batch on execution",
 				type : "boolean",
 				defaultValue : false
+			},
+			"slc.batch.autoOpenLog" : {
+				label : "Auto open log on execution",
+				type  : "boolean",
+				defaultValue  : true				
 			}
 		}
   	},
@@ -30,7 +35,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 			init : {
 				"submitform" : {
 					label : "Execute Batch",
-					icon : "org.argeo.slc.ria/media-playback-start.png",
+					icon : "org/argeo/slc/ria/media-playback-start.png",
 					shortcut : null,
 					enabled : false,
 					menu : "Launcher",
@@ -42,70 +47,19 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 						}
 						var prefName = "slc.batch.autoclear";
 						var prefValue = this.getRiaPreferenceValue(prefName);
-						if(prefValue !== null){
-							this.executeBatchOnAgent(batchAgentId, prefValue);
-							return;
-						}
-						var modal = new org.argeo.ria.components.Modal("Clear?", null);
-						modal.addYesNoReminder("Do you want to clear the batch automatically after execution?", prefName);
-						modal.addListener("cancel", function(e){
+						if(( prefValue !== null && prefValue === true ) || this.getForceClearPreference()){
+							this.executeBatchOnAgent(batchAgentId, true);							
+						}else{
 							this.executeBatchOnAgent(batchAgentId, false);
-						}, this);
-						modal.addListener("ok", function(e){
-							this.executeBatchOnAgent(batchAgentId, true);
-						}, this);
-						modal.attachAndShow();						
-					},
-					command : null
-				},
-				/*
-				"toggleopenonadd" : {
-					label : "Auto edit on Add",
-					icon : "org.argeo.slc.ria/document-open.png",
-					shortcut : null,
-					enabled : true,
-					toggle : true,
-					toggleInitialState : true,
-					menu : "Launcher",
-					toolbar : "launcher",
-					callback : function(event) {
-						var state = event.getTarget().getUserData("slc.command.toggleState");
-						this.setAutoOpen(state);
-					},
-					command : null
-				},
-				"editexecutionspecs" : {
-					label : "Edit Execution Specs",
-					icon : "org.argeo.slc.ria/document-open.png",
-					shortcut : null,
-					enabled : false,
-					menu : "Launcher",
-					toolbar : "batch",
-					callback : function(e) {
-						var sel = this.list.getSortedSelection();
-						var spec = sel[0].getUserData("batchEntrySpec");
-						if (spec.hasEditableValues()) {
-							var specEditor = new org.argeo.slc.ria.execution.SpecEditor(spec);
-							specEditor.attachAndShow();
-						}
-					},
-					selectionChange : function(viewId, selection) {
-						if (viewId != "batch:list")
-							return;
-						this.setEnabled(false);
-						if ((selection && selection.length == 1)) {
-							var selectedItemSpec = selection[0].getUserData("batchEntrySpec");
-							if (selectedItemSpec.hasEditableValues()) {
-								this.setEnabled(true);
-							}
 						}
+						this.setForceClearPreference(false);
+						return;
 					},
 					command : null
 				},
-				*/
 				"removefrombatch" : {
 					label : "Remove from batch",
-					icon : "org.argeo.slc.ria/edit-delete.png",
+					icon : "org/argeo/slc/ria/edit-delete.png",
 					shortcut : null,
 					enabled : false,
 					menu : "Launcher",
@@ -144,7 +98,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 				},
 				"clearbatch" : {
 					label : "Clear batch",
-					icon : "org.argeo.slc.ria/user-trash-full.png",
+					icon : "org/argeo/slc/ria/user-trash-full.png",
 					shortcut : null,
 					enabled : true,
 					menu : "Launcher",
@@ -182,7 +136,11 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 			nullable : true,
 			check : "String",
 			event : "changeBatchAgentId"
-		}	  	
+		},
+		forceClearPreference : {
+			init : false,
+			check : "Boolean"
+		}
 	},
 	  
 	construct : function(){
@@ -306,7 +264,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 
 			this.dropDecorator = new qx.ui.decoration.Background();			
 			this.dropDecorator.set({
-				backgroundImage : "org.argeo.slc.ria/drophere.gif",
+				backgroundImage : "org/argeo/slc/ria/drophere.gif",
 				backgroundRepeat : "no-repeat"
 			});
 
@@ -388,7 +346,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 		
 		appendBatchEntrySpec: function(batchEntrySpec, icon, after){
 						
-			var item = new qx.ui.form.ListItem(batchEntrySpec.getLabel(), icon || "org.argeo.slc.ria/system.png");
+			var item = new qx.ui.form.ListItem(batchEntrySpec.getLabel(), icon || "org/argeo/slc/ria/system.png");
 			item.setUserData("batchEntrySpec", batchEntrySpec);
 			item.setPaddingTop(1);
 			item.setPaddingBottom(2);
@@ -400,7 +358,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 			} else {
 				this.list.add(item);
 			}
-			this.list.select(item);
+			this.list.setSelection([item]);
 			
 		},
 
@@ -419,27 +377,23 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 			var host = agentsMap[agentUuid];
 			var slcExecMessage = new org.argeo.slc.ria.execution.Message();
 			slcExecMessage.setHost(host);
+			var execUuid = slcExecMessage.getUuid();
 			for (var i = 0; i < selection.length; i++) {
 				var batchEntrySpec = selection[i].getUserData("batchEntrySpec");
 				slcExecMessage.addBatchEntrySpec(batchEntrySpec);
 			}
 			try{
 				var xmlMessage = slcExecMessage.toXml();
-				if(!window.xmlExecStub){
-					window.xmlExecStub = {};
-				}
-				window.xmlExecStub[slcExecMessage.getUuid()] = qx.xml.Document.fromString(xmlMessage);
 				var req = org.argeo.slc.ria.SlcApi.getNewSlcExecutionService(
 						agentUuid, xmlMessage);
+				req.addListener("completed", function(response){
+					var loggerView = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("main").getContent();
+					loggerView.reloadLogger();
+					if(this.getRiaPreferenceValue("slc.batch.autoOpenLog")){
+						loggerView.openDetail([0,host,execUuid,0]);
+					}
+				}, this);
 				req.send();
-				// Force logs refresh right now!
-				qx.event.Timer.once(function() {
-							var command = org.argeo.ria.event.CommandsManager
-									.getInstance().getCommandById("reloadlogs");
-							if (command) {
-								command.execute();
-							}
-						}, this, 2000);
 				if(clearBatch){
 					req.addListener("completed", function(e){
 						this.list.removeAll();