Refactor API

[gpl/argeo-slc.git] / org.argeo.slc.webapp / src / main / webapp / source / class / org / argeo / slc / web / TestList.js

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js
index 17ac3458f2ea9b90872fe00072865c9df79746ae..8aaf5e14e215ff95de23e3c64e58445c0bd3af3d 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/TestList.js
@@ -93,7 +93,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                toolbar         : "selection",\r
                                callback        : function(e){\r
                                        var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();\r
-                                       var classObj = org.argeo.slc.web.Applet;\r
+                                       var classObj = org.argeo.slc.ria.Applet;\r
                                        var iView = viewsManager.initIViewClass(classObj, "applet");\r
                                        var xmlNodes = viewsManager.getViewPaneSelection("list").getNodes();\r
                                        iView.load(xmlNodes[0]);\r
@@ -184,7 +184,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                toolbar         : "selection",\r
                                callback        : function(e){\r
                                        \r
-                                       var request = org.argeo.slc.web.SlcApi.getRemoveResultService(this.getCollectionId(), this.extractTestUuid());\r
+                                       var request = org.argeo.slc.ria.SlcApi.getRemoveResultService(this.getCollectionId(), this.extractTestUuid());\r
                                        request.addListener("completed", function(response){\r
                                                this.loadCollections();\r
                                                this.loadList();\r
@@ -222,8 +222,9 @@ qx.Class.define("org.argeo.slc.web.TestList",
          }, this);\r
          var columnModel = this.table.getTableColumnModel(); \r
          columnModel.getBehavior().setWidth(0, "60%");\r
-         columnModel.setDataCellRenderer(0, new org.argeo.slc.web.XmlRenderer());\r
-         columnModel.setDataCellRenderer(1, new org.argeo.slc.web.XmlRenderer());\r
+         var renderer = new org.argeo.slc.web.XmlRenderer();\r
+         columnModel.setDataCellRenderer(0, renderer);\r
+         columnModel.setDataCellRenderer(1, renderer);\r
          \r
          this.table.getSelectionManager().getSelectionModel().addListener("changeSelection", function(e){\r
                var viewSelection = viewPane.getViewSelection();\r
@@ -264,7 +265,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
        },\r
        \r
        loadCollections : function(){\r
-               var request = org.argeo.slc.web.SlcApi.getListCollectionsService();\r
+               var request = org.argeo.slc.ria.SlcApi.getListCollectionsService();\r
                var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};\r
                request.addListener("completed", function(response){\r
                        var xml = response.getContent();\r
@@ -285,16 +286,17 @@ qx.Class.define("org.argeo.slc.web.TestList",
                var model = this.table.getTableModel();\r
                model.removeRows(0, model.getRowCount());\r
                var commandManager = org.argeo.ria.event.CommandsManager.getInstance();\r
-               var request = org.argeo.slc.web.SlcApi.getListResultsService(this.getCollectionId(), null, [commandManager.getCommandById("loadtestlist"), this.getView()]);\r
+               var request = org.argeo.slc.ria.SlcApi.getListResultsService(this.getCollectionId(), null, [commandManager.getCommandById("loadtestlist"), this.getView()]);\r
                var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};\r
                request.addListener("completed", function(response){\r
                        var xml = response.getContent();\r
                        this.debug("Successfully loaded XML");\r
                        var nodes = org.argeo.ria.util.Element.selectNodes(xml, "//slc:result-attributes", NSMap);\r
-                       for(var i=0; i<nodes.length;i++){\r
-                               var rowData = nodes[i];\r
-                               model.addRows([rowData]);\r
-                       }\r
+                       //model.addRows(nodes);\r
+                       \r
+                       for(var i=0; i<nodes.length;i++){                               \r
+                               model.addRows([nodes[i]]);\r
+                       }                       \r
                }, request);\r
                request.send();         \r
        },\r
@@ -359,7 +361,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                        this.error("Not implemented yet!");                     \r
                }else if(selectionType == "current_selection"){\r
                        // get selection ID\r
-                       var request = org.argeo.slc.web.SlcApi.getAddResultService(collectionId,this.extractTestUuid());\r
+                       var request = org.argeo.slc.ria.SlcApi.getAddResultService(collectionId,this.extractTestUuid());\r
                        request.addListener("completed", function(response){\r
                                this.info("Result successfully copied to collection!");\r
                                this.loadCollections();\r