Download as
Browse Code »

Commit 62d3def429b6eb018d1d0a394dd8d79d9c0001da

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

Correção no filtro quando usado como calculadora de campos

Showing 11 changed files with 18 additions and 15 deletions   Show diff stats
admin/admin.db
View file @62d3def
No preview for this file type
admin1/catalogo/mapfile/conexao/ogc/funcoes.php
  Diff comments   View file @62d3def
... ... @@ -53,9 +53,9 @@ function alterar($locaplic,$codigo,$connection,$connectiontype,$ows_srs,$ows_nam
53 53 $layer->set("type",$type);
54 54 $metas = array("_srs","_name","_server_version","_format","_auth_username","_auth_password","_auth_type","_connectiontimeout","_latlonboundingbox","_proxy_auth_type","_proxy_host","_proxy_port","_proxy_type","_proxy_username","_proxy_password","_sld_body","_sld_url","_style","_bgcolor","_transparent","_time","_tile");
55 55 foreach ($metas as $m){
56   - $layer->setmetadata("wms".$m,"ows".$m);
57   - $layer->setmetadata("wfs".$m,"ows".$m);
58   - $layer->setmetadata("ows".$m,"ows".$m);
  56 + $layer->setmetadata("wms".$m,${"ows".$m});
  57 + $layer->setmetadata("wfs".$m,${"ows".$m});
  58 + $layer->setmetadata("ows".$m,${"ows".$m});
59 59 }
60 60 try {
61 61 $mapa->save ( $arq );
... ...
admin1/catalogo/mapfile/conexao/ogc/index.js
  Diff comments   View file @62d3def
... ... @@ -69,7 +69,7 @@ i3GEOadmin.ogc = {
69 69 );
70 70 },
71 71 salvar: function(codigo,id_tema){
72   - var parametros = $("#form-edicao-ogc").serialize();
  72 + var parametros = $("#form-edicao-conexaoogc").serialize();
73 73 i3GEOadmin.core.modalAguarde(true);
74 74 $.post(
75 75 "exec.php?funcao=alterar",
... ...
admin1/catalogo/mapfile/conexao/ogc/index.php
  Diff comments   View file @62d3def
... ... @@ -29,7 +29,7 @@ $id_tema = (int) $_GET ["id_tema"];
29 29 <span><?php echo $codigo; ?></span>
30 30 </a>
31 31 <a class="btn btn-default" style="pointer-events: none">
32   - <span>Conex&atilde;o local</span>
  32 + <span>Conex&atilde;o externa</span>
33 33 </a>
34 34 </div>
35 35 </div>
... ...
admin1/catalogo/mapfile/index.js
  Diff comments   View file @62d3def
... ... @@ -243,7 +243,7 @@ Obt&amp;eacute;m a lista
243 243 },
244 244 salvarDialogo: function(id){
245 245 i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + id).serialize();
246   - console.info(i3GEOadmin.mapfile.parametrosSalvar);
  246 + //console.info(i3GEOadmin.mapfile.parametrosSalvar);
247 247 var hash = {
248 248 "mensagem": i3GEOadmin.mapfile.dicionario.confirma,
249 249 "onBotao1": "i3GEOadmin.mapfile.salvar('"+id+"')",
... ...
css/i3geo7.css.php 100755 → 100644
  Diff comments   View file @62d3def
ferramentas/filtro/index.js
  Diff comments   View file @62d3def
... ... @@ -41,7 +41,10 @@ i3GEOF.filtro = {
41 41 dicionario["idRetorno"] = idRetorno;
42 42 if(modoCalculadora == true){
43 43 dicionario["escondeGuias"] = "hidden";
  44 + } else {
  45 + dicionario["escondeGuias"] = "";
44 46 }
  47 + i3GEOF.filtro.dicionario["escondeGuias"] = dicionario["escondeGuias"];
45 48 return dicionario;
46 49 },
47 50 /*
... ... @@ -224,7 +227,7 @@ i3GEOF.filtro = {
224 227 ntr.id = "linhaFiltro"+i3GEOF.filtro.CONTADOR;
225 228 temp = Mustache.render(
226 229 "{{#data}}" + i3GEOF.filtro.MUSTACHELINHAFILTRO + "{{/data}}",
227   - {"data":{"comboTemas": i3GEOF.filtro.comboTemas,"contador": i3GEOF.filtro.CONTADOR}}
  230 + {"data":{"comboTemas": i3GEOF.filtro.comboTemas,"contador": i3GEOF.filtro.CONTADOR, "escondeGuias": i3GEOF.filtro.dicionario["escondeGuias"]}}
228 231 );
229 232 $(ntr).html(temp);
230 233 tabela = $i("i3GEOfiltroparametros");
... ...
ferramentas/filtro/template_linhafiltro_mst.html
  Diff comments   View file @62d3def
1 1 <td>
2   - <button onclick='i3GEOF.filtro.adicionaLinhaFiltro()' class="btn btn-xs" style="margin: 2px; padding: 2px;">
  2 + <button onclick='i3GEOF.filtro.adicionaLinhaFiltro()' class="btn btn-xs {{{escondeGuias}}}" style="margin: 2px; padding: 2px;">
3 3 <span class="material-icons">add</span>
4 4 </button>
5 5 </td>
6 6 <td>
7   - <button onclick='i3GEOF.filtro.removeLinha(this,{{{contador}}})' class="btn btn-xs" style="margin: 2px; padding: 2px;">
  7 + <button onclick='i3GEOF.filtro.removeLinha(this,{{{contador}}})' class="btn btn-xs {{{escondeGuias}}}" style="margin: 2px; padding: 2px;">
8 8 <span class="material-icons">clear</span>
9 9 </button>
10 10 </td>
... ... @@ -33,12 +33,12 @@
33 33 </div>
34 34 </td>
35 35 <td>
36   - <button onclick='i3GEOF.filtro.listaValores({{{contador}}});' class="btn btn-xs" style="margin: 2px; padding: 2px;">
  36 + <button onclick='i3GEOF.filtro.listaValores({{{contador}}});' class="btn btn-xs {{{escondeGuias}}}" style="margin: 2px; padding: 2px;">
37 37 <span class="material-icons">build</span>
38 38 </button>
39 39 </td>
40 40 <td>
41   - <div class='form-group condensed' style="padding-left:10px;">
  41 + <div class='form-group condensed {{{escondeGuias}}}' style="padding-left:10px;">
42 42 <select name="conector" class="form-control" >
43 43 <option value="and">and</option>
44 44 <option value="or">or</option>
... ...
ferramentas/legenda/templateLista_mst.html
  Diff comments   View file @62d3def
1 1 <!-- para o caso de vetores -->
2 2 <div class="{{{hidden2}}}">
3 3 <button onclick="i3GEOF.legenda.mudaLegenda()" class='btn btn-primary btn-sm btn-raised'>{{{aplicaAlteracao}}}</button>
4   - <button onclick="i3GEOF.legenda.adicionaClasse()" title='{{{adicionaNovaClasse}}}' class='btn btn-primary btn-sm btn-raised'>{{{adicionaClasse}}}</button>
  4 + <button id="botaoAdicionaClasse" onclick="i3GEOF.legenda.adicionaClasse()" title='{{{adicionaNovaClasse}}}' class='btn btn-primary btn-sm btn-raised'>{{{adicionaClasse}}}</button>
5 5 <h5 class="alert alert-info">{{{clicaSimbolo}}}</h5>
6 6 <table id="i3GEOlegendalegenda" class="lista8" style="background-color: #89afd4;">
7 7 <tr>
... ... @@ -44,13 +44,13 @@
44 44 </td>
45 45 <td style="padding: 5px;">
46 46 <div class='form-group label-fixed condensed'>
47   - <input id="i3GEOlegendaid_{{{id}}}" style="width: 200px;" value="{{{nome}}}" name="nome" title="{{{novoNome}}}" tabindex="0" class="form-control input-lg" type='text' />
  47 + <input onchange="$('#botaoAdicionaClasse').prop('disabled', true);" id="i3GEOlegendaid_{{{id}}}" style="width: 200px;" value="{{{nome}}}" name="nome" title="{{{novoNome}}}" tabindex="0" class="form-control input-lg" type='text' />
48 48 </div>
49 49 </td>
50 50 <td style="padding: 5px;">
51 51 <div class='form-group label-fixed condensed'>
52 52 <!-- id necessario para o construtor de filtro -->
53   - <input id="i3GEOlegendaid_exp{{{id}}}" style="width: 200px;" value='{{{exp}}}' name="expressao" tabindex="0" class="form-control input-lg" type='text' />
  53 + <input onchange="$('#botaoAdicionaClasse').prop('disabled', true);" id="i3GEOlegendaid_exp{{{id}}}" style="width: 200px;" value='{{{exp}}}' name="expressao" tabindex="0" class="form-control input-lg" type='text' />
54 54 </div>
55 55 </td>
56 56 <td>
... ...
ferramentas/salvamapfile/index.js
  Diff comments   View file @62d3def
... ... @@ -102,7 +102,7 @@ i3GEOF.salvamapfile = {
102 102 }
103 103 var ins = "<p class=paragrafo >"+$trad('ajuda',i3GEOF.salvamapfile.dicionario) +
104 104 '<span id="i3GEOsalvamapconcluido" style=display:none;color:red > '+$trad('concluido',i3GEOF.salvamapfile.dicionario)+'</span></p>' +
105   - '<br><p class=paragrafo ><input size=20 id=i3GEOsalvamapfilebotao1 type=button value="'+$trad('salva',i3GEOF.salvamapfile.dicionario)+'" />&nbsp;&nbsp;<input size=20 id=i3GEOsalvamapfilebotao2 type=button value="'+$trad('testa',i3GEOF.salvamapfile.dicionario)+'" />';
  105 + '<br><p class=paragrafo ><input size=20 id=i3GEOsalvamapfilebotao1 type=button value="'+$trad('salva',i3GEOF.salvamapfile.dicionario)+'" />';
106 106 $i(iddiv).innerHTML = ins;
107 107 new YAHOO.widget.Button(
108 108 "i3GEOsalvamapfilebotao1",
... ...
js/i3geo_tudo_compacto7.js.php 100755 → 100644
  Diff comments   View file @62d3def