comparison js/specification.js @ 2579:d83b38564fbb

#137. Modified <commentquestion> nodes in pages to have a proper list structure. Differently labelled nodes depending on type <commentquestion>, <commentradio>. Added slider and converted project.xml to match new specifications. AB_example.xml shows new slider type

         this.specification = specification;
         this.parent = null;
 
         this.decode = function (parent, xml) {
             this.parent = parent;
-			var attributeMap = this.schema.getAllElementsByTagName('xs:attribute');
-			for (var i=0; i<attributeMap.length; i++)
-			{
-				var attributeName = attributeMap[i].getAttribute('name') || attributeMap[i].getAttribute('ref');
-				var projectAttr = xml.getAttribute(attributeName);
-				projectAttr = parent.processAttribute(projectAttr,attributeMap[i],parent.schema);
-				switch(typeof projectAttr)
-				{
-				case "number":
-				case "boolean":
-					eval('this.'+attributeName+' = '+projectAttr);
-					break;
-				case "string":
-					eval('this.'+attributeName+' = "'+projectAttr+'"');
-					break;
-				}
-			}
-            
+            var attributeMap = this.schema.getAllElementsByTagName('xs:attribute');
+            for (var i = 0; i < attributeMap.length; i++) {
+                var attributeName = attributeMap[i].getAttribute('name') || attributeMap[i].getAttribute('ref');
+                var projectAttr = xml.getAttribute(attributeName);
+                projectAttr = parent.processAttribute(projectAttr, attributeMap[i], parent.schema);
+                switch (typeof projectAttr) {
+                    case "number":
+                    case "boolean":
+                        eval('this.' + attributeName + ' = ' + projectAttr);
+                        break;
+                    case "string":
+                        eval('this.' + attributeName + ' = "' + projectAttr + '"');
+                        break;
+                }
+            }
+
             // Get the title
             var title = xml.getElementsByTagName('title');
             if (title.length != 0 && title[0].parentElement == xml) {
                 this.title = title[0].textContent;
             }
-			
-			// Get the Comment Box Prefix
-			var CBP = xml.getElementsByTagName('commentboxprefix');
-			if (CBP.length != 0 && CBP[0].parentElement == xml) {
-				this.commentBoxPrefix = CBP[0].textContent;
-			}
-			
-			// Now decode the interfaces
-			var interfaceNode = xml.getElementsByTagName('interface');
-			for (var i=0; i<interfaceNode.length; i++)
-			{
-				var node = new parent.interfaceNode(this.specification);
-				node.decode(this,interfaceNode[i],parent.schema.getAllElementsByName('interface')[1]);
-				this.interfaces.push(node);
-			}
-			
-			// Now process the survey node options
-			var survey = xml.getElementsByTagName('survey');
-			var surveySchema = parent.schema.getAllElementsByName('survey')[0];
-			for (var i=0; i<survey.length; i++){
-				var location = survey[i].getAttribute('location');
-				if (location == 'pre' || location == 'before')
-				{
-					if (this.preTest != null){this.errors.push("Already a pre/before test survey defined! Ignoring second!!");}
-					else {
-						this.preTest = new parent.surveyNode(this.specification);
-						this.preTest.decode(parent,survey[i],surveySchema);
-					}
-				} else if (location == 'post' || location == 'after') {
-					if (this.postTest != null){this.errors.push("Already a post/after test survey defined! Ignoring second!!");}
-					else {
-						this.postTest = new parent.surveyNode(this.specification);
-						this.postTest.decode(parent,survey[i],surveySchema);
-					}
-				}
-			}
-			
-			// Now process the audioelement tags
-			var audioElements = xml.getElementsByTagName('audioelement');
-			for (var i=0; i<audioElements.length; i++)
-			{
-				var node = new this.audioElementNode(this.specification);
-				node.decode(this,audioElements[i]);
-				this.audioElements.push(node);
-			}
-			
-			// Now decode the commentquestions
-			var commentQuestions = xml.getElementsByTagName('commentquestion');
-			for (var i=0; i<commentQuestions.length; i++)
-			{
-				var node = new this.commentQuestionNode(this.specification);
-				node.decode(parent,commentQuestions[i]);
-				this.commentQuestions.push(node);
-			}
-		};
-		
-		this.encode = function(root)
-		{
-			var AHNode = root.createElement("page");
+
+            // Get the Comment Box Prefix
+            var CBP = xml.getElementsByTagName('commentboxprefix');
+            if (CBP.length != 0 && CBP[0].parentElement == xml) {
+                this.commentBoxPrefix = CBP[0].textContent;
+            }
+
+            // Now decode the interfaces
+            var interfaceNode = xml.getElementsByTagName('interface');
+            for (var i = 0; i < interfaceNode.length; i++) {
+                var node = new parent.interfaceNode(this.specification);
+                node.decode(this, interfaceNode[i], parent.schema.getAllElementsByName('interface')[1]);
+                this.interfaces.push(node);
+            }
+
+            // Now process the survey node options
+            var survey = xml.getElementsByTagName('survey');
+            var surveySchema = parent.schema.getAllElementsByName('survey')[0];
+            for (var i = 0; i < survey.length; i++) {
+                var location = survey[i].getAttribute('location');
+                if (location == 'pre' || location == 'before') {
+                    if (this.preTest != null) {
+                        this.errors.push("Already a pre/before test survey defined! Ignoring second!!");
+                    } else {
+                        this.preTest = new parent.surveyNode(this.specification);
+                        this.preTest.decode(parent, survey[i], surveySchema);
+                    }
+                } else if (location == 'post' || location == 'after') {
+                    if (this.postTest != null) {
+                        this.errors.push("Already a post/after test survey defined! Ignoring second!!");
+                    } else {
+                        this.postTest = new parent.surveyNode(this.specification);
+                        this.postTest.decode(parent, survey[i], surveySchema);
+                    }
+                }
+            }
+
+            // Now process the audioelement tags
+            var audioElements = xml.getElementsByTagName('audioelement');
+            for (var i = 0; i < audioElements.length; i++) {
+                var node = new this.audioElementNode(this.specification);
+                node.decode(this, audioElements[i]);
+                this.audioElements.push(node);
+            }
+
+            // Now decode the commentquestions
+            var cqNode = xml.getElementsByTagName('commentquestions');
+            if (cqNode.length != 0) {
+                cqNode = cqNode[0];
+                var commentQuestions = cqNode.children;
+                for (var i = 0; i < commentQuestions.length; i++) {
+                    var node = new this.commentQuestionNode(this.specification);
+                    node.decode(parent, commentQuestions[i]);
+                    this.commentQuestions.push(node);
+                }
+            }
+        };
+
+        this.encode = function (root) {
+            var AHNode = root.createElement("page");
             // First decode the attributes
             var attributes = this.schema.getAllElementsByTagName('xs:attribute');
             for (var i = 0; i < attributes.length; i++) {
                 var name = attributes[i].getAttribute("name");
                 if (name == undefined) {

 
         this.commentQuestionNode = function (specification) {
             this.id = null;
             this.name = undefined;
             this.type = undefined;
-            this.options = [];
             this.statement = undefined;
             this.schema = specification.schema.getAllElementsByName('commentquestion')[0];
             this.decode = function (parent, xml) {
                 this.id = xml.id;
                 this.name = xml.getAttribute('name');
-                this.type = xml.getAttribute('type');
+                switch (xml.nodeName) {
+                    case "commentradio":
+                        this.type = "radio";
+                        this.options = [];
+                        break;
+                    case "commentcheckbox":
+                        this.type = "checkbox";
+                        this.options = [];
+                        break;
+                    case "commentslider":
+                        this.type = "slider";
+                        this.min = undefined;
+                        this.max = undefined;
+                        this.step = undefined;
+                        break;
+                    case "commentquestion":
+                    default:
+                        this.type = "question";
+                        break;
+                }
                 this.statement = xml.getElementsByTagName('statement')[0].textContent;
-                var optNodes = xml.getElementsByTagName('option');
-                for (var i = 0; i < optNodes.length; i++) {
-                    var optNode = optNodes[i];
-                    this.options.push({
-                        name: optNode.getAttribute('name'),
-                        text: optNode.textContent
-                    });
+                if (this.type == "radio" || this.type == "checkbox") {
+                    var optNodes = xml.getElementsByTagName('option');
+                    for (var i = 0; i < optNodes.length; i++) {
+                        var optNode = optNodes[i];
+                        this.options.push({
+                            name: optNode.getAttribute('name'),
+                            text: optNode.textContent
+                        });
+                    }
+                }
+                if (this.type == "slider") {
+                    this.min = Number(xml.getAttribute("min"));
+                    this.max = Number(xml.getAttribute("max"));
+                    this.step = Number(xml.getAttribute("step"));
+                    if (this.step == undefined) {
+                        this.step = 1;
+                    }
+                    this.value = Number(xml.getAttribute("value"));
+                    if (this.value == undefined) {
+                        this.value = min;
+                    }
                 }
             };
 
             this.encode = function (root) {
-                var node = root.createElement("commentquestion");
+                var node;
+                switch (this.type) {
+                    case "radio":
+                        node = root.createElement("commentradio");
+                        break;
+                    case "checkbox":
+                        node = root.createElement("commentcheckbox");
+                        break;
+                    case "slider":
+                        node = root.createElement("commentslider");
+                        break;
+                    case "question":
+                    default:
+                        node = root.createElement("commentquestion");
+                        break;
+                }
                 node.id = this.id;
                 node.setAttribute("type", this.type);
                 if (this.name != undefined) {
                     node.setAttribute("name", this.name);
                 }
                 var statement = root.createElement("statement");
                 statement.textContent = this.statement;
                 node.appendChild(statement);
-                for (var option of this.options) {
-                    var child = root.createElement("option");
-                    child.setAttribute("name", option.name);
-                    child.textContent = option.text;
-                    node.appendChild(child);
+                if (this.type == "radio" || this.type == "checkbox") {
+                    for (var option of this.options) {
+                        var child = root.createElement("option");
+                        child.setAttribute("name", option.name);
+                        child.textContent = option.text;
+                        node.appendChild(child);
+                    }
+                }
+                if (this.type == "slider") {
+                    node.setAttribute("min", this.min);
+                    node.setAttribute("max", this.max);
+                    if (this.step !== 1) {
+                        node.setAttribute("step", this.step);
+                    }
+                    if (this.value !== this.min) {
+                        node.setAttribute("value", this.value);
+                    }
                 }
                 return node;
             };
         };