qx 0.8.3 deprecation

[gpl/argeo-slc.git] / server / org.argeo.slc.ria / src / argeo-ria-lib / slc / class / org / argeo / slc / ria / BatchView.js

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 78715de0403652f23aad1095fc6ccf67ba59daa7..5f68b2cf6eeca1f9a525e554eb999193d8d288dd 100644 (file)
--- 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
@@ -42,10 +42,12 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                                                }\r
                                                var prefName = "slc.batch.autoclear";\r
                                                var prefValue = this.getRiaPreferenceValue(prefName);\r
-                                               if(prefValue !== null){\r
-                                                       this.executeBatchOnAgent(batchAgentId, prefValue);\r
-                                                       return;\r
+                                               if(prefValue !== null && prefValue === true){\r
+                                                       this.executeBatchOnAgent(batchAgentId, true);                                                   \r
+                                               }else{\r
+                                                       this.executeBatchOnAgent(batchAgentId, false);\r
                                                }\r
+                                               return;\r
                                                var modal = new org.argeo.ria.components.Modal("Clear?", null);\r
                                                modal.addYesNoReminder("Do you want to clear the batch automatically after execution?", prefName);\r
                                                modal.addListener("cancel", function(e){\r
@@ -112,8 +114,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                                        toolbar : "batch",\r
                                        callback : function(e) {\r
                                                var sel = this.list.getSortedSelection();\r
-                                               var confirmPref = this.getRiaPreferenceValue("slc.batch.delete.confirm");\r
-                                               this.debug(confirmPref);\r
+                                               var confirmPref = this.getRiaPreferenceValue("slc.batch.delete.confirm");                                               \r
                                                var execution = function() {\r
                                                        for (var i = 0; i < sel.length; i++) {\r
                                                                this.list.remove(sel[i]);\r
@@ -383,16 +384,14 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                        var executionFlow = target.getUserData("executionFlow");\r
                        var batchEntry = new org.argeo.slc.ria.execution.BatchEntrySpec(\r
                                        executionModule, executionFlow);\r
-                       var label = batchEntry.getLabel();\r
-                       var icon = target.getIcon() || "org.argeo.slc.ria/office-document.png";\r
-                       var item = new qx.ui.form.ListItem(label, icon);\r
-                       /*\r
-                       item.addListener("dblclick", function(e) {\r
-                                               this.getCommands()["editexecutionspecs"].command\r
-                                                               .execute();\r
-                                       }, this);\r
-                       */\r
-                       item.setUserData("batchEntrySpec", batchEntry);\r
+\r
+                       this.appendBatchEntrySpec(batchEntry, target.getIcon(), after);         \r
+               },\r
+               \r
+               appendBatchEntrySpec: function(batchEntrySpec, icon, after){\r
+                                               \r
+                       var item = new qx.ui.form.ListItem(batchEntrySpec.getLabel(), icon || "org.argeo.slc.ria/system.png");\r
+                       item.setUserData("batchEntrySpec", batchEntrySpec);\r
                        item.setPaddingTop(1);\r
                        item.setPaddingBottom(2);\r
                        if (after) {\r
@@ -403,12 +402,8 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                        } else {\r
                                this.list.add(item);\r
                        }\r
-                       this.list.select(item);\r
-                       /*\r
-                       if (this.getAutoOpen() && !skipAutoOpen) {\r
-                               this.getCommands()["editexecutionspecs"].command.execute();\r
-                       }\r
-                       */\r
+                       this.list.setSelection([item]);\r
+                       \r
                },\r
 \r
                /**\r
@@ -421,13 +416,21 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                        var selection = this.list.getChildren();\r
                        if (!selection.length)\r
                                return;\r
+                       // Get Host\r
+                       var agentsMap = org.argeo.ria.components.ViewsManager.getInstance().getViewPaneById("selector").getContent().getAgentsMap();\r
+                       var host = agentsMap[agentUuid];\r
                        var slcExecMessage = new org.argeo.slc.ria.execution.Message();\r
+                       slcExecMessage.setHost(host);\r
                        for (var i = 0; i < selection.length; i++) {\r
                                var batchEntrySpec = selection[i].getUserData("batchEntrySpec");\r
                                slcExecMessage.addBatchEntrySpec(batchEntrySpec);\r
                        }\r
                        try{\r
                                var xmlMessage = slcExecMessage.toXml();\r
+                               if(!window.xmlExecStub){\r
+                                       window.xmlExecStub = {};\r
+                               }\r
+                               window.xmlExecStub[slcExecMessage.getUuid()] = qx.xml.Document.fromString(xmlMessage);\r
                                var req = org.argeo.slc.ria.SlcApi.getNewSlcExecutionService(\r
                                                agentUuid, xmlMessage);\r
                                req.send();\r
@@ -442,6 +445,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                                if(clearBatch){\r
                                        req.addListener("completed", function(e){\r
                                                this.list.removeAll();\r
+                                               this.setBatchAgentId(null);\r
                                        }, this);\r
                                }                                               \r
                        }catch(e){\r