Add titles to opinion classes to change titles of radar graph without

disturbing tracking
thexerteproject · May 11, 2018 · 37c0913 · 37c0913
1 parent 0886782
commit 37c0913
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/opinion.html b/modules/xerte/parent_templates/Nottingham/models_html5/opinion.html
@@ -678,12 +678,20 @@
 		this.createDiagram = function()
 		{
 			var classNames = [];
+			var classTitles = [];
 			var classValues = [];
 			var classWeighting = [];
 
 			for(var i = 0; i< diagramLabels.length; i++){
 				var q = diagramLabels[i];
 				classNames[q.parentNode.classId] = q.parentNode.getAttribute("name");
+				if (typeof q.parentNode.getAttribute("title") != "undefined" && q.parentNode.getAttribute("title") != "") {
+                    classTitles[q.parentNode.classId] = q.parentNode.getAttribute("title");
+                }
+                else
+				{
+                    classTitles[q.parentNode.classId] = classNames[q.parentNode.classId];
+				}
 				if(classValues[q.parentNode.classId] != undefined){
                     classValues[q.parentNode.classId] = classValues[q.parentNode.classId] + (diagramAnswers[i]* diagramLabels[i].getAttribute("classWeight"));
                     classWeighting[q.parentNode.classId] = parseInt(classWeighting[q.parentNode.classId]) + parseInt(diagramLabels[i].getAttribute("classWeight"));
@@ -700,6 +708,7 @@
 			JSONGraph = {
 				label: x_currentPageXML.getAttribute("name"),
 				classnames: classNames,
+				classtitles: classTitles,
 				classvalues: classValues
 			};
 
@@ -722,7 +731,7 @@
 			var myRadarChart = new Chart(ctx, {
                 type: 'radar',
                 data: {
-                    labels: classNames,
+                    labels: classTitles,
                     datasets: [{
 						label: x_currentPageXML.getAttribute("name"),
                         data: classValues,

diff --git a/modules/xerte/parent_templates/Nottingham/models_html5/showGraph.html b/modules/xerte/parent_templates/Nottingham/models_html5/showGraph.html
@@ -77,6 +77,7 @@
             var latest = null;
             var objlabel = null;
             var classnames = [];
+            var classtitles = [];
             var numUserSubmits = 0;
 
             // We assume the data contains identical data sets
@@ -102,6 +103,14 @@
                     if(classnames[i] == null) {
                         classnames[i] = obj.graph.classnames[i];
                     }
+                    if (classtitles[i] == null) {
+                        if (typeof obj.graph.classtitles[i] && obj.graph.classtitles[i] != "") {
+                            classtitles[i] = obj.graph.classtitles[i];
+                        }
+                        else {
+                            classtitles[i] = classnames[i];
+                        }
+                    }
                 }
                 var matchactor = false;
                 switch(studentidmode)
@@ -234,7 +243,7 @@
             var myRadarChart = new Chart(ctx, {
                 type: 'radar',
                 data: {
-                    labels: classnames,
+                    labels: classtitles,
                     datasets: datasets
                 },
                 options: {
@@ -257,7 +266,7 @@
                     maintainAspectRatio: false
                 }
             });
-        }
+        };
         this.init = function() {
             var $pageContents = $("#pageContents");
             var id = x_currentPageXML.getAttribute("xerteurl") + x_currentPageXML.getAttribute("xertelo") + '/' + x_currentPageXML.getAttribute("import");

diff --git a/src/Nottingham/wizards/en-GB/opinion.xwd b/src/Nottingham/wizards/en-GB/opinion.xwd
@@ -46,9 +46,10 @@
 
   <opinionClass menuItem="Class">
     <name label="Label" type="TextInput" mandatory="true" defaultValue="C - Tree/Tracking label" wysiwyg="false"/>
+    <title label="Title" type="TextInput" mandatory="true" defaultValue="Title to use in graph" wysiwyg="true" />
 
     <newNodes>
-      <opinionQuestion><![CDATA[<opinionQuestion  name="Q - Tree/Tracking label" prompt="Here is a prompt" scale="false" type="Single Answer" classWeight="1" interactivity="slider" />]]></opinionQuestion>
+      <opinionQuestion><![CDATA[<opinionQuestion  name="C - Tree/Tracking label" title="Title to use in graph" prompt="Here is a prompt" scale="false" type="Single Answer" classWeight="1" interactivity="slider" />]]></opinionQuestion>
     </newNodes>
   </opinionClass>