Wire the last service that allow filtering by collection id

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

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js
index 8c1943343f77eac1063ef43763a29150bf379683..1ff9c71e3744c95cc272ff1529385671fd6b6e9f 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/Applet.js
@@ -66,9 +66,9 @@ qx.Class.define("org.argeo.slc.web.Applet",
                this.data = xmlNode;
                if(!xmlNode) return;
                // Load XML or Whatever
                this.data = xmlNode;
                if(!xmlNode) return;
                // Load XML or Whatever

-               //var testType = qx.dom.Node.getText(qx.xml.Element.selectSingleNode(this.data, "param[@name='testType']"));

                var service;            
                var service;            

-               var testId = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(this.data, "param[@name='uuid']"));
+               var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};
+               var testId = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(this.data, "slc:uuid"));           

                this.info("Opening test "+testId);
                this.getView().setViewTitle("Test "+testId);
                service = "../resultViewXml.xslt?uuid="+testId;
                this.info("Opening test "+testId);
                this.getView().setViewTitle("Test "+testId);
                service = "../resultViewXml.xslt?uuid="+testId;

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 e0506afa949d211d3776623da6b5821f8b3d213b..3b5d22d263a5c89eed5c262c69da257fda25e83c 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
@@ -87,10 +87,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                        if(viewId != "list") return;\r
                                        this.setEnabled(false);\r
                                        if(xmlNodes == null || !xmlNodes.length) return;\r
                                        if(viewId != "list") return;\r
                                        this.setEnabled(false);\r
                                        if(xmlNodes == null || !xmlNodes.length) return;\r

-                                       var applet = org.argeo.ria.util.Element.selectSingleNode(xmlNodes[0],'report[@type="applet"]'); \r
-                                       if(applet != null && qx.dom.Node.getText(applet) != ""){\r
-                                               this.setEnabled(true);                                                  \r
-                                       }                                       \r
+                                       this.setEnabled(true);\r

                                },\r
                                command         : null\r
                        },\r
                                },\r
                                command         : null\r
                        },\r


@@ -105,10 +102,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                command         : null,\r
                                submenu         : {},\r
                                submenuCallback : function(commandId){\r
                                command         : null,\r
                                submenu         : {},\r
                                submenuCallback : function(commandId){\r

-                                       var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();\r
-                                       var xmlNodes = viewsManager.getViewPaneSelection("list").getNodes();\r
-                                       // Single selection\r
-                                       var uuid = qx.xml.Element.getSingleNodeText(xmlNodes[0], 'param[@name="uuid"]');\r
+                                       var uuid = this.extractTestUuid();\r

                                        var urls = {\r
                                                xsl : "resultView.xslt",\r
                                                xml : "resultViewXml.xslt",\r
                                        var urls = {\r
                                                xsl : "resultView.xslt",\r
                                                xml : "resultViewXml.xslt",\r


@@ -122,12 +116,21 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                                var win = window.open(url);\r
                                        }\r
                                },\r
                                                var win = window.open(url);\r
                                        }\r
                                },\r

+                               init : function(command){\r
+                                       this.setMenu([\r
+                                               {'label':"Xsl", 'icon':'resource/slc/mime-xsl.png', 'commandId':'xsl'},\r
+                                               {'label':"Xml", 'icon':'resource/slc/mime-xml.png', 'commandId':'xml'},\r
+                                               {'label':"Excel", 'icon':'resource/slc/mime-xls.png', 'commandId':'xls'},\r
+                                               {'label':"Pdf", 'icon':'resource/slc/mime-pdf.png', 'commandId':'pdf'}\r
+                                       ]);\r
+                               },\r

                                selectionChange : function(viewId, xmlNodes){\r
                                        if(viewId!="list")return;\r
                                        this.clearMenus();\r
                                        this.setEnabled(false);\r
                                selectionChange : function(viewId, xmlNodes){\r
                                        if(viewId!="list")return;\r
                                        this.clearMenus();\r
                                        this.setEnabled(false);\r

-                                       if(xmlNodes == null) return;\r
-                                       \r
+                                       if(xmlNodes == null || !xmlNodes.length) return;\r
+                                       this.setEnabled(true);\r
+                                       /*\r

                                        var reports = qx.xml.Element.selectNodes(xmlNodes[0],'report[@type="download"]');\r
                                        if(reports == null || !reports.length)return;\r
                                        var submenus = [];\r
                                        var reports = qx.xml.Element.selectNodes(xmlNodes[0],'report[@type="download"]');\r
                                        if(reports == null || !reports.length)return;\r
                                        var submenus = [];\r


@@ -142,6 +145,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                        }\r
                                        this.setMenu(submenus);\r
                                        this.setEnabled(true);\r
                                        }\r
                                        this.setMenu(submenus);\r
                                        this.setEnabled(true);\r

+                                       */\r

                                }\r
                        },\r
                        "deletetest" : {\r
                                }\r
                        },\r
                        "deletetest" : {\r


@@ -152,9 +156,6 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                menu            : "Selection",\r
                                toolbar         : "selection",\r
                                callback        : function(e){\r
                                menu            : "Selection",\r
                                toolbar         : "selection",\r
                                callback        : function(e){\r

-                                       var viewsManager = org.argeo.ria.components.ViewsManager.getInstance();\r
-                                       var xmlNodes = viewsManager.getViewPaneSelection("list").getNodes();\r
-                                       var uuid = qx.xml.Element.getSingleNodeText(xmlNodes[0], 'param[@name="uuid"]');\r

                                        var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();\r
                                        var request = serviceManager.getRequest(\r
                                                "/org.argeo.slc.webapp/removeResultFromCollection.service",\r
                                        var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();\r
                                        var request = serviceManager.getRequest(\r
                                                "/org.argeo.slc.webapp/removeResultFromCollection.service",\r


@@ -162,7 +163,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                                "application/xml"\r
                                        );\r
                                        request.setParameter("collectionId", this.getCollectionId());\r
                                                "application/xml"\r
                                        );\r
                                        request.setParameter("collectionId", this.getCollectionId());\r

-                                       request.setParameter("resultUuid", uuid);\r
+                                       request.setParameter("resultUuid", this.extractTestUuid());\r

                                        request.addListener("completed", function(response){\r
                                                this.loadCollections();\r
                                                this.loadList();\r
                                        request.addListener("completed", function(response){\r
                                                this.loadCollections();\r
                                                this.loadList();\r


@@ -266,6 +267,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                                select.setSelected(item);\r
                        }\r
                 }\r
                                select.setSelected(item);\r
                        }\r
                 }\r

+                this.setCollectionId(select.getSelected().getValue());\r

                 select.addListener("changeValue", this.collectionSelectorListener, this);\r
          }, this);\r
                  \r
                 select.addListener("changeValue", this.collectionSelectorListener, this);\r
          }, this);\r
                  \r


@@ -296,7 +298,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
        },\r
        \r
        loadList : function(){\r
        },\r
        \r
        loadList : function(){\r

-               var url = "/org.argeo.slc.webapp/resultList.ui";\r
+               var url = "/org.argeo.slc.webapp/listResultAttributes.service";\r

                var model = this.table.getTableModel();\r
                model.removeRows(0, model.getRowCount());\r
                var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();\r
                var model = this.table.getTableModel();\r
                model.removeRows(0, model.getRowCount());\r
                var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();\r


@@ -304,15 +306,16 @@ qx.Class.define("org.argeo.slc.web.TestList",
                var request = serviceManager.getRequest(\r
                        url, \r
                        "GET", \r
                var request = serviceManager.getRequest(\r
                        url, \r
                        "GET", \r

-                       "application/xml",\r
-                       "test_cases",\r
+                       "application/xml",      \r
+                       null,\r

                        [commandManager.getCommandById("loadtestlist"), this.getView()]\r
                );       \r
                        [commandManager.getCommandById("loadtestlist"), this.getView()]\r
                );       \r

-               request.setParameter("collectionId", this.getCollectionId());\r
+               request.setParameter("id", this.getCollectionId());\r
+               var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};\r

                request.addListener("completed", function(response){\r
                        var xml = response.getContent();\r
                        this.info("Successfully loaded XML");\r
                request.addListener("completed", function(response){\r
                        var xml = response.getContent();\r
                        this.info("Successfully loaded XML");\r

-                       var nodes = qx.xml.Element.selectNodes(xml, "//data");\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
                        for(var i=0; i<nodes.length;i++){\r
                                var rowData = nodes[i];\r
                                model.addRows([rowData]);\r


@@ -375,9 +378,7 @@ qx.Class.define("org.argeo.slc.web.TestList",
                }else if(selectionType == "current_selection"){\r
                        // get selection ID\r
                        request.setParameter("collectionId", collectionId);\r
                }else if(selectionType == "current_selection"){\r
                        // get selection ID\r
                        request.setParameter("collectionId", collectionId);\r

-                       var xmlNodes = this.getView().getViewSelection().getNodes();\r
-                       var uuid = qx.xml.Element.getSingleNodeText(xmlNodes[0], 'param[@name="uuid"]');\r
-                       request.setParameter("resultUuid", uuid);\r
+                       request.setParameter("resultUuid", this.extractTestUuid());\r

                }\r
                request.addListener("completed", function(response){\r
                        this.loadCollections();\r
                }\r
                request.addListener("completed", function(response){\r
                        this.loadCollections();\r


@@ -385,6 +386,13 @@ qx.Class.define("org.argeo.slc.web.TestList",
                request.send();         \r
        },\r
        \r
                request.send();         \r
        },\r
        \r

+       extractTestUuid: function(){\r
+               var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};\r
+               var xmlNodes = this.getView().getViewSelection().getNodes();\r
+               var uuid = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(xmlNodes[0], "slc:uuid"));\r
+               return uuid;\r
+       },\r
+       \r

        collectionSelectorListener : function(event){\r
                this.setCollectionId(event.getData());\r
                this.loadList();                \r
        collectionSelectorListener : function(event){\r
                this.setCollectionId(event.getData());\r
                this.loadList();                \r

diff --git a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js
index 0ed66cdbb9e8482e390118c5978532bee9a4f4f2..00be48f42f551ed6d93aa95ce21e815016e57a49 100644 (file)
--- a/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js
+++ b/org.argeo.slc.webapp/src/main/webapp/source/class/org/argeo/slc/web/XmlRenderer.js
@@ -26,15 +26,17 @@ qx.Class.define("org.argeo.slc.web.XmlRenderer",
        var xmlNode = cellInfo.rowData;\r
        if(!xmlNode) return "";\r
        var xPath;\r
        var xmlNode = cellInfo.rowData;\r
        if(!xmlNode) return "";\r
        var xPath;\r

+       var NSMap = {slc:"http://argeo.org/projects/slc/schemas"};\r

        switch(cellInfo.col){\r
                case 0 :\r
        switch(cellInfo.col){\r
                case 0 :\r

-                       xPath = "param[@name='testName']";\r
-                       var nameParam = org.argeo.ria.util.Element.selectSingleNode(xmlNode, xPath);\r
+                       xPath = "slc:uuid";\r
+                       var nameParam = org.argeo.ria.util.Element.selectSingleNode(xmlNode, xPath, NSMap);\r

                        var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || "Not Found");\r
                        break;\r
                case 1 : \r
                        var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || "Not Found");\r
                        break;\r
                case 1 : \r

+                       return "-";\r

                        xPath = 'param[@name="date"]';\r
                        xPath = 'param[@name="date"]';\r

-                       var nameParam = org.argeo.ria.util.Element.selectSingleNode(xmlNode, xPath);\r
+                       var nameParam = org.argeo.ria.util.Element.selectSingleNode(xmlNode, xPath, NSMap);\r

                        //qx.log.Logger.info(nameParam);\r
                        var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || 0);\r
                        if(value == "NOT CLOSED") return value;\r
                        //qx.log.Logger.info(nameParam);\r
                        var value = qx.bom.String.escape(qx.dom.Node.getText(nameParam) || 0);\r
                        if(value == "NOT CLOSED") return value;\r