diff --git a/admin/admin.db b/admin/admin.db index dcf837d..45c6389 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/html/admin.css b/admin/html/admin.css index f0ecf83..63c7fcf 100644 --- a/admin/html/admin.css +++ b/admin/html/admin.css @@ -6,8 +6,8 @@ font-size: 10pt; } .yui-navset { - background: url("../../pacotes/yui290/build/assets/skins/sam/sprite.png") repeat-x scroll 0 0 #D8D8D8; - z-index: 3000; + background: url("../../pacotes/yui290/build/assets/skins/sam/sprite.png") repeat-x scroll 0 0 #D8D8D8; + z-index: 3000; } .yui-resizepanel .resizehandle { position: absolute; @@ -25,7 +25,7 @@ cursor: se-resize; font-size:1em; } .yui-skin-sam .yui-button { - margin: 0.25em; + margin: 0.25em; } .ajuda_usuario { @@ -242,4 +242,4 @@ fieldset { .cabecalhoGeral { margin: 0px; -} \ No newline at end of file +} diff --git a/admin/js/core.js b/admin/js/core.js index d1bfe6f..ee87d7e 100644 --- a/admin/js/core.js +++ b/admin/js/core.js @@ -1675,6 +1675,7 @@ function core_listaDeLetras(onde,nomeFuncao){ "../../pacotes/yui290/build/json/json-min.js", "../../pacotes/yui290/build/menu/menu-min.js", "../../pacotes/yui290/build/editor/editor-min.js", + "../../pacotes/yui290/build/resize/resize-min.js", "../../classesjs/compactados/classe_util_compacto.js", "../../classesjs/compactados/classe_login_compacto.js", "../../classesjs/compactados/classe_janela_compacto.js", @@ -1689,12 +1690,13 @@ function core_listaDeLetras(onde,nomeFuncao){ cssfiles =new Array( "../../pacotes/yui290/build/tabview/assets/skins/sam/tabview.css", "../../pacotes/yui290/build/button/assets/skins/sam/button.css", - "../html/admin.css", "../../pacotes/yui290/build/fonts/fonts-min.css", "../../pacotes/yui290/build/datatable/assets/skins/sam/datatable.css", "../../pacotes/yui290/build/container/assets/skins/sam/container.css", "../../pacotes/yui290/build/treeview/assets/skins/sam/treeview.css", - "../../pacotes/yui290/build/editor/assets/skins/sam/editor.css" + "../../pacotes/yui290/build/editor/assets/skins/sam/editor.css", + "../../pacotes/yui290/build/resize/assets/skins/sam/resize.css", + "../html/admin.css" ); } // diff --git a/admin/php/classe_metaestat.php b/admin/php/classe_metaestat.php index 0c3235d..52c1c74 100755 --- a/admin/php/classe_metaestat.php +++ b/admin/php/classe_metaestat.php @@ -372,7 +372,7 @@ class Metaestat{ $vis = $dadosgeo["colunasvisiveis"]; if(!empty($vis) && $suportaWMST == false){ - $vis = $vis.",".$dados["colunaidunico"]; + $vis = $vis.",".$dadosgeo["identificador"]; $vis = str_replace(" ",",",$vis); $vis = str_replace(",,",",",$vis); $vis = str_replace(";",",",$vis); @@ -381,7 +381,7 @@ class Metaestat{ $colunasSemGeo = array_unique($colunasSemGeo); if($dadosgeo["apelidos"] != ""){ - $alias = "Valor,".$dadosgeo["apelidos"].",".$dados["colunaidunico"]; + $alias = "Valor,".$dadosgeo["apelidos"].",".$dadosgeo["identificador"]; $alias = mb_convert_encoding($alias,"ISO-8859-1",mb_detect_encoding($alias)); $alias = str_replace(";",",",$alias); $alias = str_replace(",,",",",$alias); @@ -475,9 +475,9 @@ class Metaestat{ //sql para o mapserver $sqlgeo = str_replace("__SQLDADOS__",$sqlDadosMedidaVariavel,$sqlIntermediario); $colunasComGeo = $colunasSemGeo; - $colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as the_geom /*SG*/"; + $colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as ".$colunageo." /*SG*/"; $sqlgeo = str_replace("__COLUNASSEMGEO__",implode(",",$colunasComGeo),$sqlgeo); - $sqlgeo = $colunageo." from /*SE*/(".$sqlgeo.")/*SE*/ as foo using unique ".$dados["colunaidunico"]." using srid=".$dadosgeo["srid"]; + $sqlgeo = $colunageo." from /*SE*/(".$sqlgeo.")/*SE*/ as foo using unique ".$dadosgeo["identificador"]." using srid=".$dadosgeo["srid"]; //o SQL com os dados contem um filtro ou nao? $contemfiltro = false; @@ -2149,7 +2149,7 @@ class Metaestat{ $sql = "ALTER TABLE ".$nome_esquema.".".$nome_tabela." RENAME COLUMN $nome_coluna TO ".$novonome_coluna; $res = $dbh->query($sql,PDO::FETCH_ASSOC); - + $coluna = $this->execSQLDB($codigo_estat_conexao,"SELECT column_name FROM information_schema.columns where table_name = '$novonome_tabela' and table_schema = '$nome_esquema' and column_name = '$novonome_coluna'"); if(count($coluna) > 0){ $sql = "UPDATE i3geoestat_medida_variavel SET colunavalor = '$novonome_coluna' WHERE esquemadb = '$nome_esquema' and tabela = '$nome_tabela' and colunavalor = '$nome_coluna'"; diff --git a/ferramentas/loginusuario/index.js b/ferramentas/loginusuario/index.js index 9d0f993..2815b57 100644 --- a/ferramentas/loginusuario/index.js +++ b/ferramentas/loginusuario/index.js @@ -147,7 +147,9 @@ i3GEOF.loginusuario = { false, "hd", cabecalho, - minimiza + minimiza, + "", + false ); divid = janela[2].id; janela[0].cfg.setProperty("constraintoviewport",false); -- libgit2 0.21.2