From ca7272b2047c81959b7ac8ead60567d7de780712 Mon Sep 17 00:00:00 2001 From: edmarmoretti Date: Wed, 12 Oct 2016 22:35:03 -0300 Subject: [PATCH] Alteração no layout da lista de dados no sistema de admin --- admin/admin.db | Bin 340992 -> 0 bytes admin1/cadastros/identifica/exec.php | 2 +- admin1/cadastros/perfis/exec.php | 2 +- admin1/cadastros/servicos/exec.php | 18 ++++++++++++++++-- admin1/cadastros/servicos/index.js | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ admin1/cadastros/servicos/index.php | 24 ++++++++++++------------ admin1/cadastros/tags/exec.php | 2 +- admin1/catalogo/atlas/exec.php | 2 +- admin1/catalogo/mapas/exec.php | 4 ++-- admin1/catalogo/menus/exec.php | 2 +- admin1/catalogo/menus/grupos/exec.php | 2 +- admin1/catalogo/menus/grupos/listadegrupos/exec.php | 2 +- admin1/catalogo/menus/grupos/subgrupos/exec.php | 2 +- admin1/catalogo/menus/grupos/subgrupos/listadesubgrupos/exec.php | 2 +- admin1/catalogo/menus/grupos/subgrupos/temas/exec.php | 2 +- admin1/usuarios/cadastro/exec.php | 2 +- admin1/usuarios/grupos/exec.php | 2 +- 17 files changed, 92 insertions(+), 40 deletions(-) diff --git a/admin/admin.db b/admin/admin.db index 400a679..b680e60 100755 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin1/cadastros/identifica/exec.php b/admin1/cadastros/identifica/exec.php index 0c601d6..03691cc 100755 --- a/admin1/cadastros/identifica/exec.php +++ b/admin1/cadastros/identifica/exec.php @@ -70,7 +70,7 @@ switch ($funcao) { exit (); break; case "LISTA" : - $d = pegaDados ( "SELECT id_i, publicado_i, abrir_i, nome_i, target_i from ".$esquemaadmin."i3geoadmin_identifica order by nome_i", $dbh, false ); + $d = pegaDados ( "SELECT id_i, publicado_i, abrir_i, nome_i, target_i from ".$esquemaadmin."i3geoadmin_identifica order by lower(nome_i)", $dbh, false ); if ($d === false) { $dbhw = null; $dbh = null; diff --git a/admin1/cadastros/perfis/exec.php b/admin1/cadastros/perfis/exec.php index 4368732..66d1676 100755 --- a/admin1/cadastros/perfis/exec.php +++ b/admin1/cadastros/perfis/exec.php @@ -71,7 +71,7 @@ switch ($funcao) { exit (); break; case "LISTA" : - $dados = pegaDados ( "SELECT id_perfil, perfil from ".$esquemaadmin."i3geoadmin_perfis order by perfil", $dbh, false ); + $dados = pegaDados ( "SELECT id_perfil, perfil from ".$esquemaadmin."i3geoadmin_perfis order by lower(perfil)", $dbh, false ); if ($dados === false) { $dbhw = null; $dbh = null; diff --git a/admin1/cadastros/servicos/exec.php b/admin1/cadastros/servicos/exec.php index 871b055..a5690a6 100755 --- a/admin1/cadastros/servicos/exec.php +++ b/admin1/cadastros/servicos/exec.php @@ -27,7 +27,9 @@ include_once (dirname ( __FILE__ ) . "/../../../admin/php/login.php"); $funcoesEdicao = array ( "ADICIONAR", "ALTERAR", - "EXCLUIR" + "EXCLUIR", + "LISTA", + "LISTAUNICO" ); if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) { if (verificaOperacaoSessao ( "admin/html/webservices" ) === false) { @@ -66,8 +68,20 @@ switch ($funcao) { retornaJSON ( $dados ); exit (); break; + case "LISTAUNICO" : + $ws = pegaDados ( "SELECT id_ws,autor_ws,desc_ws,link_ws,nome_ws,tipo_ws from ".$esquemaadmin."i3geoadmin_ws WHERE id_ws = $id_ws ", $dbh, false ); + if ($ws === false) { + $dbhw = null; + $dbh = null; + header ( "HTTP/1.1 500 erro ao consultar banco de dados" ); + exit (); + } + $dbhw = null; + $dbh = null; + retornaJSON ( $ws[0] ); + break; case "LISTA" : - $ws = pegaDados ( "SELECT id_ws,autor_ws,desc_ws,link_ws,nome_ws,tipo_ws from ".$esquemaadmin."i3geoadmin_ws order by nome_ws", $dbh, false ); + $ws = pegaDados ( "SELECT id_ws,nome_ws from ".$esquemaadmin."i3geoadmin_ws order by lower (nome_ws)", $dbh, false ); if ($ws === false) { $dbhw = null; $dbh = null; diff --git a/admin1/cadastros/servicos/index.js b/admin1/cadastros/servicos/index.js index 12577c6..45d3cdc 100755 --- a/admin1/cadastros/servicos/index.js +++ b/admin1/cadastros/servicos/index.js @@ -27,6 +27,8 @@ i3GEOadmin.webservices = { ondeLista: "", //conteudo html do formulario de adicao de operacao formAdiciona: "", + //parametros obtidos do formulario de edicao antes de abrir o modal de confirmacao + parametrosSalvar: "", init: function(onde){ i3GEOadmin.webservices.ondeLista = onde; i3GEOadmin.webservices.lista(); @@ -49,7 +51,7 @@ Obtém a lista de Webservices var json = jQuery.parseJSON(data); //template do form de cada operacao var templateLista = $("#templateLista").html(); - templateLista = templateLista.replace("{{{templateFormLista}}}",$("#templateFormLista").html()); + //templateLista = templateLista.replace("{{{templateFormLista}}}",$("#templateFormLista").html()); //lista todas as Webservices var html = Mustache.to_html( "{{#data}}" + templateLista + "{{/data}}", @@ -59,15 +61,7 @@ Obtém a lista de Webservices { "data": json, "onExcluir": "i3GEOadmin.webservices.excluirDialogo",//funcao - "onSalvar": "i3GEOadmin.webservices.salvarDialogo",//funcao - "opcoesTipo": function(){ - var hash = {}; - hash[this.tipo_ws + "-sel"] = "selected"; - return Mustache.to_html( - $("#templateOpcoesTipo").html(), - hash - ); - } + "onEditar": "i3GEOadmin.webservices.editarDialogo" } ) ); @@ -112,6 +106,47 @@ Obtém a lista de Webservices i3GEOadmin.core.mostraErro(data.status + " " +data.statusText); }); }, + editarDialogo: function(id){ + i3GEOadmin.core.fechaModalGeral(); + i3GEOadmin.core.modalAguarde(true); + $.post( + "exec.php?funcao=listaunico", + "id_ws=" + id + ) + .done( + function(data, status){ + var json = jQuery.parseJSON(data); + //lista todas as Webservices + var html = Mustache.to_html( + "{{#data}}" + $("#templateFormLista").html() + "{{/data}}", + $.extend( + {}, + i3GEOadmin.webservices.dicionario, + { + "data": json, + "onExcluir": "i3GEOadmin.webservices.excluirDialogo",//funcao + "onSalvar": "i3GEOadmin.webservices.salvarDialogo",//funcao + "opcoesTipo": function(){ + var hash = {}; + hash[this.tipo_ws + "-sel"] = "selected"; + return Mustache.to_html( + $("#templateOpcoesTipo").html(), + hash + ); + } + } + ) + ); + i3GEOadmin.core.abreModalGeral(html); + } + ) + .fail( + function(data){ + i3GEOadmin.core.modalAguarde(false); + i3GEOadmin.core.mostraErro(data.status + " " +data.statusText); + } + ); + }, adicionaDialogo: function(){ i3GEOadmin.core.abreModalGeral(i3GEOadmin.webservices.formAdiciona); }, @@ -169,17 +204,18 @@ Obtém a lista de Webservices ); }, salvarDialogo: function(id){ + i3GEOadmin.webservices.parametrosSalvar = $("#form-edicao-" + id).serialize(); var hash = { "mensagem": i3GEOadmin.webservices.dicionario.confirma, "onBotao1": "i3GEOadmin.webservices.salvar('"+id+"')", "botao1": i3GEOadmin.webservices.dicionario.sim, - "onBotao2": "i3GEOadmin.core.fechaModalConfirma();", + "onBotao2": "i3GEOadmin.webservices.parametrosSalvar = '';i3GEOadmin.core.fechaModalConfirma();", "botao2": i3GEOadmin.webservices.dicionario.nao }; i3GEOadmin.core.abreModalConfirma(hash); }, salvar: function(id){ - var parametros = $("#form-" + id + " form").serialize(); + var parametros = i3GEOadmin.webservices.parametrosSalvar; i3GEOadmin.core.fechaModalGeral(); i3GEOadmin.core.modalAguarde(true); $.post( @@ -188,6 +224,7 @@ Obtém a lista de Webservices ) .done( function(data, status){ + i3GEOadmin.webservices.parametrosSalvar = ""; i3GEOadmin.core.modalAguarde(false); i3GEOadmin.core.iconeAguarde(i3GEOadmin.webservices.ondeLista); i3GEOadmin.webservices.lista(); @@ -195,6 +232,7 @@ Obtém a lista de Webservices ) .fail( function(data){ + i3GEOadmin.webservices.parametrosSalvar = ""; i3GEOadmin.core.modalAguarde(false); i3GEOadmin.core.mostraErro(data.status + " " +data.statusText); } diff --git a/admin1/cadastros/servicos/index.php b/admin1/cadastros/servicos/index.php index 962133b..b476c38 100755 --- a/admin1/cadastros/servicos/index.php +++ b/admin1/cadastros/servicos/index.php @@ -61,7 +61,7 @@ include "../../head.php";