Double click on a script (tree leaf) will add/execute/remove it from batch.

git-svn-id: https://svn.argeo.org/slc/trunk@3273 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

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 5f68b2cf6eeca1f9a525e554eb999193d8d288dd..848ed16115ec7d469323247994aab46526f5478b 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,69 +42,16 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                                                }\r
                                                var prefName = "slc.batch.autoclear";\r
                                                var prefValue = this.getRiaPreferenceValue(prefName);\r
-                                               if(prefValue !== null && prefValue === true){\r
+                                               if(( prefValue !== null && prefValue === true ) || this.getForceClearPreference()){\r
                                                        this.executeBatchOnAgent(batchAgentId, true);                                                   \r
                                                }else{\r
                                                        this.executeBatchOnAgent(batchAgentId, false);\r
                                                }\r
+                                               this.setForceClearPreference(false);\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
-                                                       this.executeBatchOnAgent(batchAgentId, false);\r
-                                               }, this);\r
-                                               modal.addListener("ok", function(e){\r
-                                                       this.executeBatchOnAgent(batchAgentId, true);\r
-                                               }, this);\r
-                                               modal.attachAndShow();                                          \r
-                                       },\r
-                                       command : null\r
-                               },\r
-                               /*\r
-                               "toggleopenonadd" : {\r
-                                       label : "Auto edit on Add",\r
-                                       icon : "org.argeo.slc.ria/document-open.png",\r
-                                       shortcut : null,\r
-                                       enabled : true,\r
-                                       toggle : true,\r
-                                       toggleInitialState : true,\r
-                                       menu : "Launcher",\r
-                                       toolbar : "launcher",\r
-                                       callback : function(event) {\r
-                                               var state = event.getTarget().getUserData("slc.command.toggleState");\r
-                                               this.setAutoOpen(state);\r
                                        },\r
                                        command : null\r
                                },\r
-                               "editexecutionspecs" : {\r
-                                       label : "Edit Execution Specs",\r
-                                       icon : "org.argeo.slc.ria/document-open.png",\r
-                                       shortcut : null,\r
-                                       enabled : false,\r
-                                       menu : "Launcher",\r
-                                       toolbar : "batch",\r
-                                       callback : function(e) {\r
-                                               var sel = this.list.getSortedSelection();\r
-                                               var spec = sel[0].getUserData("batchEntrySpec");\r
-                                               if (spec.hasEditableValues()) {\r
-                                                       var specEditor = new org.argeo.slc.ria.execution.SpecEditor(spec);\r
-                                                       specEditor.attachAndShow();\r
-                                               }\r
-                                       },\r
-                                       selectionChange : function(viewId, selection) {\r
-                                               if (viewId != "batch:list")\r
-                                                       return;\r
-                                               this.setEnabled(false);\r
-                                               if ((selection && selection.length == 1)) {\r
-                                                       var selectedItemSpec = selection[0].getUserData("batchEntrySpec");\r
-                                                       if (selectedItemSpec.hasEditableValues()) {\r
-                                                               this.setEnabled(true);\r
-                                                       }\r
-                                               }\r
-                                       },\r
-                                       command : null\r
-                               },\r
-                               */\r
                                "removefrombatch" : {\r
                                        label : "Remove from batch",\r
                                        icon : "org.argeo.slc.ria/edit-delete.png",\r
@@ -184,7 +131,11 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                        nullable : true,\r
                        check : "String",\r
                        event : "changeBatchAgentId"\r
-               }               \r
+               },\r
+               forceClearPreference : {\r
+                       init : false,\r
+                       check : "Boolean"\r
+               }\r
        },\r
          \r
        construct : function(){\r

diff --git a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
index 4d3494f50ebc69bba5285d8a9e3c825cfc15d92e..a6d7c78d66e2d59ada345a581cd2088d5fbdb9dd 100644 (file)
--- a/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
+++ b/server/org.argeo.slc.ria/src/argeo-ria-lib/slc/class/org/argeo/slc/ria/FlowsSelectorView.js
@@ -29,6 +29,10 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                instanceLabel : {\r
                        init : ""\r
                },\r
+               executeAfterAdd : {\r
+                       init : false,\r
+                       check : "Boolean"\r
+               },\r
                /**\r
                 * Commands definition, see\r
                 * {@link org.argeo.ria.event.CommandsManager#definitions}\r
@@ -65,6 +69,11 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                                                                return;\r
                                                        }\r
                                                }\r
+                                               if(this.getExecuteAfterAdd() && batchView.getCommands()){\r
+                                                       batchView.setForceClearPreference(true);\r
+                                                       batchView.getCommands()["submitform"].command.execute();\r
+                                               }\r
+                                               this.setExecuteAfterAdd(false);\r
                                        },\r
                                        selectionChange : function(viewId, selection) {\r
                                                if (viewId != "form:tree")\r
@@ -581,6 +590,15 @@ qx.Class.define("org.argeo.slc.ria.FlowsSelectorView", {
                                }\r
                        }, this);\r
 \r
+                       this.tree.addListener("dblclick", function(e){\r
+                               var sel = this.tree.getSortedSelection();\r
+                               if(sel && sel.length!=1)  return;\r
+                               var origin = sel[0];\r
+                               if(origin.classname == "qx.ui.tree.TreeFile"){\r
+                                       this.setExecuteAfterAdd(true);\r
+                                       this.getCommands()["addtobatch"].command.execute();\r
+                               }\r
+                       }, this);\r
 \r
                        this.add(this.tree);\r
                },\r