QX 1.1 Migration

[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 c9bbc706d5ed49760655a2440ba72e6bd2f87243..d3dc3f8cba4a6cad0534cbe16a567f7511be6702 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
@@ -30,7 +30,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                        init : {\r
                                "submitform" : {\r
                                        label : "Execute Batch",\r
-                                       icon : "org.argeo.slc.ria/media-playback-start.png",\r
+                                       icon : "org/argeo/slc/ria/media-playback-start.png",\r
                                        shortcut : null,\r
                                        enabled : false,\r
                                        menu : "Launcher",\r
@@ -42,70 +42,19 @@ 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
-                                               }\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
+                                               if(( prefValue !== null && prefValue === true ) || this.getForceClearPreference()){\r
+                                                       this.executeBatchOnAgent(batchAgentId, true);                                                   \r
+                                               }else{\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
+                                               this.setForceClearPreference(false);\r
+                                               return;\r
                                        },\r
                                        command : null\r
                                },\r
-                               */\r
                                "removefrombatch" : {\r
                                        label : "Remove from batch",\r
-                                       icon : "org.argeo.slc.ria/edit-delete.png",\r
+                                       icon : "org/argeo/slc/ria/edit-delete.png",\r
                                        shortcut : null,\r
                                        enabled : false,\r
                                        menu : "Launcher",\r
@@ -144,7 +93,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                                },\r
                                "clearbatch" : {\r
                                        label : "Clear batch",\r
-                                       icon : "org.argeo.slc.ria/user-trash-full.png",\r
+                                       icon : "org/argeo/slc/ria/user-trash-full.png",\r
                                        shortcut : null,\r
                                        enabled : true,\r
                                        menu : "Launcher",\r
@@ -182,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
@@ -306,7 +259,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
 \r
                        this.dropDecorator = new qx.ui.decoration.Background();                 \r
                        this.dropDecorator.set({\r
-                               backgroundImage : "org.argeo.slc.ria/drophere.gif",\r
+                               backgroundImage : "org/argeo/slc/ria/drophere.gif",\r
                                backgroundRepeat : "no-repeat"\r
                        });\r
 \r
@@ -388,7 +341,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                \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
+                       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
@@ -400,7 +353,7 @@ qx.Class.define("org.argeo.slc.ria.BatchView",
                        } else {\r
                                this.list.add(item);\r
                        }\r
-                       this.list.select(item);\r
+                       this.list.setSelection([item]);\r
                        \r
                },\r
 \r