Commit 62d3def429b6eb018d1d0a394dd8d79d9c0001da
1 parent
3436fbcd
Exists in
master
and in
7 other branches
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
No preview for this file type
admin1/catalogo/mapfile/conexao/ogc/funcoes.php
@@ -53,9 +53,9 @@ function alterar($locaplic,$codigo,$connection,$connectiontype,$ows_srs,$ows_nam | @@ -53,9 +53,9 @@ function alterar($locaplic,$codigo,$connection,$connectiontype,$ows_srs,$ows_nam | ||
53 | $layer->set("type",$type); | 53 | $layer->set("type",$type); |
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"); | 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 | foreach ($metas as $m){ | 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 | try { | 60 | try { |
61 | $mapa->save ( $arq ); | 61 | $mapa->save ( $arq ); |
admin1/catalogo/mapfile/conexao/ogc/index.js
@@ -69,7 +69,7 @@ i3GEOadmin.ogc = { | @@ -69,7 +69,7 @@ i3GEOadmin.ogc = { | ||
69 | ); | 69 | ); |
70 | }, | 70 | }, |
71 | salvar: function(codigo,id_tema){ | 71 | salvar: function(codigo,id_tema){ |
72 | - var parametros = $("#form-edicao-ogc").serialize(); | 72 | + var parametros = $("#form-edicao-conexaoogc").serialize(); |
73 | i3GEOadmin.core.modalAguarde(true); | 73 | i3GEOadmin.core.modalAguarde(true); |
74 | $.post( | 74 | $.post( |
75 | "exec.php?funcao=alterar", | 75 | "exec.php?funcao=alterar", |
admin1/catalogo/mapfile/conexao/ogc/index.php
@@ -29,7 +29,7 @@ $id_tema = (int) $_GET ["id_tema"]; | @@ -29,7 +29,7 @@ $id_tema = (int) $_GET ["id_tema"]; | ||
29 | <span><?php echo $codigo; ?></span> | 29 | <span><?php echo $codigo; ?></span> |
30 | </a> | 30 | </a> |
31 | <a class="btn btn-default" style="pointer-events: none"> | 31 | <a class="btn btn-default" style="pointer-events: none"> |
32 | - <span>Conexão local</span> | 32 | + <span>Conexão externa</span> |
33 | </a> | 33 | </a> |
34 | </div> | 34 | </div> |
35 | </div> | 35 | </div> |
admin1/catalogo/mapfile/index.js
@@ -243,7 +243,7 @@ Obt&eacute;m a lista | @@ -243,7 +243,7 @@ Obt&eacute;m a lista | ||
243 | }, | 243 | }, |
244 | salvarDialogo: function(id){ | 244 | salvarDialogo: function(id){ |
245 | i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + id).serialize(); | 245 | i3GEOadmin.mapfile.parametrosSalvar = $("#form-edicao-" + id).serialize(); |
246 | - console.info(i3GEOadmin.mapfile.parametrosSalvar); | 246 | + //console.info(i3GEOadmin.mapfile.parametrosSalvar); |
247 | var hash = { | 247 | var hash = { |
248 | "mensagem": i3GEOadmin.mapfile.dicionario.confirma, | 248 | "mensagem": i3GEOadmin.mapfile.dicionario.confirma, |
249 | "onBotao1": "i3GEOadmin.mapfile.salvar('"+id+"')", | 249 | "onBotao1": "i3GEOadmin.mapfile.salvar('"+id+"')", |
ferramentas/filtro/index.js
@@ -41,7 +41,10 @@ i3GEOF.filtro = { | @@ -41,7 +41,10 @@ i3GEOF.filtro = { | ||
41 | dicionario["idRetorno"] = idRetorno; | 41 | dicionario["idRetorno"] = idRetorno; |
42 | if(modoCalculadora == true){ | 42 | if(modoCalculadora == true){ |
43 | dicionario["escondeGuias"] = "hidden"; | 43 | dicionario["escondeGuias"] = "hidden"; |
44 | + } else { | ||
45 | + dicionario["escondeGuias"] = ""; | ||
44 | } | 46 | } |
47 | + i3GEOF.filtro.dicionario["escondeGuias"] = dicionario["escondeGuias"]; | ||
45 | return dicionario; | 48 | return dicionario; |
46 | }, | 49 | }, |
47 | /* | 50 | /* |
@@ -224,7 +227,7 @@ i3GEOF.filtro = { | @@ -224,7 +227,7 @@ i3GEOF.filtro = { | ||
224 | ntr.id = "linhaFiltro"+i3GEOF.filtro.CONTADOR; | 227 | ntr.id = "linhaFiltro"+i3GEOF.filtro.CONTADOR; |
225 | temp = Mustache.render( | 228 | temp = Mustache.render( |
226 | "{{#data}}" + i3GEOF.filtro.MUSTACHELINHAFILTRO + "{{/data}}", | 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 | $(ntr).html(temp); | 232 | $(ntr).html(temp); |
230 | tabela = $i("i3GEOfiltroparametros"); | 233 | tabela = $i("i3GEOfiltroparametros"); |
ferramentas/filtro/template_linhafiltro_mst.html
1 | <td> | 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 | <span class="material-icons">add</span> | 3 | <span class="material-icons">add</span> |
4 | </button> | 4 | </button> |
5 | </td> | 5 | </td> |
6 | <td> | 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 | <span class="material-icons">clear</span> | 8 | <span class="material-icons">clear</span> |
9 | </button> | 9 | </button> |
10 | </td> | 10 | </td> |
@@ -33,12 +33,12 @@ | @@ -33,12 +33,12 @@ | ||
33 | </div> | 33 | </div> |
34 | </td> | 34 | </td> |
35 | <td> | 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 | <span class="material-icons">build</span> | 37 | <span class="material-icons">build</span> |
38 | </button> | 38 | </button> |
39 | </td> | 39 | </td> |
40 | <td> | 40 | <td> |
41 | - <div class='form-group condensed' style="padding-left:10px;"> | 41 | + <div class='form-group condensed {{{escondeGuias}}}' style="padding-left:10px;"> |
42 | <select name="conector" class="form-control" > | 42 | <select name="conector" class="form-control" > |
43 | <option value="and">and</option> | 43 | <option value="and">and</option> |
44 | <option value="or">or</option> | 44 | <option value="or">or</option> |
ferramentas/legenda/templateLista_mst.html
1 | <!-- para o caso de vetores --> | 1 | <!-- para o caso de vetores --> |
2 | <div class="{{{hidden2}}}"> | 2 | <div class="{{{hidden2}}}"> |
3 | <button onclick="i3GEOF.legenda.mudaLegenda()" class='btn btn-primary btn-sm btn-raised'>{{{aplicaAlteracao}}}</button> | 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 | <h5 class="alert alert-info">{{{clicaSimbolo}}}</h5> | 5 | <h5 class="alert alert-info">{{{clicaSimbolo}}}</h5> |
6 | <table id="i3GEOlegendalegenda" class="lista8" style="background-color: #89afd4;"> | 6 | <table id="i3GEOlegendalegenda" class="lista8" style="background-color: #89afd4;"> |
7 | <tr> | 7 | <tr> |
@@ -44,13 +44,13 @@ | @@ -44,13 +44,13 @@ | ||
44 | </td> | 44 | </td> |
45 | <td style="padding: 5px;"> | 45 | <td style="padding: 5px;"> |
46 | <div class='form-group label-fixed condensed'> | 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 | </div> | 48 | </div> |
49 | </td> | 49 | </td> |
50 | <td style="padding: 5px;"> | 50 | <td style="padding: 5px;"> |
51 | <div class='form-group label-fixed condensed'> | 51 | <div class='form-group label-fixed condensed'> |
52 | <!-- id necessario para o construtor de filtro --> | 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 | </div> | 54 | </div> |
55 | </td> | 55 | </td> |
56 | <td> | 56 | <td> |
ferramentas/salvamapfile/index.js
@@ -102,7 +102,7 @@ i3GEOF.salvamapfile = { | @@ -102,7 +102,7 @@ i3GEOF.salvamapfile = { | ||
102 | } | 102 | } |
103 | var ins = "<p class=paragrafo >"+$trad('ajuda',i3GEOF.salvamapfile.dicionario) + | 103 | var ins = "<p class=paragrafo >"+$trad('ajuda',i3GEOF.salvamapfile.dicionario) + |
104 | '<span id="i3GEOsalvamapconcluido" style=display:none;color:red > '+$trad('concluido',i3GEOF.salvamapfile.dicionario)+'</span></p>' + | 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)+'" /> <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 | $i(iddiv).innerHTML = ins; | 106 | $i(iddiv).innerHTML = ins; |
107 | new YAHOO.widget.Button( | 107 | new YAHOO.widget.Button( |
108 | "i3GEOsalvamapfilebotao1", | 108 | "i3GEOsalvamapfilebotao1", |