Conversão da ferramenta Dissolve para Bootstrap

Edmar Moretti
1 parent 2783d0ed
Showing 5 changed files with 54 additions and 36 deletions Show diff stats
classesphp/classe_analise.php
classesphp/funcoes_gerais.php
ferramentas/dissolve/dicionario.js
ferramentas/dissolve/index.js
ferramentas/dissolve/template_mst.html
@@ -2468,11 +2468,12 @@ class Analise {
 		if ($this->dbaseExiste == false) {
 			include_once dirname ( __FILE__ ) . "/../pacotes/phpxbase/api_conversion.php";
 		}
+		error_reporting(E_ALL);
 		$shapes = retornaShapesSelecionados ( $this->layer, $this->arquivo, $this->mapa );
 		$indices = array ();
 		foreach ( $shapes as $shape ) {
 			if ($item != "") {
-				$valor = $shape->values [$item];
+				$valor = "V" . $shape->values [$item];
 			} else {
 				$valor = "nenhum";
 			}
@@ -2480,18 +2481,20 @@ class Analise {
 				$indices [$valor] = array (
 						$shape
 				);
-			} else
-				$indices [$valor] = array_merge ( $indices [$valor], array (
-						$shape
-				) );
+			} else {
+				array_push ( $indices [$valor], $shape );
+			}
 		}
 		$dissolve = array ();
+
 		foreach ( $indices as $shapes ) {
 			foreach ( $shapes as $shape ) {
-				if ($item != "")
-					$valor = $shape->values [$item];
-				else
+				if ($item != ""){
+					$valor = "V".$shape->values [$item];
+				}
+				else{
 					$valor = "nenhum";
+				}
 				if (! isset ( $dissolve [$valor] )) {
 					$dissolve [$valor] = $shape;
 				} else {
@@ -2508,6 +2511,7 @@ class Analise {
 				}
 			}
 		}
+
 		//
 		// cria o novo shapefile
 		//
@@ -2561,11 +2561,9 @@ $a {string}
 */
 function echojson($a)
 {
-	//ob_clean();
-	//error_reporting(0);
-	ob_end_clean();
-	//if(extension_loaded('zlib'))
-	//{ob_start('ob_gzhandler');}
+	if(ob_get_contents ()){
+		ob_end_clean();
+	}
 	header("Content-type: text/html");
 	echo $a;
 	//if(extension_loaded('zlib'))
@@ -29,5 +29,10 @@ i3GEOF.dissolve.dicionario = {
 		pt : "Erro. A opera&ccedil;&atilde;o demorou muito.",
 		en : "",
 		es : "Error. La operaci&oacute;n demoro mucho"
+	} ],
+	'escolhaTema' : [ {
+		pt : "Escolha um tema",
+		en : "",
+		es : ""
 	} ]
 };
 \ No newline at end of file
@@ -110,7 +110,7 @@ i3GEOF.dissolve = {
 		};
 		janela = i3GEO.janela.cria(
 			"400px",
-			"160px",
+			"250px",
 			"",
 			"",
 			"",
@@ -148,17 +148,11 @@ i3GEOF.dissolve = {
 		i3GEOF.dissolve.comboTemasSel();
 	},
 	t2: function(){
-
 		i3GEO.util.proximoAnterior("i3GEOF.dissolve.t1()","i3GEOF.dissolve.t3()","","i3GEOF.dissolve.t2","i3GEOdissolveresultado",true,"i3GEOF.dissolve_rodape");
 		i3GEOF.dissolve.comboItem();
 	},
 	t3: function(){
 		i3GEO.util.proximoAnterior("i3GEOF.dissolve.t2()","","","i3GEOF.dissolve.t3","i3GEOdissolveresultado",true,"i3GEOF.dissolve_rodape");
-		var b = new YAHOO.widget.Button(
-			"i3GEOdissolvebotao1",
-			{onclick:{fn: i3GEOF.dissolve.criadissolve}}
-		);
-		b.addClass("rodar");
 	},
 	/*
 	Function: criadissolve
@@ -170,6 +164,10 @@ i3GEOF.dissolve = {
 	<DISSOLVEPOLIGONO>
 	*/
 	criadissolve: function(){
+		if($i("i3GEOdissolvetemasComSel").value == ""){
+			i3GEO.janela.tempoMsg($trad("escolhaTema",i3GEOF.dissolve.dicionario));
+			return;
+		}
 		try{
 			if(i3GEOF.dissolve.aguarde.visibility === "visible")
 			{return;}
@@ -222,7 +220,10 @@ i3GEOF.dissolve = {
 			"",
 			false,
 			"poligonosSelecionados",
-			" "
+			" ",
+			false,
+			true,
+			"form-control comboTema"
 		);
 	},
 	/*
@@ -243,7 +244,11 @@ i3GEOF.dissolve = {
 				$i("i3GEOdissolveDivItem").innerHTML = retorno.dados;
 				$i("i3GEOdissolveDivItem").style.display = "block";
 			},
-			"i3GEOdissolveDivItem"
+			"i3GEOdissolveDivItem",
+			"",
+			"",
+			"",
+			"form-control comboTema"
 		);
 	}
 };
 \ No newline at end of file
-<div style='padding: 5px; background-color: #F2F2F2; top: 0px; left: 0px; display: block; width: 98%;' id='i3GEOdissolveresultado'>
+<div class='container-fluid' id='i3GEOdissolveresultado'>
 	<div id='i3GEOFgradeDePontost0'>
-		<img class='i3GeoExemploImg'
-			src='{{{locaplic}}}/ferramentas/dissolve/exemplo.png' />
-		<p class='paragrafo'>{{{descricao}}}
+		<img class="img-rounded pull-left" style="margin: 5px; width: 40px;" src='{{{locaplic}}}/ferramentas/dissolve/exemplo.png' />
+		<h5>{{{descricao}}}</h5>
 	</div>
 	<div id='i3GEOF.dissolve.t1'>
-		<p class='paragrafo'>{{{selecionaTema}}}</p>
-		<div id='i3GEOdissolveSelTemas' class='styled-select'></div>
+		<div style="width: 100%;" class='form-group label-fixed condensed'>
+			<label class="control-label" for="">{{{selecionaTema}}}</label>
+			<div style="width: 100%;" class="input-group">
+				<div id='i3GEOdissolveSelTemas'></div>
+			</div>
+		</div>
 	</div>
 	<div id='i3GEOF.dissolve.t2'>
-		<p class='paragrafo'>{{{selecionaItem}}}</p>
-		<div class='styled-select' id='i3GEOdissolveDivItem'>{{{aguarde}}}</div>
+		<div style="width: 100%;" class='form-group label-fixed condensed'>
+			<label class="control-label" for="">{{{selecionaItem}}}</label>
+			<div style="width: 100%;" class="input-group">
+				<div id='i3GEOdissolveDivItem'></div>
+			</div>
+		</div>
 	</div>
 	<div id='i3GEOF.dissolve.t3'>
-		<p class='paragrafo'>
-			{{{adicionaTema}}} <br>
-			<br>
-			<input id='i3GEOdissolvebotao1' type='button' value='{{{dissolve}}}' />
+		<h5>{{{adicionaTema}}}</h5>
+		<button onclick="i3GEOF.dissolve.criadissolve()" class='btn btn-primary btn-sm btn-raised'>{{{dissolve}}}</button>
+		<h5 id='i3GEOdissolvefim'></h5>
+
 	</div>
-</div>
-<div style='top: 10px; left: 0px; display: block; width: 98%; color: red' id='i3GEOdissolvefim'></div>
 \ No newline at end of file
+</div>
 \ No newline at end of file