Commit 2c5323d26287192902d55ab23b87bb06997020b0
1 parent
0872cf07
Exists in
master
and in
7 other branches
$1
Showing
5 changed files
with
16 additions
and
12 deletions
Show diff stats
admin/admin.db
No preview for this file type
admin/html/admin.css
@@ -6,8 +6,8 @@ | @@ -6,8 +6,8 @@ | ||
6 | font-size: 10pt; | 6 | font-size: 10pt; |
7 | } | 7 | } |
8 | .yui-navset { | 8 | .yui-navset { |
9 | - background: url("../../pacotes/yui290/build/assets/skins/sam/sprite.png") repeat-x scroll 0 0 #D8D8D8; | ||
10 | - z-index: 3000; | 9 | + background: url("../../pacotes/yui290/build/assets/skins/sam/sprite.png") repeat-x scroll 0 0 #D8D8D8; |
10 | + z-index: 3000; | ||
11 | } | 11 | } |
12 | .yui-resizepanel .resizehandle { | 12 | .yui-resizepanel .resizehandle { |
13 | position: absolute; | 13 | position: absolute; |
@@ -25,7 +25,7 @@ cursor: se-resize; | @@ -25,7 +25,7 @@ cursor: se-resize; | ||
25 | font-size:1em; | 25 | font-size:1em; |
26 | } | 26 | } |
27 | .yui-skin-sam .yui-button { | 27 | .yui-skin-sam .yui-button { |
28 | - margin: 0.25em; | 28 | + margin: 0.25em; |
29 | } | 29 | } |
30 | .ajuda_usuario | 30 | .ajuda_usuario |
31 | { | 31 | { |
@@ -242,4 +242,4 @@ fieldset { | @@ -242,4 +242,4 @@ fieldset { | ||
242 | 242 | ||
243 | .cabecalhoGeral { | 243 | .cabecalhoGeral { |
244 | margin: 0px; | 244 | margin: 0px; |
245 | -} | ||
246 | \ No newline at end of file | 245 | \ No newline at end of file |
246 | +} |
admin/js/core.js
@@ -1675,6 +1675,7 @@ function core_listaDeLetras(onde,nomeFuncao){ | @@ -1675,6 +1675,7 @@ function core_listaDeLetras(onde,nomeFuncao){ | ||
1675 | "../../pacotes/yui290/build/json/json-min.js", | 1675 | "../../pacotes/yui290/build/json/json-min.js", |
1676 | "../../pacotes/yui290/build/menu/menu-min.js", | 1676 | "../../pacotes/yui290/build/menu/menu-min.js", |
1677 | "../../pacotes/yui290/build/editor/editor-min.js", | 1677 | "../../pacotes/yui290/build/editor/editor-min.js", |
1678 | + "../../pacotes/yui290/build/resize/resize-min.js", | ||
1678 | "../../classesjs/compactados/classe_util_compacto.js", | 1679 | "../../classesjs/compactados/classe_util_compacto.js", |
1679 | "../../classesjs/compactados/classe_login_compacto.js", | 1680 | "../../classesjs/compactados/classe_login_compacto.js", |
1680 | "../../classesjs/compactados/classe_janela_compacto.js", | 1681 | "../../classesjs/compactados/classe_janela_compacto.js", |
@@ -1689,12 +1690,13 @@ function core_listaDeLetras(onde,nomeFuncao){ | @@ -1689,12 +1690,13 @@ function core_listaDeLetras(onde,nomeFuncao){ | ||
1689 | cssfiles =new Array( | 1690 | cssfiles =new Array( |
1690 | "../../pacotes/yui290/build/tabview/assets/skins/sam/tabview.css", | 1691 | "../../pacotes/yui290/build/tabview/assets/skins/sam/tabview.css", |
1691 | "../../pacotes/yui290/build/button/assets/skins/sam/button.css", | 1692 | "../../pacotes/yui290/build/button/assets/skins/sam/button.css", |
1692 | - "../html/admin.css", | ||
1693 | "../../pacotes/yui290/build/fonts/fonts-min.css", | 1693 | "../../pacotes/yui290/build/fonts/fonts-min.css", |
1694 | "../../pacotes/yui290/build/datatable/assets/skins/sam/datatable.css", | 1694 | "../../pacotes/yui290/build/datatable/assets/skins/sam/datatable.css", |
1695 | "../../pacotes/yui290/build/container/assets/skins/sam/container.css", | 1695 | "../../pacotes/yui290/build/container/assets/skins/sam/container.css", |
1696 | "../../pacotes/yui290/build/treeview/assets/skins/sam/treeview.css", | 1696 | "../../pacotes/yui290/build/treeview/assets/skins/sam/treeview.css", |
1697 | - "../../pacotes/yui290/build/editor/assets/skins/sam/editor.css" | 1697 | + "../../pacotes/yui290/build/editor/assets/skins/sam/editor.css", |
1698 | + "../../pacotes/yui290/build/resize/assets/skins/sam/resize.css", | ||
1699 | + "../html/admin.css" | ||
1698 | ); | 1700 | ); |
1699 | } | 1701 | } |
1700 | // | 1702 | // |
admin/php/classe_metaestat.php
@@ -372,7 +372,7 @@ class Metaestat{ | @@ -372,7 +372,7 @@ class Metaestat{ | ||
372 | 372 | ||
373 | $vis = $dadosgeo["colunasvisiveis"]; | 373 | $vis = $dadosgeo["colunasvisiveis"]; |
374 | if(!empty($vis) && $suportaWMST == false){ | 374 | if(!empty($vis) && $suportaWMST == false){ |
375 | - $vis = $vis.",".$dados["colunaidunico"]; | 375 | + $vis = $vis.",".$dadosgeo["identificador"]; |
376 | $vis = str_replace(" ",",",$vis); | 376 | $vis = str_replace(" ",",",$vis); |
377 | $vis = str_replace(",,",",",$vis); | 377 | $vis = str_replace(",,",",",$vis); |
378 | $vis = str_replace(";",",",$vis); | 378 | $vis = str_replace(";",",",$vis); |
@@ -381,7 +381,7 @@ class Metaestat{ | @@ -381,7 +381,7 @@ class Metaestat{ | ||
381 | $colunasSemGeo = array_unique($colunasSemGeo); | 381 | $colunasSemGeo = array_unique($colunasSemGeo); |
382 | 382 | ||
383 | if($dadosgeo["apelidos"] != ""){ | 383 | if($dadosgeo["apelidos"] != ""){ |
384 | - $alias = "Valor,".$dadosgeo["apelidos"].",".$dados["colunaidunico"]; | 384 | + $alias = "Valor,".$dadosgeo["apelidos"].",".$dadosgeo["identificador"]; |
385 | $alias = mb_convert_encoding($alias,"ISO-8859-1",mb_detect_encoding($alias)); | 385 | $alias = mb_convert_encoding($alias,"ISO-8859-1",mb_detect_encoding($alias)); |
386 | $alias = str_replace(";",",",$alias); | 386 | $alias = str_replace(";",",",$alias); |
387 | $alias = str_replace(",,",",",$alias); | 387 | $alias = str_replace(",,",",",$alias); |
@@ -475,9 +475,9 @@ class Metaestat{ | @@ -475,9 +475,9 @@ class Metaestat{ | ||
475 | //sql para o mapserver | 475 | //sql para o mapserver |
476 | $sqlgeo = str_replace("__SQLDADOS__",$sqlDadosMedidaVariavel,$sqlIntermediario); | 476 | $sqlgeo = str_replace("__SQLDADOS__",$sqlDadosMedidaVariavel,$sqlIntermediario); |
477 | $colunasComGeo = $colunasSemGeo; | 477 | $colunasComGeo = $colunasSemGeo; |
478 | - $colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as the_geom /*SG*/"; | 478 | + $colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as ".$colunageo." /*SG*/"; |
479 | $sqlgeo = str_replace("__COLUNASSEMGEO__",implode(",",$colunasComGeo),$sqlgeo); | 479 | $sqlgeo = str_replace("__COLUNASSEMGEO__",implode(",",$colunasComGeo),$sqlgeo); |
480 | - $sqlgeo = $colunageo." from /*SE*/(".$sqlgeo.")/*SE*/ as foo using unique ".$dados["colunaidunico"]." using srid=".$dadosgeo["srid"]; | 480 | + $sqlgeo = $colunageo." from /*SE*/(".$sqlgeo.")/*SE*/ as foo using unique ".$dadosgeo["identificador"]." using srid=".$dadosgeo["srid"]; |
481 | 481 | ||
482 | //o SQL com os dados contem um filtro ou nao? | 482 | //o SQL com os dados contem um filtro ou nao? |
483 | $contemfiltro = false; | 483 | $contemfiltro = false; |
@@ -2149,7 +2149,7 @@ class Metaestat{ | @@ -2149,7 +2149,7 @@ class Metaestat{ | ||
2149 | 2149 | ||
2150 | $sql = "ALTER TABLE ".$nome_esquema.".".$nome_tabela." RENAME COLUMN $nome_coluna TO ".$novonome_coluna; | 2150 | $sql = "ALTER TABLE ".$nome_esquema.".".$nome_tabela." RENAME COLUMN $nome_coluna TO ".$novonome_coluna; |
2151 | $res = $dbh->query($sql,PDO::FETCH_ASSOC); | 2151 | $res = $dbh->query($sql,PDO::FETCH_ASSOC); |
2152 | - | 2152 | + |
2153 | $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'"); | 2153 | $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'"); |
2154 | if(count($coluna) > 0){ | 2154 | if(count($coluna) > 0){ |
2155 | $sql = "UPDATE i3geoestat_medida_variavel SET colunavalor = '$novonome_coluna' WHERE esquemadb = '$nome_esquema' and tabela = '$nome_tabela' and colunavalor = '$nome_coluna'"; | 2155 | $sql = "UPDATE i3geoestat_medida_variavel SET colunavalor = '$novonome_coluna' WHERE esquemadb = '$nome_esquema' and tabela = '$nome_tabela' and colunavalor = '$nome_coluna'"; |
ferramentas/loginusuario/index.js
@@ -147,7 +147,9 @@ i3GEOF.loginusuario = { | @@ -147,7 +147,9 @@ i3GEOF.loginusuario = { | ||
147 | false, | 147 | false, |
148 | "hd", | 148 | "hd", |
149 | cabecalho, | 149 | cabecalho, |
150 | - minimiza | 150 | + minimiza, |
151 | + "", | ||
152 | + false | ||
151 | ); | 153 | ); |
152 | divid = janela[2].id; | 154 | divid = janela[2].id; |
153 | janela[0].cfg.setProperty("constraintoviewport",false); | 155 | janela[0].cfg.setProperty("constraintoviewport",false); |