--no commit message

Edmar Moretti
1 parent 245fb615
Showing 7 changed files with 110 additions and 27 deletions Show diff stats
classesphp/classe_toponimia.php
css/geral.css
css/i3geo6.css
css/i3geo6.css.php
ferramentas/etiqueta/exec.php
ferramentas/etiqueta/index.js
ferramentas/etiqueta/template_mst.html
@@ -314,14 +314,18 @@ $item Lista de Itens separados por v&amp;iacute;rgula que ser&amp;atilde;o utilizados.
 		if(!$this->layer){return "erro";}
 		$itens = $this->layer->getmetadata("ITENS");
 		$itens = explode(",",$itens);
-		$itensdesc = $this->layer->getmetadata("ITENSDESC");
+		$itensdesc = mb_convert_encoding($this->layer->getmetadata("ITENSDESC"),"UTF-8","ISO-8859-1");
 		$itensdesc = explode(",",$itensdesc);
+		$itenslink = $this->layer->getmetadata("ITENSLINK");
+		$itenslink = explode(",",$itenslink);
+
 		$tips = $this->layer->getmetadata("TIP");
+
 		$res = array(
 				"itens"=>$itens,
-				"itensdesc"=>$itensdesc,
-				"tips"=>explode(",",$tips),
-				"comb"=>array_combine($itens,$itensdesc)
+				"itensdesc"=>array_combine($itens,$itensdesc),
+				"itenslink"=>array_combine($itens,$itenslink),
+				"tips"=>explode(",",$tips)
 		);
 		return($res);
 	}
@@ -1033,7 +1033,16 @@ h1 {
 	border-radius: 2px;
 }
-.styled-select select {
+.styled-select150 {
+	width: 150px;
+	overflow: hidden;
+	background: #F8F8F8;
+	border: 1px solid #DDDDDD;
+	height: 22px;
+	border-radius: 2px;
+}
+
+.styled-select select, .styled-select150 select {
 	width: 120%;
 	height: 22px;
 	border: 0;
@@ -1053,7 +1062,7 @@ h1 {
     }
 }
-.styled-select input {
+.styled-select input, .styled-select150 input {
 	width: 100%;
 	height: 22px;
 	border: 0;
@@ -915,7 +915,15 @@ border: 1px solid #DDDDDD;
 height: 22px;
 border-radius: 2px;
 }
-.styled-select select {
+.styled-select150 {
+width: 150px;
+overflow: hidden;
+background: #F8F8F8;
+border: 1px solid #DDDDDD;
+height: 22px;
+border-radius: 2px;
+}
+.styled-select select, .styled-select150 select {
 width: 120%;
 height: 22px;
 border: 0;
@@ -934,7 +942,7 @@ background: transparent url(&quot;../imagens/menuarodwn8_nrm_1.gif&quot;) no-repeat scroll
 background-size: 16px 144px;
 }
 }
-.styled-select input {
+.styled-select input, .styled-select150 input {
 width: 100%;
 height: 22px;
 border: 0;
@@ -915,7 +915,15 @@ border: 1px solid #DDDDDD;
 height: 22px;
 border-radius: 2px;
 }
-.styled-select select {
+.styled-select150 {
+width: 150px;
+overflow: hidden;
+background: #F8F8F8;
+border: 1px solid #DDDDDD;
+height: 22px;
+border-radius: 2px;
+}
+.styled-select select, .styled-select150 select {
 width: 120%;
 height: 22px;
 border: 0;
@@ -934,7 +942,7 @@ background: transparent url(&quot;../imagens/menuarodwn8_nrm_1.gif&quot;) no-repeat scroll
 background-size: 16px 144px;
 }
 }
-.styled-select input {
+.styled-select input, .styled-select150 input {
 width: 100%;
 height: 22px;
 border: 0;
@@ -17,10 +17,14 @@ Ativa as etiquetas de um tema.
 		include_once(dirname(__FILE__)."/../../classesphp/classe_toponimia.php");
 		copiaSeguranca($map_file);
 		$m = new Toponimia($map_file,$tema);
-		$retorno = $m->ativaEtiquetas($tips);
+		$m->layer->setmetadata("IDENTIFICA","");
+		$m->layer->setmetadata("TIP",$tips);
 		$m->layer->setmetadata("ITENS",$itens);
+		$m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc));
+		$m->layer->setmetadata("ITENSLINK",base64_decode($itenslink));
 		$m->salva();
 		$_SESSION["contadorsalva"]++;
+		$retorno = "ok";
 	break;
 /*
 Valor: REMOVEETIQUETAS
@@ -116,7 +116,7 @@ i3GEOF.etiqueta = {
 	html:function(){
 		var ins = '';
 		ins += '<p class="paragrafo" >'+$trad('selecionaItem',i3GEOF.etiqueta.dicionario)+':<br>';
-		ins += '<div id=i3GEOetiquetalistai class=digitar style="text-align:left;left:0px;top:0px;330px;height:80px;overflow:auto;display:block;"></div>';
+		ins += '<div id=i3GEOetiquetalistai class=digitar style="text-align:left;left:0px;top:0px;width;95%;height:150px;overflow:auto;display:block;"></div>';
 		ins += '<br>';
 		ins += '<p class="paragrafo" >';
 		ins += '<input id=i3GEOetiquetabotao1 size=35  type=button value="'+$trad("p14")+'" />';
@@ -143,8 +143,8 @@ i3GEOF.etiqueta = {
 		//cria a janela flutuante
 		titulo = "<div  id='i3GEOFetiquetaComboCabeca' class='comboTemasCabecalho'>   ------</div><span style=margin-left:60px>"+$trad("d7at")+"</span><a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=5&idajuda=37' >&nbsp;&nbsp;&nbsp;</a>";
 		janela = i3GEO.janela.cria(
-			"450px",
-			"175px",
+			"500px",
+			"230px",
 			"",
 			"",
 			"",
@@ -197,15 +197,16 @@ i3GEOF.etiqueta = {
 	montaListaItens: function(retorno){
 		var funcao = function(dadosItens){
 			var ins,i,n,itensatuais,item,ck = '',lista;
-			lista = dadosItens.data.comb;
+			lista = dadosItens.data;
 			try{
 				itensatuais = i3GEO.arvoreDeCamadas.pegaTema(i3GEO.temaAtivo);
 				itensatuais = itensatuais.etiquetas.split(",");
 				ins = [];
-				ins.push("<table class='lista6' >");
-				ins.push("<tr><td>Coluna</td><td>Tip</td><td>Identifica</td>");
+				ins.push("<table class='lista8' >");
+				ins.push("<tr><td>Coluna</td><td>Tip</td><td>Identifica</td><td>Alias</td><td>Link</td>");
 				n = retorno.data.valores.length;
 				for (i=0;i<n; i++){
+					//etiquetas tip
 					item = retorno.data.valores[i].item;
 					if(i3GEO.util.in_array(item,itensatuais)){
 						ck = "checked";
@@ -215,46 +216,91 @@ i3GEOF.etiqueta = {
 					}
 					ins.push("<tr>");
 					ins.push("<td>&nbsp;"+item+"</td>");
-					ins.push("<td><input style='cursor:pointer' "+ck+" type='checkbox' value='"+item+"' name='etiquetaTip' /></td>");
-					if(lista[item]){
+					ins.push("<td><input disabled style='cursor:pointer' "+ck+" type='checkbox' value='"+item+"' name='etiquetaTip' /></td>");
+					//itens
+					if(i3GEO.util.in_array(item,lista.itens)){
 						ck = "checked";
 					}
 					else{
 						ck = "";
 					}
-					ins.push("<td><input style='cursor:pointer' "+ck+" type='checkbox' value='"+item+"' name='identifica' /></td>");
+					ins.push("<td><input onclick='i3GEOF.etiqueta.ativaLinha(this)' style='cursor:pointer' id='etiqueta_"+item+"' "+ck+" type='checkbox' value='"+item+"' name='identifica' /></td>");
+					//alias dos itens
+					if(lista.itensdesc[item]){
+						ck = lista.itensdesc[item];
+					}
+					else{
+						ck = "";
+					}
+					ins.push("<td><div class='styled-select150' ><input disabled style='cursor:pointer' type='text' value='"+ck+"' name='itensdesc' /></div></td>");
+					//links
+					if(lista.itenslink[item]){
+						ck = lista.itenslink[item];
+					}
+					else{
+						ck = "";
+					}
+					ins.push("<td><div class='styled-select150' ><input disabled style='cursor:pointer' type='text' value='"+ck+"' name='itenslink' /></div></td>");
+
 					ins.push("</tr>");
 				}
-				$i("i3GEOetiquetalistai").innerHTML = ins.join("");
 				ins.push("</table>");
+				$i("i3GEOetiquetalistai").innerHTML = ins.join("");
+				//enable
+				lista = $i("i3GEOetiquetalistai").getElementsByTagName("input");
+				n = lista.length;
+				for (i=0;i<n; i++){
+					if(lista[i].name === "identifica"){
+						i3GEOF.etiqueta.ativaLinha(lista[i]);
+					}
+				}
 			}
 			catch(e)
 			{$i("i3GEOetiquetalistai").innerHTML = "<p style=color:red >Erro<br>"+e;}
 		};
 		i3GEOF.etiqueta.pegaDadosEtiquetas(funcao);
 	},
+	ativaLinha: function(obj){
+		var linha = obj.parentNode.parentNode,
+			objs = linha.getElementsByTagName("input"),
+			n = objs.length,
+			i;
+		for(i=0;i<n;i++){
+			if(objs[i].name != "identifica"){
+				objs[i].disabled = !obj.checked;
+			}
+		}
+	},
 	/*
 	Function: pegaItensMarcados
-	Recupera os itens que foram marcados e monta uma lista para enviar como par�metro para a fun&ccedil;&atilde;o de gera&ccedil;&atilde;o dos gr&aacute;ficos
+	Recupera os itens que foram marcados e monta uma lista para enviar como par&acirc;metro para a fun&ccedil;&atilde;o de gera&ccedil;&atilde;o dos gr&aacute;ficos
 	*/
 	pegaItensMarcados: function(){
 		var tips = [],
 			itens = [],
+			itensdesc = [],
+			itenslink = [],
 			inputs = $i("i3GEOetiquetalistai").getElementsByTagName("input"),
 			i,
 			it,
 			n = inputs.length;
 		for (i=0;i<n; i++){
 			it = inputs[i];
-			if (it.checked === true && it.name === "etiquetaTip"){
+			if (it.disabled === false && it.checked === true && it.name === "etiquetaTip"){
 				tips.push(it.value);
 			}
-			if (it.checked === true && it.name === "identifica"){
+			if (it.disabled === false && it.checked === true && it.name === "identifica"){
 				itens.push(it.value);
 			}
+			if (it.disabled === false && it.name === "itensdesc"){
+				itensdesc.push(it.value);
+			}
+			if (it.disabled === false && it.name === "itenslink"){
+				itenslink.push(it.value);
+			}
 		}
-		return([tips,itens]);
+		return([tips,itens,itensdesc,itenslink]);
 	},
 	/*
 	Function: ativa
@@ -278,14 +324,18 @@ i3GEOF.etiqueta = {
 			temp = function(retorno){
 				i3GEOF.etiqueta.aguarde.visibility = "hidden";
 				i3GEO.atualiza(retorno);
+				i3GEO.php.listaItensTema(i3GEOF.etiqueta.montaListaItens,i3GEO.temaAtivo);
 			};
 			p = i3GEO.configura.locaplic+"/ferramentas/etiqueta/exec.php?g_sid="
 				+ i3GEO.configura.sid
 				+ "&funcao=ativaEtiquetas&tema="
 				+ i3GEO.temaAtivo
 				+ "&tips="+lista[0].toString(",")
-				+ "&itens="+lista[1].toString(",");
+				+ "&itens="+lista[1].toString(",")
+				+ "&itensdesc="+i3GEO.util.base64encode(lista[2].toString(","))
+				+ "&itenslink="+i3GEO.util.base64encode(lista[3].toString(","));
 			cp.set_response_type("JSON");
+			cp.set_transfer_mode('POST');
 			cp.call(p,"etiqueta",temp);
 		}catch(e){i3GEO.janela.tempoMsg("Erro: "+e);i3GEOF.etiqueta.aguarde.visibility = "hidden";}
 	},
 <p class='paragrafo'>
 	{{{selecionaItem}}}:<br>
-<div id='i3GEOetiquetalistai' class='digitar' style='text-align: left; left: 0px; top: 0px; 330 px; height: 80px; overflow: auto; display: block;'></div>
+<div id='i3GEOetiquetalistai' class='digitar' style='text-align: left; left: 0px; top: 0px; width:95%; height: 80px; overflow: auto; display: block;'></div>
 <br>
 <p class='paragrafo'>
 	<input id='i3GEOetiquetabotao1' size='35' type='button' value="'+$trad(" p14")+'" />
1	<p class='paragrafo'>	1	<p class='paragrafo'>
2	{{{selecionaItem}}}:<br>	2	{{{selecionaItem}}}:<br>
3	-<div id='i3GEOetiquetalistai' class='digitar' style='text-align: left; left: 0px; top: 0px; 330 px; height: 80px; overflow: auto; display: block;'></div>	3	+<div id='i3GEOetiquetalistai' class='digitar' style='text-align: left; left: 0px; top: 0px; width:95%; height: 80px; overflow: auto; display: block;'></div>
4	<br>	4	<br>
5	<p class='paragrafo'>	5	<p class='paragrafo'>
6	<input id='i3GEOetiquetabotao1' size='35' type='button' value="'+$trad(" p14")+'" />	6	<input id='i3GEOetiquetabotao1' size='35' type='button' value="'+$trad(" p14")+'" />