Clean client, use an Api class

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

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..b753a0b1a5c86bea79208fc68684674f7d8314a7 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,14 +66,11 @@ qx.Class.define("org.argeo.slc.web.Applet",
                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 testId = qx.dom.Node.getText(org.argeo.ria.util.Element.selectSingleNode(this.data, "param[@name='uuid']"));
-               this.info("Opening test "+testId);
+               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.getView().setViewTitle("Test "+testId);
-               service = "../resultViewXml.xslt?uuid="+testId;
-               var serviceManager = org.argeo.ria.remote.RequestManager.getInstance();
-               var request = serviceManager.getRequest(service, "GET", "application/xml");
+               var request = org.argeo.slc.web.SlcApi.getLoadResultService(testId);            
                request.addListener("completed", function(response){
                        this.createXmlGui(response.getContent());
                        this.getView().setOnLoad(false);
@@ -131,14 +128,34 @@ qx.Class.define("org.argeo.slc.web.Applet",
                                var simpleResults = org.argeo.ria.util.Element.selectNodes(node, "slc:part-sub-list/slc:parts/slc:simple-result-part", NSMap);
 
                                var newId;
-                               newId = model.addBranch(currentParentId, label, false);
+                               //newId = model.addBranch(currentParentId, label, false);
                                
                                // Test Leaf Node
                                if(!simpleResults || !simpleResults.length){
+                                       newId = model.addBranch(currentParentId, label, false);
                                        addedPaths[crtPath] = newId;
                                        currentParentId = newId;
                                        continue;
                                }
+                               if(simpleResults.length == 1){
+                                       //newId = model.addBranch(currentParentId, label, false);
+                                       var sResNode = simpleResults[0];
+                                       newId = model.addBranch(currentParentId, label);
+                                       model.setColumnData(newId, 3, org.argeo.ria.util.Element.getSingleNodeText(sResNode, "slc:test-run-uuid", NSMap));
+                                       model.setColumnData(newId, 2, org.argeo.ria.util.Element.getSingleNodeText(sResNode, "slc:message", NSMap));
+                                       var status = org.argeo.ria.util.Element.getSingleNodeText(sResNode, "slc:status", NSMap);
+                                       if(status != "PASSED"){
+                                               status = this.failedStatus ;
+                                               this._setParentBranchAsFailed(newId);
+                                       }else{
+                                               status = this.passedStatus;
+                                       }
+                                       model.setColumnData(newId, 1, status);                                                                                  
+                                       addedPaths[crtPath] = newId;
+                                       currentParentId = newId;
+                                       continue;
+                               }
+                               newId = model.addBranch(currentParentId, label, false);
                                for(var k=0;k<simpleResults.length;k++){
                                        var sResNode = simpleResults[k];
                                        resId = model.addLeaf(currentParentId, label);
@@ -158,6 +175,7 @@ qx.Class.define("org.argeo.slc.web.Applet",
                                currentParentId = newId;
                        }
                }
+               this._refineLeaves(this.tree, 0);
                this.add(this.tree, {flex:1});
                model.setData();
                var columnModel = this.tree.getTableColumnModel();
@@ -195,6 +213,17 @@ qx.Class.define("org.argeo.slc.web.Applet",
                }               
        },
        
+       _refineLeaves : function(tree, nodeId){
+               var node = tree.nodeGet(nodeId);                
+               if(node.children && node.children.length){
+                       for(var i=0;i<node.children.length;i++){
+                               this._refineLeaves(tree, node.children[i]);
+                       }
+               }else{
+                       node.type = qx.ui.treevirtual.SimpleTreeDataModel.Type.LEAF;
+               }
+       },
+       
        createHtmlGui : function(responseText){
                var htmlElement = new qx.ui.embed.Html(responseText);
                htmlElement.setOverflowX("auto");