diff --git a/ferramentas/saiku/esquemaxml.php b/ferramentas/saiku/esquemaxml.php
index 2d7ac3a..f52891c 100644
--- a/ferramentas/saiku/esquemaxml.php
+++ b/ferramentas/saiku/esquemaxml.php
@@ -115,16 +115,25 @@ $xml .= "
";
+//as dimensoes sao duplicadas
+//uma delas contem o geocodigo que permite a geracao do mapa
+$xml1 = "";
+$xml2 = "";
foreach($regioes as $regiao){
$caminho = $m->hierarquiaPath($regiao["codigo_tipo_regiao"]);
- $xml .= "
+ $xml1 .= "
";var_dump($parametro);exit; } $xml .= ""; @@ -275,6 +281,7 @@ foreach($tbs as $tb){ $xml .= " $sql + "; $xml .= implode(" ",array_unique($dimTempo)); diff --git a/ferramentas/saiku/saiku-server/tomcat/webapps/WEB-INF/classes/saiku.properties b/ferramentas/saiku/saiku-server/tomcat/webapps/WEB-INF/classes/saiku.properties new file mode 100755 index 0000000..b5242fe --- /dev/null +++ b/ferramentas/saiku/saiku-server/tomcat/webapps/WEB-INF/classes/saiku.properties @@ -0,0 +1,15 @@ +# SAIKU PROPERTIES + + +saiku.olap.nonempty = true +saiku.web.export.csv.name = saiku-export +saiku.web.export.excel.name = saiku-export +saiku.web.export.excel.format = xlsx +saiku.web.export.excel.numberformat=#.##0,00 + +saiku.format.numberformat=#.##0,00 + +# SET FIXED LOCALE, otherwise JVM locale +#saiku.format.default.locale=de_AT +#saiku.format.default.locale=en +#saiku.format.default.locale=lt \ No newline at end of file diff --git a/mashups/openlayers.js b/mashups/openlayers.js index 91eb0f3..05aff3d 100755 --- a/mashups/openlayers.js +++ b/mashups/openlayers.js @@ -1601,10 +1601,10 @@ i3GEO.editorOL = { } } YAHOO.editorOL.container.panel.show(); - if(i3GEO.configura) - {$i("panelpropriedadesEditor").getElementsByTagName("div")[2].style.overflow = "auto";} - else - {$i("panelpropriedadesEditor").getElementsByTagName("div")[1].style.overflow = "auto";} + temp = $i("panelpropriedadesEditor").getElementsByTagName("div") + if(temp && temp[2]){ + temp[2].style.overflow = "auto"; + } }, listaGeometrias: function(){ if(!document.getElementById("panellistagEditor")){ diff --git a/mashups/openlayers_compacto.js b/mashups/openlayers_compacto.js index 1844c1c..82f06ec 100644 --- a/mashups/openlayers_compacto.js +++ b/mashups/openlayers_compacto.js @@ -4606,10 +4606,10 @@ temp.onclick = function(){i3GEO.janela.minimiza("panelpropriedadesEditor");}; } } YAHOO.editorOL.container.panel.show(); -if(i3GEO.configura) -{$i("panelpropriedadesEditor").getElementsByTagName("div")[2].style.overflow = "auto";} -else -{$i("panelpropriedadesEditor").getElementsByTagName("div")[1].style.overflow = "auto";} +temp = $i("panelpropriedadesEditor").getElementsByTagName("div") +if(temp && temp[2]){ +temp[2].style.overflow = "auto"; +} }, listaGeometrias: function(){ if(!document.getElementById("panellistagEditor")){ diff --git a/mashups/openlayers_compacto.js.php b/mashups/openlayers_compacto.js.php index fa13849..0c9c73a 100644 --- a/mashups/openlayers_compacto.js.php +++ b/mashups/openlayers_compacto.js.php @@ -4606,10 +4606,10 @@ temp.onclick = function(){i3GEO.janela.minimiza("panelpropriedadesEditor");}; } } YAHOO.editorOL.container.panel.show(); -if(i3GEO.configura) -{$i("panelpropriedadesEditor").getElementsByTagName("div")[2].style.overflow = "auto";} -else -{$i("panelpropriedadesEditor").getElementsByTagName("div")[1].style.overflow = "auto";} +temp = $i("panelpropriedadesEditor").getElementsByTagName("div") +if(temp && temp[2]){ +temp[2].style.overflow = "auto"; +} }, listaGeometrias: function(){ if(!document.getElementById("panellistagEditor")){ -- libgit2 0.21.2