--no commit message

Edmar Moretti
1 parent 21fd69b3
Showing 1 changed file with 11 additions and 3 deletions Show diff stats
saiku-server/tomcat/webapps/ROOT/js/saiku/plugins/CCC_Chart/plugin.js
@@ -626,7 +626,7 @@ $(this.el).prepend(&quot; | chart process&quot;);
 														this.data.metadata.push({
 																colIndex: 0,
 																colType: "String",
-																colName: firstHeader.join('/')
+																colName: converteHtmlEntities(firstHeader.join('/'))
 														});
 														lowest_level = field - 1;
 												}
@@ -640,7 +640,7 @@ $(this.el).prepend(&quot; | chart process&quot;);
 														this.data.metadata.push({
 																colIndex: field - lowest_level + 1,
 																colType: "Numeric",
-																colName: colheader.join('/')
+																colName: converteHtmlEntities(colheader.join('/'))
 														});
  
 														data_start = row+1;
@@ -702,4 +702,12 @@ $(this.el).prepend(&quot; | chart process&quot;);
 		}
 });
  
-
+function converteHtmlEntities(texto){
+	var s = ["á","ã","à","é","í","ó","õ","ú","ç","Á","Ã","À","É","Í","Ó","Õ","Ú","Ç"],
+		e = ["&aacute;","&atilde;","&agrave;","&eacute;","&iacute;","&oacute;","&otilde;","&uacute;","&ccedil;","&Aacute;","&Atilde;","&Agrave;","&Eacute;","&Iacute;","&Oacute;","&Otilde;","&Uacute;","&Ccedil;"],
+		n = e.length;
+	for(i=0;i<n;i++){
+		texto = texto.replace(e[i],s[i]);
+	}
+	return texto;
+}
...	...	@@ -626,7 +626,7 @@ $(this.el).prepend(" \| chart process");
626	626	this.data.metadata.push({
627	627	colIndex: 0,
628	628	colType: "String",
629		- colName: firstHeader.join('/')
	629	+ colName: converteHtmlEntities(firstHeader.join('/'))
630	630	});
631	631	lowest_level = field - 1;
632	632	}
...	...	@@ -640,7 +640,7 @@ $(this.el).prepend(" \| chart process");
640	640	this.data.metadata.push({
641	641	colIndex: field - lowest_level + 1,
642	642	colType: "Numeric",
643		- colName: colheader.join('/')
	643	+ colName: converteHtmlEntities(colheader.join('/'))
644	644	});
645	645
646	646	data_start = row+1;
...	...	@@ -702,4 +702,12 @@ $(this.el).prepend(" \| chart process");
702	702	}
703	703	});
704	704
705		-
	705	+function converteHtmlEntities(texto){
	706	+ var s = ["á","ã","à","é","í","ó","õ","ú","ç","Á","Ã","À","É","Í","Ó","Õ","Ú","Ç"],
	707	+ e = ["á","ã","à","é","í","ó","õ","ú","ç","Á","Ã","À","É","Í","Ó","Õ","Ú","Ç"],
	708	+ n = e.length;
	709	+ for(i=0;i<n;i++){
	710	+ texto = texto.replace(e[i],s[i]);
	711	+ }
	712	+ return texto;
	713	+}
...	...