Download as
Browse Code »

Commit c6b1f14bd8338c03d07ea24cc8e3e1a47a6e8122

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

--no commit message

Showing 2 changed files with 41 additions and 29 deletions   Show diff stats
ferramentas/filtro/index.js
  Diff comments   View file @c6b1f14
... ... @@ -102,8 +102,9 @@ i3GEOF.filtro = {
102 102 $i(iddiv).innerHTML += i3GEOF.filtro.html();
103 103 i3GEO.guias.mostraGuiaFerramenta("i3GEOfiltroguia1","i3GEOfiltroguia");
104 104 //eventos das guias
105   - $i("i3GEOfiltroguia1").onclick = function()
106   - {i3GEO.guias.mostraGuiaFerramenta("i3GEOfiltroguia1","i3GEOfiltroguia");};
  105 + $i("i3GEOfiltroguia1").onclick = function(){
  106 + i3GEO.guias.mostraGuiaFerramenta("i3GEOfiltroguia1","i3GEOfiltroguia");
  107 + };
107 108 $i("i3GEOfiltroguia2").onclick = function(){
108 109 i3GEO.guias.mostraGuiaFerramenta("i3GEOfiltroguia2","i3GEOfiltroguia");
109 110 i3GEOF.filtro.pegaFiltro();
... ... @@ -157,16 +158,17 @@ i3GEOF.filtro = {
157 158 ' <input id=i3GEOfiltrobotao1 size=18 type="button" value="'+$trad('inclui',i3GEOF.filtro.dicionario)+'" />'+
158 159 ' <input id=i3GEOfiltrobotao2 size=18 type="button" value="'+$trad('remove',i3GEOF.filtro.dicionario)+'" />'+
159 160 '</p>'+
160   - '<div class=guiaobj id="i3GEOfiltroguia1obj" style="left:1px;display:none;">'+
  161 + '<div class=guiaobj id="i3GEOfiltroguia1obj" style="left:1px;display:block;">'+
161 162 ' <div id=i3GEOfiltropar style="display:block;position:relative;top:5px;left:0px;">'+
162   - ' <table summary="" id="i3GEOfiltroparametros" >'+
  163 + ' <table summary="" id="i3GEOfiltroparametros" style="width:380px">'+
163 164 ' <tr><td></td><td></td>'+
164 165 ' <td style=background-color:yellow >'+$trad('item',i3GEOF.filtro.dicionario)+'</td>'+
165 166 ' <td style=background-color:yellow >'+$trad('operador',i3GEOF.filtro.dicionario)+'</td>'+
166 167 ' <td style=background-color:yellow >'+$trad('valor',i3GEOF.filtro.dicionario)+'</td>'+
  168 + ' <td style=background-color:yellow ></td>'+
167 169 ' <td style=background-color:yellow >'+$trad('conector',i3GEOF.filtro.dicionario)+'</td>'+
168 170 ' </tr>'+
169   - ' <tr><td>&nbsp;</td><td></td><td></td><td></td><td></td><td></td></tr>'+
  171 + ' <tr><td>&nbsp;</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>'+
170 172 ' </table>'+
171 173 ' </div>'+
172 174 ' <div id=i3GEOfiltroresultado style="position:relative;top:5px;left:0px">'+
... ... @@ -176,9 +178,11 @@ i3GEOF.filtro = {
176 178 ' <div id=i3GEOfiltromen1 style=top:15px;left:0px; ><p class=paragrafo >'+$trad('ajuda',i3GEOF.filtro.dicionario)+'</div>'+
177 179 '</div>'+
178 180 '<div class=guiaobj id="i3GEOfiltroguia2obj" style="left:1px;display:none;">'+
179   - ' <p class=paragrafo >'+$trad('digitaFiltro',i3GEOF.filtro.dicionario)+':<br>'+
180   - $inputText("","","i3GEOfiltrofiltro","",65,"") +
181   - '</p></div>'+
  181 + ' <p class=paragrafo >'+$trad('digitaFiltro',i3GEOF.filtro.dicionario)+':'+
  182 + ' <div class=styled-select >' +
  183 + ' <input type="text" value = "" id="i3GEOfiltrofiltro" />' +
  184 + ' </div>' +
  185 + '</div>'+
182 186 '<div class=guiaobj id="i3GEOfiltroguia3obj" style="left:1px;display:none;">'+
183 187 '</div>';
184 188 return ins;
... ... @@ -228,7 +232,7 @@ i3GEOF.filtro = {
228 232 Adiciona uma nova linha de filtro
229 233 */
230 234 adicionaLinhaFiltro: function(){
231   - var add,xis,interrogacao,operador,conector,valor,ntb,ntr,ntad,ntd,ntd1,ntd2,ntd3,ntd4,tabela;
  235 + var add,xis,interrogacao,operador,conector,valor,ntb,ntr,ntad,ntd,ntd1,ntd2,ntd3,ntd4,ntd5,tabela;
232 236 try{
233 237 add = document.createElement("img");
234 238 add.src = i3GEO.configura.locaplic+'/imagens/plus.gif';
... ... @@ -250,27 +254,31 @@ i3GEOF.filtro = {
250 254 interrogacao.src = i3GEO.configura.locaplic+'/imagens/interrogacao.gif';
251 255 interrogacao.title= $trad('mostraValor',i3GEOF.filtro.dicionario);
252 256 interrogacao.style.cursor="pointer";
  257 + interrogacao.style.marginLeft="5px";
253 258 interrogacao.onclick = function(){
254 259 var obj,
255 260 itemTema;
256   - obj = (this.parentNode.getElementsByTagName("input"))[0];
  261 + obj = (this.parentNode.parentNode.getElementsByTagName("input"))[0];
257 262 itemTema = (this.parentNode.parentNode.getElementsByTagName("select"))[0].value;
258 263 i3GEO.util.comboValoresItem(
259 264 "i3GEOfiltrocbitens",
260 265 i3GEO.temaAtivo,
261 266 itemTema,
262 267 function(retorno){
263   - $i("i3GEOfiltrovalores").innerHTML = "<br><p class=paragrafo >"+$trad('selecionaValor',i3GEOF.filtro.dicionario)+":"+retorno.dados+"</p>";
  268 + $i("i3GEOfiltrovalores").innerHTML = "<br><p class=paragrafo >" +
  269 + $trad('selecionaValor',i3GEOF.filtro.dicionario) +
  270 + ":<div class='styled-select'>" +
  271 + retorno.dados+"</div>";
264 272 if ($i("i3GEOfiltrocbitens")){
265 273 $i("i3GEOfiltrocbitens").onchange = function()
266 274 {obj.value = this.value;};
267 275 }
268 276 },
269   - "i3GEOfiltrovalores"
  277 + "i3GEOfiltrovalores",
  278 + "display:block"
270 279 );
271 280 };
272   -
273   - operador = "<select>";
  281 + operador = "&nbsp;<div class='styled-select' style='width:60px;margin-left:5px;position:relative;top:-7px;'><select>";
274 282 operador += "<option value='='>"+$trad('igual',i3GEOF.filtro.dicionario)+"</option>";
275 283 operador += "<option value='!='>dif</option>";
276 284 operador += "<option value='<'>"+$trad('menor',i3GEOF.filtro.dicionario)+"</option>";
... ... @@ -278,17 +286,18 @@ i3GEOF.filtro = {
278 286 operador += "<option value='<='><=</option>";
279 287 operador += "<option value='>='>>=</option>";
280 288 operador += "<option value='in'>in</option>";
281   - operador += "<option value='~='>regExp</option></select>";
  289 + operador += "<option value='~='>regExp</option></select></div>";
282 290  
283   - conector = "<select>";
  291 + conector = "&nbsp;<div class='styled-select' style='width:60px;margin-left:5px;position:relative;top:-7px;' ><select>";
284 292 conector += "<option value='and'>"+$trad('e',i3GEOF.filtro.dicionario)+"</option>";
285 293 conector += "<option value='or'>"+$trad('ou',i3GEOF.filtro.dicionario)+"</option>";
286   - conector += "<option value='not'>"+$trad('nao',i3GEOF.filtro.dicionario)+"</option></select>";
  294 + conector += "<option value='not'>"+$trad('nao',i3GEOF.filtro.dicionario)+"</option></select></div>";
287 295  
288   - valor = document.createElement("input");
289   - valor.type = "text";
290   - valor.value = "";
291   - valor.size = "20";
  296 + valor = document.createElement("div");
  297 + valor.className = 'styled-select';
  298 + valor.style.width = "100px";
  299 + valor.style.marginLeft="5px";
  300 + valor.innerHTML = "<input type=text value='' />";
292 301  
293 302 ntb = document.createElement("tbody");
294 303 ntr = document.createElement("tr");
... ... @@ -301,7 +310,7 @@ i3GEOF.filtro = {
301 310 ntr.appendChild(ntd);
302 311  
303 312 ntd1 = document.createElement("td");
304   - ntd1.innerHTML = i3GEOF.filtro.comboTemas;
  313 + ntd1.innerHTML = "<div class='styled-select' style='width:120px;margin-left:5px;'>"+i3GEOF.filtro.comboTemas+"</div>";
305 314 ntr.appendChild(ntd1);
306 315  
307 316 ntd2 = document.createElement("td");
... ... @@ -310,14 +319,16 @@ i3GEOF.filtro = {
310 319  
311 320 ntd3 = document.createElement("td");
312 321 ntd3.appendChild(valor);
313   - ntd3.appendChild(interrogacao);
314 322 ntr.appendChild(ntd3);
315 323  
316 324 ntd4 = document.createElement("td");
317   - ntd4.innerHTML = conector;
  325 + ntd4.appendChild(interrogacao);
318 326 ntr.appendChild(ntd4);
319   - ntb.appendChild(ntr);
320 327  
  328 + ntd5 = document.createElement("td");
  329 + ntd5.innerHTML = conector;
  330 + ntr.appendChild(ntd5);
  331 + ntb.appendChild(ntr);
321 332 tabela = $i("i3GEOfiltroparametros");
322 333 tabela.appendChild(ntb);
323 334 }
... ... @@ -410,7 +421,7 @@ i3GEOF.filtro = {
410 421 operador = s[0].value;
411 422 s = nos[4].getElementsByTagName("input");
412 423 valor = s[0].value;
413   - s = nos[5].getElementsByTagName("select");
  424 + s = nos[6].getElementsByTagName("select");
414 425 conector = s[0].value;
415 426 if (valor*1)
416 427 {filtro = filtro + "(["+itemsel+"] "+operador+" "+valor+")";}
... ...
ferramentas/selecao/index.js
  Diff comments   View file @c6b1f14
... ... @@ -894,7 +894,7 @@ i3GEOF.selecao = {
894 894 "display:block"
895 895 );
896 896 };
897   - operador = "<div class='styled-select' style='width:60px;'><select>";
  897 + operador = "<div class='styled-select' style='width:60px;margin-left:5px;'><select>";
898 898 operador += "<option value='='>=</option>";
899 899 operador += "<option value='!='> != </option>";
900 900 operador += "<option value='<'> < </option>";
... ... @@ -904,7 +904,7 @@ i3GEOF.selecao = {
904 904 operador += "<option value='in'> in </option>";
905 905 operador += "<option value='~='> regExp </option></select></div>";
906 906  
907   - conector = "<div class='styled-select' style='width:60px;' ><select>";
  907 + conector = "<div class='styled-select' style='width:60px;margin-left:5px;' ><select>";
908 908 conector += "<option value='and'>and</option>";
909 909 conector += "<option value='or'>or</option>";
910 910 conector += "<option value='not'>not</option></select></div>";
... ... @@ -912,6 +912,7 @@ i3GEOF.selecao = {
912 912 valor = document.createElement("div");
913 913 valor.className = 'styled-select';
914 914 valor.style.width = "100px";
  915 + valor.style.marginLeft="5px";
915 916 valor.innerHTML = "<input type=text value='' />";
916 917  
917 918  
... ... @@ -929,7 +930,7 @@ i3GEOF.selecao = {
929 930 "none",
930 931 i3GEO.temaAtivo,
931 932 function(retorno){
932   - ntd1.innerHTML = "<div class='styled-select' style='width:90px;' >" + retorno.dados + "</div>";
  933 + ntd1.innerHTML = "<div class='styled-select' style='width:90px;margin-left:5px;' >" + retorno.dados + "</div>";
933 934 }
934 935 );
935 936 ntr.appendChild(ntd1);
... ...