diff --git a/admin/admin.db b/admin/admin.db
index 4d73d07..fb4c56e 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/ferramentas/tabela/index.js b/ferramentas/tabela/index.js
index 5e17e90..b9f75ad 100644
--- a/ferramentas/tabela/index.js
+++ b/ferramentas/tabela/index.js
@@ -1332,32 +1332,30 @@ i3GEOF.tabela =
*
* Gera o relatório no formato CSV
*/
- relatorioTexto : function() {
- try {
- $i("i3GEOtabelaarearelh").value = $i("i3GEOtabelacalculaarea").checked;
- $i("i3GEOtabelastatrelh").value = $i("i3GEOtabelacalculaestat").checked;
- $i("i3GEOtabelaexcluirvalorh").value = $i("i3GEOtabelaexcestat").value;
- $i("i3GEOtabelatemarelh").value = i3GEOF.tabela.tema;
- $i("i3GEOtabelag_sidh").value = i3GEO.configura.sid;
- $i("i3GEOtabelaitemagruparelh").value = $i("i3GEOtabelaagrupaItem").value;
- $i("i3GEOtabelatiporelh").value = "csv";
- var inputs = $i("i3GEOtabelaitensrelatorio").getElementsByTagName("input"), listai = [], listanomes = [], nome, i, temp, n =
- inputs.length;
- for (i = 0; i < n; i++) {
- if (inputs[i].checked === true) {
- listai.push(inputs[i].id + "|" + inputs[i].name);
- nome = $i(inputs[i].id + inputs[i].name).value;
- listanomes.push(nome);
- }
+ relatorioTexto : function(idjanela) {
+
+ $i(idjanela + "i3GEOtabelaarearelh").value = $i(idjanela + "i3GEOtabelacalculaarea").checked;
+ $i(idjanela + "i3GEOtabelastatrelh").value = $i(idjanela + "i3GEOtabelacalculaestat").checked;
+ $i(idjanela + "i3GEOtabelaexcluirvalorh").value = $i(idjanela + "i3GEOtabelaexcestat").value;
+ $i(idjanela + "i3GEOtabelatemarelh").value = i3GEOF.tabela.propJanelas[idjanela].tema;
+ $i(idjanela + "i3GEOtabelag_sidh").value = i3GEO.configura.sid;
+ $i(idjanela + "i3GEOtabelaitemagruparelh").value = $i(idjanela + "i3GEOtabelaagrupaItem").value;
+ $i(idjanela + "i3GEOtabelatiporelh").value = "csv";
+ var inputs = $i(idjanela + "i3GEOtabelaitensrelatorio").getElementsByTagName("input"), listai = [], listanomes = [], nome, i, temp, n =
+ inputs.length;
+ for (i = 0; i < n; i++) {
+ if (inputs[i].checked === true) {
+ listai.push(inputs[i].id + "|" + inputs[i].name);
+ nome = $i(inputs[i].id + inputs[i].name).value;
+ listanomes.push(nome);
}
- $i("i3GEOtabelanomesrelh").value = listanomes;
- $i("i3GEOtabelaitensrelh").value = listai;
- temp = $i("i3GEOtabelarelatorio").action;
- $i("i3GEOtabelarelatorio").action += "?ext=" + i3GEO.parametros.mapexten;
- $i("i3GEOtabelarelatorio").submit();
- $i("i3GEOtabelarelatorio").action = temp;
- } catch (e) {
- i3GEO.janela.tempoMsg(e);
}
+ $i(idjanela + "i3GEOtabelanomesrelh").value = listanomes;
+ $i(idjanela + "i3GEOtabelaitensrelh").value = listai;
+ temp = $i(idjanela + "i3GEOtabelarelatorio").action;
+ $i(idjanela + "i3GEOtabelarelatorio").action += "?ext=" + i3GEO.parametros.mapexten;
+ $i(idjanela + "i3GEOtabelarelatorio").submit();
+ $i(idjanela + "i3GEOtabelarelatorio").action = temp;
+
}
};
\ No newline at end of file
diff --git a/ferramentas/tabela/relatorio.php b/ferramentas/tabela/relatorio.php
index 71dba35..9e4cb48 100644
--- a/ferramentas/tabela/relatorio.php
+++ b/ferramentas/tabela/relatorio.php
@@ -1,3 +1,10 @@
+
+
+
+
+
+i3Geo
+
values[$item]);
//$v = mb_convert_encoding($v,mb_detect_encoding($v),"ISO-8859-1");
if (function_exists("mb_convert_encoding") && $convC == true){
- $v = mb_convert_encoding($v,"UTF-8","ISO-8859-1");
+ //$v = mb_convert_encoding($v,"UTF-8","ISO-8859-1");
}
$valitem[$item] = $v;
}
@@ -123,18 +130,13 @@ if(isset($tiporel) && $tiporel == "csv"){
{echo ";área em ha \n";}
else
{echo "\n";}
- foreach ($registros as $linhas)
- {echo implode(";",$linhas)."\n";}
+ foreach ($registros as $linhas){
+ echo converte(implode(";",$linhas))."\n";
+ }
exit;
}
?>
-
-
-
-
-i3Geo
-