Download as
Browse Code »

Commit 0d51c6de71d55845155399137e595a698731b5b2

Authored by Murilo Caixêta
2 parents a00d8342 8b31899b
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Merge branch 'master' of softwarepublico.gov.br:i3geo/i3geo

Showing 2 changed files with 16 additions and 12 deletions   Show diff stats
classesphp/classe_mapa.php
  Diff comments   View file @0d51c6d
... ... @@ -276,7 +276,8 @@ class Mapa
276 276 "legendaimg",
277 277 "offsite",
278 278 "numclasses",
279   - "id_medida_variavel"
  279 + "id_medida_variavel",
  280 + "codigo_tipo_regiao"
280 281 );
281 282 foreach ($this->layers as $oLayer){
282 283 $sel = "nao";
... ... @@ -512,7 +513,8 @@ class Mapa
512 513 $oLayer->getmetadata("legendaimg"),
513 514 $oLayer->offsite->red.",".$oLayer->offsite->green.",".$oLayer->offsite->blue,
514 515 $oLayer->numclasses,
515   - $oLayer->getmetadata("METAESTAT_ID_MEDIDA_VARIAVEL")
  516 + $oLayer->getmetadata("METAESTAT_ID_MEDIDA_VARIAVEL"),
  517 + $oLayer->getmetadata("METAESTAT_CODIGO_TIPO_REGIAO")
516 518 );
517 519 }
518 520 }
... ...
classesphp/classe_metaestatinfo.php
  Diff comments   View file @0d51c6d
... ... @@ -327,13 +327,13 @@ class MetaestatInfo{
327 327 if($suportaWMST == true && $direto == false){
328 328 $sqlDadosMedidaVariavel = "SELECT $sqlWMST as dimtempo,".$dados["colunaidgeo"]." AS cod_regiao,".$nomevalorcalculado." AS valorcalculado FROM ".$dados["esquemadb"].".".$dados["tabela"];
329 329 }
330   - if(!empty ($filtro) && $direto == false){
  330 + if(!empty ($filtro)){
331 331 $sqlDadosMedidaVariavel .= " WHERE ".$filtro . " AND ".$nomevalorcalculado." IS NOT NULL ";
332 332 }
333 333 else{
334 334 $sqlDadosMedidaVariavel .= " WHERE ".$nomevalorcalculado." IS NOT NULL ";
335 335 }
336   - if($suportaWMST != true && $direto == false){
  336 + if($suportaWMST != true && $direto == false && $tipoconta != ""){
337 337 $sqlDadosMedidaVariavel .= " /*FA*//*FA*/ /*FAT*//*FAT*/ GROUP BY cod_regiao ";
338 338 }
339 339 $sqlagrupamento = "";
... ... @@ -570,13 +570,15 @@ class MetaestatInfo{
570 570 $expressao[] = "([".$item."]>".($calc["quartil3"]).")";
571 571 $titulo[] = "Quartil 4: >".$calc["quartil3"];
572 572 }
573   - $classes[] = array(
574   - "expressao"=>"([".$item."]= 0)",
575   - "titulo"=>"0",
576   - "verde"=>100,
577   - "vermelho"=>100,
578   - "azul"=>100
579   - );
  573 + if($calc["quartil1"] > 0){
  574 + $classes[] = array(
  575 + "expressao"=>"([".$item."] = 0)",
  576 + "titulo"=>"0",
  577 + "verde"=>100,
  578 + "vermelho"=>100,
  579 + "azul"=>100
  580 + );
  581 + }
580 582 for ($i=0;$i < count($expressao);++$i){
581 583 $classes[] = array(
582 584 "expressao"=>$expressao[$i],
... ... @@ -2079,4 +2081,4 @@ class MetaestatInfo{
2079 2081 }
2080 2082 }
2081 2083 }
2082 2084 -?>
  2085 +?>
2083 2086 \ No newline at end of file
... ...