Download as
Browse Code »

Commit 95321d131e00b8fa691e8cebacb4d8acfa6d0679

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

Atualização do layout da administração do identifica

Showing 4 changed files with 95 additions and 43 deletions   Show diff stats
admin/admin.db
View file @95321d1
No preview for this file type
admin1/cadastros/identifica/exec.php
  Diff comments   View file @95321d1
@@ -31,7 +31,9 @@ include_once (dirname ( __FILE__ ) . "/../../../admin/php/login.php"); @@ -31,7 +31,9 @@ include_once (dirname ( __FILE__ ) . "/../../../admin/php/login.php");
31 $funcoesEdicao = array ( 31 $funcoesEdicao = array (
32 "ADICIONAR", 32 "ADICIONAR",
33 "ALTERAR", 33 "ALTERAR",
34 - "EXCLUIR" 34 + "EXCLUIR",
  35 + "LISTA",
  36 + "LISTAUNICO"
35 ); 37 );
36 if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) { 38 if (in_array ( strtoupper ( $funcao ), $funcoesEdicao )) {
37 if (verificaOperacaoSessao ( "admin/html/identifica" ) === false) { 39 if (verificaOperacaoSessao ( "admin/html/identifica" ) === false) {
@@ -69,8 +71,20 @@ switch ($funcao) { @@ -69,8 +71,20 @@ switch ($funcao) {
69 retornaJSON ( $dados ); 71 retornaJSON ( $dados );
70 exit (); 72 exit ();
71 break; 73 break;
  74 + case "LISTAUNICO" :
  75 + $d = pegaDados ( "SELECT id_i, publicado_i, abrir_i, nome_i, target_i from ".$esquemaadmin."i3geoadmin_identifica WHERE id_i = $id_i", $dbh, false );
  76 + if ($d === false) {
  77 + $dbhw = null;
  78 + $dbh = null;
  79 + header ( "HTTP/1.1 500 erro ao consultar banco de dados" );
  80 + exit ();
  81 + }
  82 + $dbhw = null;
  83 + $dbh = null;
  84 + retornaJSON ( $d[0] );
  85 + break;
72 case "LISTA" : 86 case "LISTA" :
73 - $d = pegaDados ( "SELECT id_i, publicado_i, abrir_i, nome_i, target_i from ".$esquemaadmin."i3geoadmin_identifica order by lower(nome_i)", $dbh, false ); 87 + $d = pegaDados ( "SELECT id_i, nome_i from ".$esquemaadmin."i3geoadmin_identifica order by lower(nome_i)", $dbh, false );
74 if ($d === false) { 88 if ($d === false) {
75 $dbhw = null; 89 $dbhw = null;
76 $dbh = null; 90 $dbh = null;
admin1/cadastros/identifica/index.js
  Diff comments   View file @95321d1
@@ -27,6 +27,8 @@ i3GEOadmin.identifica = { @@ -27,6 +27,8 @@ i3GEOadmin.identifica = {
27 ondeLista: "", 27 ondeLista: "",
28 //conteudo html do formulario de adicao de operacao 28 //conteudo html do formulario de adicao de operacao
29 formAdiciona: "", 29 formAdiciona: "",
  30 + //parametros obtidos do formulario de edicao antes de abrir o modal de confirmacao
  31 + parametrosSalvar: "",
30 init: function(onde){ 32 init: function(onde){
31 i3GEOadmin.identifica.ondeLista = onde; 33 i3GEOadmin.identifica.ondeLista = onde;
32 i3GEOadmin.identifica.lista(); 34 i3GEOadmin.identifica.lista();
@@ -60,29 +62,7 @@ Obtém a lista de Identifica @@ -60,29 +62,7 @@ Obtém a lista de Identifica
60 "data": json, 62 "data": json,
61 "excluir": i3GEOadmin.identifica.dicionario.excluir, 63 "excluir": i3GEOadmin.identifica.dicionario.excluir,
62 "onExcluir": "i3GEOadmin.identifica.excluirDialogo",//funcao 64 "onExcluir": "i3GEOadmin.identifica.excluirDialogo",//funcao
63 - "onSalvar": "i3GEOadmin.identifica.salvarDialogo",//funcao  
64 - "opcoesPublicado": function(){  
65 - var hash = {};  
66 - hash[this.publicado_i + "-sel"] = "selected";  
67 - //traducao  
68 - hash["sim"] = i3GEOadmin.identifica.dicionario.sim;  
69 - hash["nao"] = i3GEOadmin.identifica.dicionario.nao;  
70 - return Mustache.to_html(  
71 - $("#templateOpcoesPublicado").html(),  
72 - hash  
73 - );  
74 - },  
75 - "opcoesTarget": function(){  
76 - var hash = {};  
77 - hash[this.target_i + "-sel"] = "selected";  
78 - //traducao  
79 - hash["externo"] = i3GEOadmin.identifica.dicionario.externo;  
80 - hash["mapa"] = i3GEOadmin.identifica.dicionario.mapa;  
81 - return Mustache.to_html(  
82 - $("#templateOpcoesTarget").html(),  
83 - hash  
84 - );  
85 - } 65 + "onEditar": "i3GEOadmin.identifica.editarDialogo"
86 } 66 }
87 ) 67 )
88 ); 68 );
@@ -138,6 +118,61 @@ Obtém a lista de Identifica @@ -138,6 +118,61 @@ Obtém a lista de Identifica
138 i3GEOadmin.core.mostraErro(data.status + " " +data.statusText); 118 i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
139 }); 119 });
140 }, 120 },
  121 + editarDialogo: function(id){
  122 + i3GEOadmin.core.fechaModalGeral();
  123 + i3GEOadmin.core.modalAguarde(true);
  124 + $.post(
  125 + "exec.php?funcao=listaunico",
  126 + "id_i=" + id
  127 + )
  128 + .done(
  129 + function(data, status){
  130 + var json = jQuery.parseJSON(data);
  131 + var html = Mustache.to_html(
  132 + "{{#data}}" + $("#templateFormLista").html() + "{{/data}}",
  133 + $.extend(
  134 + {},
  135 + i3GEOadmin.identifica.dicionario,
  136 + {
  137 + "data": json,
  138 + "excluir": i3GEOadmin.identifica.dicionario.excluir,
  139 + "onExcluir": "i3GEOadmin.identifica.excluirDialogo",//funcao
  140 + "onSalvar": "i3GEOadmin.identifica.salvarDialogo",//funcao
  141 + "opcoesPublicado": function(){
  142 + var hash = {};
  143 + hash[this.publicado_i + "-sel"] = "selected";
  144 + //traducao
  145 + hash["sim"] = i3GEOadmin.identifica.dicionario.sim;
  146 + hash["nao"] = i3GEOadmin.identifica.dicionario.nao;
  147 + return Mustache.to_html(
  148 + $("#templateOpcoesPublicado").html(),
  149 + hash
  150 + );
  151 + },
  152 + "opcoesTarget": function(){
  153 + var hash = {};
  154 + hash[this.target_i + "-sel"] = "selected";
  155 + //traducao
  156 + hash["externo"] = i3GEOadmin.identifica.dicionario.externo;
  157 + hash["mapa"] = i3GEOadmin.identifica.dicionario.mapa;
  158 + return Mustache.to_html(
  159 + $("#templateOpcoesTarget").html(),
  160 + hash
  161 + );
  162 + }
  163 + }
  164 + )
  165 + );
  166 + i3GEOadmin.core.abreModalGeral(html);
  167 + }
  168 + )
  169 + .fail(
  170 + function(data){
  171 + i3GEOadmin.core.modalAguarde(false);
  172 + i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
  173 + }
  174 + );
  175 + },
141 adicionaDialogo: function(){ 176 adicionaDialogo: function(){
142 i3GEOadmin.core.abreModalGeral(i3GEOadmin.identifica.formAdiciona); 177 i3GEOadmin.core.abreModalGeral(i3GEOadmin.identifica.formAdiciona);
143 }, 178 },
@@ -194,18 +229,19 @@ Obtém a lista de Identifica @@ -194,18 +229,19 @@ Obtém a lista de Identifica
194 } 229 }
195 ); 230 );
196 }, 231 },
197 - salvarDialogo: function(id_i){ 232 + salvarDialogo: function(id){
  233 + i3GEOadmin.identifica.parametrosSalvar = $("#form-edicao-" + id).serialize();
198 var hash = { 234 var hash = {
199 "mensagem": i3GEOadmin.identifica.dicionario.confirma, 235 "mensagem": i3GEOadmin.identifica.dicionario.confirma,
200 - "onBotao1": "i3GEOadmin.identifica.salvar('"+id_i+"')", 236 + "onBotao1": "i3GEOadmin.identifica.salvar('"+id+"')",
201 "botao1": i3GEOadmin.identifica.dicionario.sim, 237 "botao1": i3GEOadmin.identifica.dicionario.sim,
202 - "onBotao2": "i3GEOadmin.core.fechaModalConfirma();", 238 + "onBotao2": "i3GEOadmin.identifica.parametrosSalvar = '';i3GEOadmin.core.fechaModalConfirma();",
203 "botao2": i3GEOadmin.identifica.dicionario.nao 239 "botao2": i3GEOadmin.identifica.dicionario.nao
204 }; 240 };
205 i3GEOadmin.core.abreModalConfirma(hash); 241 i3GEOadmin.core.abreModalConfirma(hash);
206 }, 242 },
207 salvar: function(id){ 243 salvar: function(id){
208 - var parametros = $("#form-" + id + " form").serialize(); 244 + var parametros = i3GEOadmin.identifica.parametrosSalvar;
209 i3GEOadmin.core.fechaModalGeral(); 245 i3GEOadmin.core.fechaModalGeral();
210 i3GEOadmin.core.modalAguarde(true); 246 i3GEOadmin.core.modalAguarde(true);
211 $.post( 247 $.post(
@@ -214,6 +250,7 @@ Obtém a lista de Identifica @@ -214,6 +250,7 @@ Obtém a lista de Identifica
214 ) 250 )
215 .done( 251 .done(
216 function(data, status){ 252 function(data, status){
  253 + i3GEOadmin.identifica.parametrosSalvar = "";
217 i3GEOadmin.core.modalAguarde(false); 254 i3GEOadmin.core.modalAguarde(false);
218 i3GEOadmin.core.iconeAguarde(i3GEOadmin.identifica.ondeLista); 255 i3GEOadmin.core.iconeAguarde(i3GEOadmin.identifica.ondeLista);
219 i3GEOadmin.identifica.lista(); 256 i3GEOadmin.identifica.lista();
@@ -221,6 +258,7 @@ Obtém a lista de Identifica @@ -221,6 +258,7 @@ Obtém a lista de Identifica
221 ) 258 )
222 .fail( 259 .fail(
223 function(data){ 260 function(data){
  261 + i3GEOadmin.identifica.parametrosSalvar = "";
224 i3GEOadmin.core.modalAguarde(false); 262 i3GEOadmin.core.modalAguarde(false);
225 i3GEOadmin.core.mostraErro(data.status + " " +data.statusText); 263 i3GEOadmin.core.mostraErro(data.status + " " +data.statusText);
226 } 264 }
admin1/cadastros/identifica/index.php
  Diff comments   View file @95321d1
@@ -62,7 +62,7 @@ include "../../head.php"; @@ -62,7 +62,7 @@ include "../../head.php";
62 <option value="form-{{id_i}}">{{{nome_i}}}</option> 62 <option value="form-{{id_i}}">{{{nome_i}}}</option>
63 </script> 63 </script>
64 <script id="templateFormLista" type="x-tmpl-mustache"> 64 <script id="templateFormLista" type="x-tmpl-mustache">
65 - <form style="" action="#" onsubmit="{{onSalvar}}('{{id_i}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" > 65 + <form id="form-edicao-{{id_i}}" style="" action="#" onsubmit="{{onSalvar}}('{{id_i}}');return false;" onchange="this.style.boxShadow='2px 2px 5px 0 #009688';" class="form-horizontal" role="form" method="post" >
66 <div class="row"> 66 <div class="row">
67 <div class="col-md-12"> 67 <div class="col-md-12">
68 <h4>{{{nome_i}}}</h4> 68 <h4>{{{nome_i}}}</h4>
@@ -101,24 +101,24 @@ include &quot;../../head.php&quot;; @@ -101,24 +101,24 @@ include &quot;../../head.php&quot;;
101 <div class="pull-right"> 101 <div class="pull-right">
102 <button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{salvar}}</button> 102 <button type="submit" class="btn btn-primary" role="button" style="color:#008579;">{{salvar}}</button>
103 </div> 103 </div>
104 - <div class="clearfix"></div>  
105 - </form> 104 + <div class="clearfix"></div>
  105 + </form>
106 </script> 106 </script>
107 <script id="templateLista" type="x-tmpl-mustache"> 107 <script id="templateLista" type="x-tmpl-mustache">
108 -<div class="panel panel-default" id="form-{{id_i}}">  
109 - <div class="panel-heading icon" role="tab">  
110 - <h3 class="panel-title {{escondido}}">  
111 - <a href="javascript:void(0)" onclick="{{onExcluir}}('{{id_i}}')" class="btn btn-danger btn-fab btn-fab-mini" role="button">  
112 - <i class="material-icons">delete_forever</i> 108 +<div class="list-group-item" id="form-{{id_i}}">
  109 + <div class="row-content">
  110 + <h3 class="list-group-item-heading {{escondido}}">
  111 + {{{nome_i}}}
  112 + <a href="javascript:void(0)" onclick="{{onEditar}}('{{id_i}}')" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
  113 + <i class="material-icons md-18">edit</i>
  114 + </a>
  115 + <span class="pull-right">&nbsp;&nbsp;</span>
  116 + <a href="javascript:void(0)" onclick="{{onExcluir}}('{{id_i}}')" class="btn btn-danger btn-fab btn-fab-mini pull-right" role="button">
  117 + <i class="material-icons md-18">delete_forever</i>
113 </a> 118 </a>
114 - &nbsp;  
115 - <a class="collapsed in" role="button" data-toggle="collapse" href="#body-form-{{id_i}}"  
116 - aria-expanded="false" aria-controls="#body-form-{{id_i}}"> {{{nome_i}}} </a>  
117 </h3> 119 </h3>
118 </div> 120 </div>
119 - <div class="panel-body panel-collapse collapse" id="body-form-{{id_i}}">  
120 - {{{templateFormLista}}}  
121 - </div> 121 + <div class="list-group-separator"></div>
122 </div> 122 </div>
123 </script> 123 </script>
124 124