Download as
Browse Code »

Commit 506ed902e75b5a4834f2bd476327c51d9d1c3dac

Authored by Edmar Moretti
1 parent 3b39b2b6
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Correção no teste de mapas do editor de publicação (METAESTAT)

Showing 2 changed files with 11 additions and 12 deletions   Show diff stats
admin/js/estat_editor.js
  Diff comments   View file @506ed90
@@ -441,7 +441,7 @@ i3GEOadmin.editor = { @@ -441,7 +441,7 @@ i3GEOadmin.editor = {
441 '<p class="paragrafo" >shp: <br><input class=digitar type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' + 441 '<p class="paragrafo" >shp: <br><input class=digitar type="file" size=22 name="i3GEOuploadshp" style="top:0px;left:0px;cursor:pointer;"></p>' +
442 '<p class="paragrafo" >shx: <br><input class=digitar type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' + 442 '<p class="paragrafo" >shx: <br><input class=digitar type="file" size=22 name="i3GEOuploadshx" style="top:0px;left:0px;cursor:pointer;"></p>' +
443 '<p class="paragrafo" >dbf: <br><input class=digitar type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>' + 443 '<p class="paragrafo" >dbf: <br><input class=digitar type="file" size=22 name="i3GEOuploaddbf" style="top:0px;left:0px;cursor:pointer;"></p>' +
444 - '<p class="paragrafo" >Nome da nova tabela:<br><input class=digitar type="text" size=20 id="tabelaDestino" name="tabelaDestino" style="top:0px;left:0px;cursor:pointer;"></p>' + 444 + '<p class="paragrafo" >Nome da nova tabela (n&atilde;o utilize caracteres incompat&iacute;veis com o banco de dados, como -, acentos ou espa&ccedil;os em branco):<br><input class=digitar type="text" size=20 id="tabelaDestino" name="tabelaDestino" style="top:0px;left:0px;cursor:pointer;"></p>' +
445 '<p class="paragrafo" >C&oacute;digo da proje&ccedil;&atilde;o (SRID) Assegure-se que o shapefile esteja na proje&ccedil;&atilde;o geogr&aacute;fica se voc&ecirc; for usar com o sistema de metadados estat&iacute;sticos :<br><input class=digitar type="text" value="4326" size=20 id="srid" name="srid" style="top:0px;left:0px;cursor:pointer;"></p>' + 445 '<p class="paragrafo" >C&oacute;digo da proje&ccedil;&atilde;o (SRID) Assegure-se que o shapefile esteja na proje&ccedil;&atilde;o geogr&aacute;fica se voc&ecirc; for usar com o sistema de metadados estat&iacute;sticos :<br><input class=digitar type="text" value="4326" size=20 id="srid" name="srid" style="top:0px;left:0px;cursor:pointer;"></p>' +
446 446
447 '<p class="paragrafo" ><input id=i3GEOuploadsubmit type="button" value="Enviar" size=12 />' + 447 '<p class="paragrafo" ><input id=i3GEOuploadsubmit type="button" value="Enviar" size=12 />' +
@@ -486,8 +486,8 @@ i3GEOadmin.editor = { @@ -486,8 +486,8 @@ i3GEOadmin.editor = {
486 }, 486 },
487 formulario: function(){ 487 formulario: function(){
488 var ins = '<fieldset><form id=i3GEOuploadcsvf target="i3GEOuploadcsviframe" action="../php/metaestat_uploadcsv_submit.php" method="post" ENCTYPE="multipart/form-data">' + 488 var ins = '<fieldset><form id=i3GEOuploadcsvf target="i3GEOuploadcsviframe" action="../php/metaestat_uploadcsv_submit.php" method="post" ENCTYPE="multipart/form-data">' +
489 - '<p class="paragrafo" >CSV: <br><input class=digitar type="file" size=22 name="i3GEOuploadcsv" style="top:0px;left:0px;cursor:pointer;"></p>' +  
490 - '<p class="paragrafo" >Nome da nova tabela:<br><input class=digitar type="text" size=20 id="tabelaDestinocsv" name="tabelaDestinocsv" style="top:0px;left:0px;cursor:pointer;"></p>' + 489 + '<p class="paragrafo" >CSV (utilize ponto como separador de valores decimais ou a importa&ccedil;&atilde;o poder&aacute; n&atilde;o ocorrer): <br><input class=digitar type="file" size=22 name="i3GEOuploadcsv" style="top:0px;left:0px;cursor:pointer;"></p>' +
  490 + '<p class="paragrafo" >Nome da nova tabela (n&atilde;o utilize caracteres incompat&iacute;veis com o banco de dados, como -, acentos ou espa&ccedil;os em branco):<br><input class=digitar type="text" size=20 id="tabelaDestinocsv" name="tabelaDestinocsv" style="top:0px;left:0px;cursor:pointer;"></p>' +
491 491
492 '<p class="paragrafo" ><input id=i3GEOuploadcsvsubmit type="button" value="Enviar" size=12 />' + 492 '<p class="paragrafo" ><input id=i3GEOuploadcsvsubmit type="button" value="Enviar" size=12 />' +
493 '<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' + 493 '<input type="hidden" name="MAX_FILE_SIZE" value="1000000">' +
admin/js/estat_mapa.js
  Diff comments   View file @506ed90
@@ -86,12 +86,10 @@ function montaArvore(dados) @@ -86,12 +86,10 @@ function montaArvore(dados)
86 YAHOO.example.treeExample = new function() 86 YAHOO.example.treeExample = new function()
87 { 87 {
88 tree = ""; 88 tree = "";
89 - function changeIconMode()  
90 - { 89 + function changeIconMode(){
91 buildTree(); 90 buildTree();
92 } 91 }
93 - function loadNodeData(node, fnLoadComplete)  
94 - { 92 + function loadNodeData(node, fnLoadComplete){
95 var sUrl = "../php/metaestat.php?funcao=listaGruposMapa&id_mapa="+node.data.id_mapa; 93 var sUrl = "../php/metaestat.php?funcao=listaGruposMapa&id_mapa="+node.data.id_mapa;
96 var callback = 94 var callback =
97 { 95 {
@@ -125,8 +123,8 @@ function montaArvore(dados) @@ -125,8 +123,8 @@ function montaArvore(dados)
125 } 123 }
126 buildTree(); 124 buildTree();
127 }(); 125 }();
128 - adicionaNosMapa(dados);  
129 - tree.draw(); 126 + adicionaNosMapa(dados);
  127 + tree.draw();
130 } 128 }
131 function testarMapfile(codigoMap) 129 function testarMapfile(codigoMap)
132 { 130 {
@@ -530,21 +528,22 @@ function gravaDados(tipo,id) @@ -530,21 +528,22 @@ function gravaDados(tipo,id)
530 { 528 {
531 var no = tree.getNodeByProperty("id_mapa",id); 529 var no = tree.getNodeByProperty("id_mapa",id);
532 no.getContentEl().getElementsByTagName("span")[0].innerHTML = document.getElementById("Etitulo").value; 530 no.getContentEl().getElementsByTagName("span")[0].innerHTML = document.getElementById("Etitulo").value;
533 - no.getContentEl().getElementsByTagName("span")[0].style.color = ""; 531 + no.getContentEl().getElementsByTagName("span")[0].style.color = "";
534 no.html = no.getContentEl().innerHTML; 532 no.html = no.getContentEl().innerHTML;
  533 + core_pegaDados("buscando mapas...","../php/metaestat.php?funcao=listaMapas","montaArvore");
535 } 534 }
536 if(tipo == "grupo") 535 if(tipo == "grupo")
537 { 536 {
538 var no = tree.getNodeByProperty("id_mapa_grupo",id); 537 var no = tree.getNodeByProperty("id_mapa_grupo",id);
539 no.getContentEl().getElementsByTagName("span")[0].innerHTML = document.getElementById("Etitulo").value; 538 no.getContentEl().getElementsByTagName("span")[0].innerHTML = document.getElementById("Etitulo").value;
540 - no.getContentEl().getElementsByTagName("span")[0].style.color = ""; 539 + no.getContentEl().getElementsByTagName("span")[0].style.color = "";
541 no.html = no.getContentEl().innerHTML; 540 no.html = no.getContentEl().innerHTML;
542 } 541 }
543 if(tipo == "tema") 542 if(tipo == "tema")
544 { 543 {
545 var no = tree.getNodeByProperty("id_mapa_tema",id); 544 var no = tree.getNodeByProperty("id_mapa_tema",id);
546 no.getContentEl().getElementsByTagName("span")[0].innerHTML = document.getElementById("Etitulo").value; 545 no.getContentEl().getElementsByTagName("span")[0].innerHTML = document.getElementById("Etitulo").value;
547 - no.getContentEl().getElementsByTagName("span")[0].style.color = ""; 546 + no.getContentEl().getElementsByTagName("span")[0].style.color = "";
548 no.html = no.getContentEl().innerHTML; 547 no.html = no.getContentEl().innerHTML;
549 } 548 }
550 core_carregando("desativa"); 549 core_carregando("desativa");