Correção de erros da ferramenta Tabela

Edmar Moretti
1 parent 0a98eed2
Showing 6 changed files with 52 additions and 32 deletions Show diff stats
admin/admin.db
classesphp/classe_atributos.php
ferramentas/tabela/dicionario.js
ferramentas/tabela/index.js
ferramentas/tabela/templateLista_mst.html
ferramentas/tabela/template_mst.html
@@ -449,6 +449,7 @@ class Atributos
 			$alias = $items;
 		}
 		$shapes = retornaShapesSelecionados($this->layer,$this->arquivo,$this->mapa,true);
+		//error_reporting(E_ALL);
 		$res_count = count($shapes);
 		$resultadoFinal[] = array("totalSelecionados"=>$res_count,"itens"=>$items,"alias"=>$alias);
 		$registros = array();
@@ -484,12 +485,18 @@ class Atributos
 				}
 				$classe = "";
 				if($dadosDaClasse == "sim"){
-					$indice = $this->layer->getClassIndex($shape);
-					$nome = $this->layer->getclass($indice)->name;
-					$classe = array(
-							"indice"=>$indice,
-							"nome"=>$nome
-					);
+					$indice = @$this->layer->getClassIndex($shape);
+					if($indice >= 0){
+						$classei = @$this->layer->getclass($indice);
+						$nome = $classei->name;
+						if($convC == true && $nome != ""){
+							$nome = $this->converte($nome);
+						}
+						$classe = array(
+								"indice"=>$indice,
+								"nome"=>$nome
+						);
+					}
 				}
 				$ext = $this->extensaoShape($shape);
 				$registros[] = array("indice"=>$indx,"valores"=>$valitem,"status"=>$chk,"classe"=>$classe,"ext"=>$ext);
@@ -554,6 +561,9 @@ class Atributos
 						else{
 							$nome = "";
 						}
+						if($convC == true && $nome != ""){
+							$nome = $this->converte($nome);
+						}
 						$classe = array(
 								"indice"=>$indice,
 								"nome"=>$nome
@@ -220,17 +220,17 @@ i3GEOF.tabela.dicionario = {
 		en : "",
 		es : ""
 	} ],
-	'selecionaTabela' : [ {
+	"selecionaTabela" : [ {
 		pt : "Escolha uma tabela",
 		en : "",
 		es : ""
 	} ],
-	'selecionaSegundaTabela' : [ {
+	"selecionaSegundaTabela" : [ {
 		pt : "Escolha uma segunda tabela",
 		en : "",
 		es : ""
 	} ],
-	'criaVinculo' : [ {
+	"criaVinculo" : [ {
 		pt : "Criar v&iacute;nculo",
 		en : "",
 		es : ""
@@ -244,5 +244,10 @@ i3GEOF.tabela.dicionario = {
 		pt : "Identificador da tabela",
 		en : "",
 		es : ""
+	} ],
+	'selUmReg' : [ {
+		pt : "Selecione pelo menos um registro",
+		en : "",
+		es : ""
 	} ]
 };
@@ -260,7 +260,7 @@ i3GEOF.tabela =
 					+ "</span></div>";
 				janela = i3GEO.janela.cria(
-					"570px",
+					"610px",
 					"400px",
 					"",
 					"",
@@ -911,8 +911,8 @@ i3GEOF.tabela =
 		ordenaColuna : function(coluna, cid, idjanela) {
 			i3GEOF.tabela.propJanelas[idjanela].aguarde.visibility = "visible";
 			try {
-				var tabela = $i(idjanela + "i3GEOtabelatabelai"), trs = tabela.getElementsByTagName("tr"), ntrs = trs.length, tds, nt, conta =
-					0, psort = [], t, psortfim, npsortfim, ins, p, e;
+				var tabela = $i(idjanela + "i3GEOtabelatabelai"), trs = tabela.getElementsByTagName("tr"),
+					ntrs = trs.length, tds, nt, conta = 0, psort = [], t, psortfim, npsortfim, ins, p, e;
 				// pega o indice correto
 				tds = coluna.parentNode.parentNode.getElementsByTagName("td");
 				nt = tds.length;
@@ -924,20 +924,21 @@ i3GEOF.tabela =
 				}
 				for (t = 0; t < ntrs; t++) {
 					if (t < ntrs) {
-						if (trs[t].childNodes[cid].innerHTML) {
-							if (trs[t].childNodes[cid].innerHTML !== "undefined") {
-								psort[conta] = trs[t].childNodes[cid].innerHTML + "+" + conta;
+						//if (trs[t].childNodes[cid].innerHTML) {
+							//if (trs[t].getElementsByTagName("td")[cid].innerHTML !== "undefined") {
+								psort[conta] = trs[t].getElementsByTagName("td")[cid].innerHTML + "@$" + conta;
 								conta = conta + 1;
-							}
-						}
+							//}
+						//}
 					}
 				}
+
 				// recosntroi a tabela
 				psortfim = psort.sort();
 				ins = "<table id=" + idjanela + "i3GEOtabelatabelai class=lista8 >";
 				npsortfim = psortfim.length;
 				for (p = 0; p < npsortfim; p++) {
-					e = psortfim[p].split("+")[1] * 1;
+					e = psortfim[p].split("@$")[1] * 1;
 					if (trs[e] !== undefined) {
 						ins += "<tr>" + trs[e].innerHTML + "</tr>";
 					}
@@ -1043,6 +1044,12 @@ i3GEOF.tabela =
 		 * Cria um novo tema contendo a sele&ccedil;&atilde;o existente
 		 */
 		criaNovoTema : function(idjanela) {
+			var camada = i3GEO.arvoreDeCamadas.pegaTema(i3GEOF.tabela.propJanelas[idjanela].tema);
+			if(camada.nsel == 0){
+				i3GEO.janela.tempoMsg($trad("selUmReg",i3GEOF.tabela.dicionario));
+				return;
+			}
+
 			if (i3GEOF.tabela.propJanelas[idjanela].aguarde.visibility === "visible") {
 				return;
 			}
@@ -35,7 +35,7 @@
 			</div>
 		</td>
 		<td>
-			<img class="{{classelegenda}}" title="{{{nomeClasse}}}" src="{{{imagemClasse}}}" />
+			<img class="{{classelegenda}}" style="margin:10px;" title="{{{nomeClasse}}}" src="{{{imagemClasse}}}" />
 		</td>
 		{{{colunas}}}
 	</tr>
@@ -33,21 +33,19 @@
 </div>
 <!-- Guia Propriedades -->
 <div id='{{{idjanela}}}i3GEOtabelaguia6obj' class="container-fluid">
-	<div class="checkbox text-left">
+	<div class="radio radio-primary condensed text-left">
 		<label>
-			<input id='{{{idjanela}}}i3GEOtabelatipolista' type="checkbox" onclick="i3GEOF.tabela.pegaRegistros('{{{idjanela}}}')">
-			<span class="checkbox-material noprint">
-				<span class="check"></span>
-			</span>
+			<input name="classOuSel" id='{{{idjanela}}}i3GEOtabelatipolista' type="radio" onclick="i3GEOF.tabela.pegaRegistros('{{{idjanela}}}')">
+			<span class="circle"></span>
+			<span class="check"></span>
 			{{{atuatab}}}
 		</label>
 	</div>
-	<div class="checkbox text-left">
+	<div class="radio radio-primary condensed text-left">
 		<label>
-			<input id='{{{idjanela}}}i3GEOtabelalegenda' type="checkbox" onclick="i3GEOF.tabela.pegaRegistros('{{{idjanela}}}')">
-			<span class="checkbox-material noprint">
-				<span class="check"></span>
-			</span>
+			<input name="classOuSel" id='{{{idjanela}}}i3GEOtabelalegenda' type="radio" onclick="i3GEOF.tabela.pegaRegistros('{{{idjanela}}}')">
+			<span class="circle"></span>
+			<span class="check"></span>
 			{{{colleg}}}
 		</label>
 	</div>
@@ -62,7 +60,7 @@
 	</div>
 </div>
 <!-- Registros da tabela -->
-<div id='{{{idjanela}}}i3GEOtabelaguia1obj' class='container-fluid customScrollBarXY'>
+<div id='{{{idjanela}}}i3GEOtabelaguia1obj' class='container-fluid '>
 	<div id='{{{idjanela}}}i3GEOFtabelaComboCabeca' class='form-group condensed' style='width: 450px'>
 		<span class="material-icons iconeComboTemas">playlist_add_check</span>
 	</div>
@@ -97,7 +95,7 @@
 	<div id='{{{idjanela}}}i3GEOtabelaregistros' style='top: 10px;'></div>
 </div>
 <!-- Estatisticas -->
-<div id='{{{idjanela}}}i3GEOtabelaguia3obj' style='display: none;' class='container-fluid customScrollBarXY'>
+<div id='{{{idjanela}}}i3GEOtabelaguia3obj' style='display: none;' class='container-fluid '>
 	<div class='form-group condensed'>
 		<label class="control-label">{{{itemcalc}}}</label>
 		<div id='{{{idjanela}}}i3GEOtabelaitensGuia3'></div>
@@ -115,7 +113,7 @@
 	<h5 class="alert alert-info">{{{paraqueas}}}</h5>
 </div>
 <!-- Relatorio -->
-<div id='{{{idjanela}}}i3GEOtabelaguia5obj' class='container-fluid customScrollBarXY'>
+<div id='{{{idjanela}}}i3GEOtabelaguia5obj' class='container-fluid '>
 	<div class='form-group condensed'>
 		<label>{{{itensrel}}}</label>
 		<div id='{{{idjanela}}}i3GEOtabelaitensrelatorio' style='overflow: auto; height: 120px; top: 10px;'></div>
	@@ -35,7 +35,7 @@		@@ -35,7 +35,7 @@
35	</div>	35	</div>
36	</td>	36	</td>
37	<td>	37	<td>
38	- <img class="{{classelegenda}}" title="{{{nomeClasse}}}" src="{{{imagemClasse}}}" />	38	+ <img class="{{classelegenda}}" style="margin:10px;" title="{{{nomeClasse}}}" src="{{{imagemClasse}}}" />
39	</td>	39	</td>
40	{{{colunas}}}	40	{{{colunas}}}
41	</tr>	41	</tr>