Commit fc7d47b67b9912fbd42906a18f352552f6e6fb5d
1 parent
2ed28842
Exists in
master
and in
7 other branches
--no commit message
Showing
14 changed files
with
1404 additions
and
1276 deletions
Show diff stats
admin/admin.db
No preview for this file type
admin/php/admin.php
@@ -33,9 +33,7 @@ Arquivo: | @@ -33,9 +33,7 @@ Arquivo: | ||
33 | 33 | ||
34 | i3geo/admin/php/admin.php | 34 | i3geo/admin/php/admin.php |
35 | */ | 35 | */ |
36 | - | ||
37 | -if(!isset($locaplic)) | ||
38 | -{ | 36 | +if(!isset($locaplic)){ |
39 | $locaplic = ""; | 37 | $locaplic = ""; |
40 | include(__DIR__."/../../ms_configura.php"); | 38 | include(__DIR__."/../../ms_configura.php"); |
41 | } | 39 | } |
@@ -44,6 +42,7 @@ if(!file_exists($dir_tmp)){ | @@ -44,6 +42,7 @@ if(!file_exists($dir_tmp)){ | ||
44 | } | 42 | } |
45 | include_once($locaplic."/classesphp/pega_variaveis.php"); | 43 | include_once($locaplic."/classesphp/pega_variaveis.php"); |
46 | error_reporting(0); | 44 | error_reporting(0); |
45 | + | ||
47 | // | 46 | // |
48 | //carrega o phpmapscript | 47 | //carrega o phpmapscript |
49 | // | 48 | // |
admin/php/criabanco.php
@@ -46,16 +46,14 @@ | @@ -46,16 +46,14 @@ | ||
46 | 46 | ||
47 | i3geo/admin/php/criabanco.php | 47 | i3geo/admin/php/criabanco.php |
48 | */ | 48 | */ |
49 | - | ||
50 | /** | 49 | /** |
51 | * | 50 | * |
52 | * TODO verificar se as tabelas estao corretas em funcao do sistema de administracao e incluir o login e senha | 51 | * TODO verificar se as tabelas estao corretas em funcao do sistema de administracao e incluir o login e senha |
53 | */ | 52 | */ |
54 | $funcao = ""; | 53 | $funcao = ""; |
55 | - include_once("admin.php"); | 54 | + //echo __DIR__; |
55 | + include("admin.php"); | ||
56 | error_reporting(E_ALL); | 56 | error_reporting(E_ALL); |
57 | - | ||
58 | - | ||
59 | $tabelas = array( | 57 | $tabelas = array( |
60 | "CREATE TABLE ".$esquemaadmin."i3geoadmin_grupos (desc_grupo TEXT, id_grupo INTEGER PRIMARY KEY, nome_grupo TEXT, it TEXT, es TEXT, en TEXT)", | 58 | "CREATE TABLE ".$esquemaadmin."i3geoadmin_grupos (desc_grupo TEXT, id_grupo INTEGER PRIMARY KEY, nome_grupo TEXT, it TEXT, es TEXT, en TEXT)", |
61 | "CREATE TABLE ".$esquemaadmin."i3geoadmin_sistemasf (abrir_funcao TEXT, h_funcao NUMERIC, id_funcao INTEGER PRIMARY KEY, id_sistema NUMERIC, nome_funcao TEXT, perfil_funcao TEXT, w_funcao NUMERIC)", | 59 | "CREATE TABLE ".$esquemaadmin."i3geoadmin_sistemasf (abrir_funcao TEXT, h_funcao NUMERIC, id_funcao INTEGER PRIMARY KEY, id_sistema NUMERIC, nome_funcao TEXT, perfil_funcao TEXT, w_funcao NUMERIC)", |
@@ -82,14 +80,9 @@ | @@ -82,14 +80,9 @@ | ||
82 | "CREATE TABLE ".$esquemaadmin."i3geousr_operacoes (id_operacao INTEGER PRIMARY KEY, codigo TEXT, descricao TEXT)", | 80 | "CREATE TABLE ".$esquemaadmin."i3geousr_operacoes (id_operacao INTEGER PRIMARY KEY, codigo TEXT, descricao TEXT)", |
83 | "CREATE TABLE ".$esquemaadmin."i3geousr_operacoespapeis (id_operacao NUMERIC, id_papel NUMERIC)" | 81 | "CREATE TABLE ".$esquemaadmin."i3geousr_operacoespapeis (id_operacao NUMERIC, id_papel NUMERIC)" |
84 | ); | 82 | ); |
85 | - if($conexaoadmin == "") | ||
86 | - { | ||
87 | - if(file_exists("../../admin/admin.db")) | ||
88 | - { | ||
89 | - echo "Arquivo admin/admin.db ja existe. Vc deve apagá-lo para poder criá-lo novamente";exit; | ||
90 | - } | 83 | + if($conexaoadmin == ""){ |
91 | if(empty($_POST["senha"]) || empty($_POST["usuario"])){ | 84 | if(empty($_POST["senha"]) || empty($_POST["usuario"])){ |
92 | - formularioLoginMaster("criabanco.php"); | 85 | + criabancoformularioLoginMaster("criabanco.php"); |
93 | exit; | 86 | exit; |
94 | } | 87 | } |
95 | else{ | 88 | else{ |
@@ -99,80 +92,92 @@ | @@ -99,80 +92,92 @@ | ||
99 | exit; | 92 | exit; |
100 | } | 93 | } |
101 | } | 94 | } |
102 | - if(function_exists("sqlite_open")){ | ||
103 | - $banco = sqlite_open("../../admin/admin.db",0666); | ||
104 | - $banco = null; | ||
105 | - $dbhw = new PDO('sqlite:../../admin/admin.db'); | 95 | + if(file_exists("../../admin/admin.db")) { |
96 | + echo "<br>Arquivo admin/admin.db ja existe. Vc deve apagá-lo para poder criá-lo novamente caso precise"; | ||
106 | } | 97 | } |
107 | else{ | 98 | else{ |
108 | - echo "A função de criação do banco sqlite não existe no PHP. Vc pode usar o arquivo i3geo/admin/adminvazio.db e renomeá-lo para admin.db."; | ||
109 | - exit; | 99 | + if(function_exists("sqlite_open")){ |
100 | + //cria o banco de dados de administracao | ||
101 | + $banco = sqlite_open("../../admin/admin.db",0666); | ||
102 | + $banco = null; | ||
103 | + $dbhw = new PDO('sqlite:../../admin/admin.db'); | ||
104 | + } | ||
105 | + else{ | ||
106 | + //TODO esse arquivo vazio existe mesmo? | ||
107 | + echo "<br>A função de criação do banco sqlite não existe no PHP. Vc pode usar o arquivo i3geo/admin/adminvazio.db e renomeá-lo para admin.db."; | ||
108 | + } | ||
109 | + } | ||
110 | + if(file_exists("../../admin/metaestat.db")) { | ||
111 | + echo "<br>Arquivo admin/metaestat.db ja existe. Vc deve apagá-lo para poder criá-lo novamente caso precise"; | ||
112 | + } | ||
113 | + else{ | ||
114 | + //TODO nao funciona | ||
115 | + //if(function_exists("SQLite3")){ | ||
116 | + //cria o banco de dados de metadados estatisticos | ||
117 | + //$banco = new SQLite3("../../admin/metaestat.db",SQLITE3_OPEN_CREATE); | ||
118 | + //$banco->close(); | ||
119 | + //} | ||
120 | + //else{ | ||
121 | + //echo "<br>A função de criação do banco sqlite3 não existe no PHP. Não foi possível criar o bando para o sistema de metadados."; | ||
122 | + //exit; | ||
123 | + //} | ||
110 | } | 124 | } |
111 | } | 125 | } |
112 | - else | ||
113 | - { | 126 | + else{ |
114 | include($conexaoadmin); | 127 | include($conexaoadmin); |
115 | } | 128 | } |
116 | - foreach($tabelas as $tabela) | ||
117 | - { | ||
118 | - if($dbhw->getAttribute(PDO::ATTR_DRIVER_NAME) == "pgsql") | ||
119 | - { | 129 | + if(empty($dbhw)){ |
130 | + echo "<br>Fim"; | ||
131 | + } | ||
132 | + foreach($tabelas as $tabela){ | ||
133 | + if($dbhw->getAttribute(PDO::ATTR_DRIVER_NAME) == "pgsql"){ | ||
120 | $tabela = str_replace("INTEGER PRIMARY KEY","SERIAL PRIMARY KEY NOT NULL",$tabela); | 134 | $tabela = str_replace("INTEGER PRIMARY KEY","SERIAL PRIMARY KEY NOT NULL",$tabela); |
121 | } | 135 | } |
122 | //echo $tabela."<br>"; | 136 | //echo $tabela."<br>"; |
123 | $q = $dbhw->query($tabela); | 137 | $q = $dbhw->query($tabela); |
124 | } | 138 | } |
125 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem executar qualquer tarefa, inclusive cadastrar novos administradores',1,'admin')"); | ||
126 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem criar/editar qualquer tema (mapfile) mas nao podem editar a arvore do catalogo de temas',2,'editores')"); | ||
127 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem alterar a arvore do catalogo e dos atlas',3,'publicadores')"); | ||
128 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')"); | ||
129 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')"); | ||
130 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)"); | ||
131 | - | ||
132 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(1,'admin/html/editormapfile','editor de mapfiles do sistema de administracao')"); | ||
133 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(2,'admin/html/operacoes','abre o editor de operacoes')"); | ||
134 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(3,'teste/','teste')"); | ||
135 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(4,'admin/html/arvore','edicao da arvore do catalogo de temas')"); | ||
136 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(5,'admin/html/menus','edicao da lista de menus')"); | ||
137 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(6,'admin/html/ogcws','edicao das preferencias do servico WMS')"); | ||
138 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(7,'admin/html/atlas','edicao de atlas')"); | ||
139 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(8,'admin/html/identifica','lista de sistemas incluidos na ferramenta de identificacao')"); | ||
140 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(9,'admin/html/incluimap','adapta mapfiles antigos para versoes novas do Mapserver')"); | ||
141 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(10,'admin/html/mapas','lista de links para mapas')"); | ||
142 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(11,'admin/html/perfis','lista controlada de perfis')"); | ||
143 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(12,'admin/html/sistemas','lista de sistemas complementares que sao mostrados no catalogo')"); | ||
144 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(13,'admin/html/subirshapefile','upload de shapefile para uma pasta especifica no servidor')"); | ||
145 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(14,'admin/html/tags','edicao da lista controlada de tags')"); | ||
146 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(15,'admin/html/webservices','cadastro de links para webservices')"); | ||
147 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,2)"); | ||
148 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,3)"); | ||
149 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(4,3)"); | ||
150 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(5,3)"); | ||
151 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(7,3)"); | ||
152 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(10,3)"); | ||
153 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,2)"); | ||
154 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)"); | ||
155 | - $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)"); | ||
156 | - | ||
157 | - | ||
158 | - | ||
159 | - | ||
160 | - $banco = null; | ||
161 | - echo "Banco criado!!! administrador: admin / admin - não esqueça de alterar essa senha na opção de edição do cadastro de usuários"; | ||
162 | - function formularioLoginMaster($action){ | 139 | + if(!empty($banco)){ |
140 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem executar qualquer tarefa, inclusive cadastrar novos administradores',1,'admin')"); | ||
141 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem criar/editar qualquer tema (mapfile) mas nao podem editar a arvore do catalogo de temas',2,'editores')"); | ||
142 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem alterar a arvore do catalogo e dos atlas',3,'publicadores')"); | ||
143 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')"); | ||
144 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')"); | ||
145 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)"); | ||
146 | + | ||
147 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(1,'admin/html/editormapfile','editor de mapfiles do sistema de administracao')"); | ||
148 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(2,'admin/html/operacoes','abre o editor de operacoes')"); | ||
149 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(3,'teste/','teste')"); | ||
150 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(4,'admin/html/arvore','edicao da arvore do catalogo de temas')"); | ||
151 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(5,'admin/html/menus','edicao da lista de menus')"); | ||
152 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(6,'admin/html/ogcws','edicao das preferencias do servico WMS')"); | ||
153 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(7,'admin/html/atlas','edicao de atlas')"); | ||
154 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(8,'admin/html/identifica','lista de sistemas incluidos na ferramenta de identificacao')"); | ||
155 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(9,'admin/html/incluimap','adapta mapfiles antigos para versoes novas do Mapserver')"); | ||
156 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(10,'admin/html/mapas','lista de links para mapas')"); | ||
157 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(11,'admin/html/perfis','lista controlada de perfis')"); | ||
158 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(12,'admin/html/sistemas','lista de sistemas complementares que sao mostrados no catalogo')"); | ||
159 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(13,'admin/html/subirshapefile','upload de shapefile para uma pasta especifica no servidor')"); | ||
160 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(14,'admin/html/tags','edicao da lista controlada de tags')"); | ||
161 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoes VALUES(15,'admin/html/webservices','cadastro de links para webservices')"); | ||
162 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,2)"); | ||
163 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(1,3)"); | ||
164 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(4,3)"); | ||
165 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(5,3)"); | ||
166 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(7,3)"); | ||
167 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(10,3)"); | ||
168 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,2)"); | ||
169 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)"); | ||
170 | + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)"); | ||
171 | + $banco = null; | ||
172 | + echo "Banco criado!!! administrador: admin / admin - não esqueça de alterar essa senha na opção de edição do cadastro de usuários"; | ||
173 | + } | ||
174 | + function criabancoformularioLoginMaster($action){ | ||
163 | echo "<form method=post action=$action >"; | 175 | echo "<form method=post action=$action >"; |
164 | echo "<br>Essa conexão pode não ser segura e os dados de usuário/senha podem ser descobertos<br><br>"; | 176 | echo "<br>Essa conexão pode não ser segura e os dados de usuário/senha podem ser descobertos<br><br>"; |
165 | echo "Nome do usuário master cadastrado em ms_configura.php:<br> <input type=text name=usuario /><br>"; | 177 | echo "Nome do usuário master cadastrado em ms_configura.php:<br> <input type=text name=usuario /><br>"; |
166 | echo "Senha:<br> <input type=password name=senha /><br>"; | 178 | echo "Senha:<br> <input type=password name=senha /><br>"; |
167 | echo "<input type=submit />"; | 179 | echo "<input type=submit />"; |
168 | } | 180 | } |
169 | - function verificaMaster($usuario,$senha,$i3geomaster){ | ||
170 | - foreach($i3geomaster as $teste){ | ||
171 | - if(!empty($usuario) && !empty($senha) && $teste["usuario"] == $usuario && $teste["senha"] == $senha){ | ||
172 | - return true; | ||
173 | - } | ||
174 | - } | ||
175 | - return false; | ||
176 | - } | 181 | + |
177 | ?> | 182 | ?> |
178 | </div> | 183 | </div> |
179 | \ No newline at end of file | 184 | \ No newline at end of file |
admin/php/upgradebanco46_47.php
@@ -174,8 +174,15 @@ if(!in_array($teste,'13-4')) | @@ -174,8 +174,15 @@ if(!in_array($teste,'13-4')) | ||
174 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)"); | 174 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(13,4)"); |
175 | if(!in_array($teste,'15-3')) | 175 | if(!in_array($teste,'15-3')) |
176 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)"); | 176 | $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_operacoespapeis VALUES(15,3)"); |
177 | - | ||
178 | -echo "Feito!"; | 177 | +//cria o banco de dados de metadados estatisticos |
178 | +if(file_exists("../../admin/metaestat.db")) { | ||
179 | + echo "<br>Arquivo admin/metaestat.db ja existe. Vc deve apagá-lo para poder criá-lo novamente caso precise"; | ||
180 | +} | ||
181 | +else{ | ||
182 | + $banco = sqlite_open("../../admin/metaestat.db",0666); | ||
183 | + $banco = null; | ||
184 | +} | ||
185 | +echo "<br>Feito!"; | ||
179 | function lista($sql,$coluna,$coluna1=""){ | 186 | function lista($sql,$coluna,$coluna1=""){ |
180 | global $dbh; | 187 | global $dbh; |
181 | $lista = array(); | 188 | $lista = array(); |
admin/sql/metaestat_basededados.sql
1 | -- i3geoestat_conexao | 1 | -- i3geoestat_conexao |
2 | INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('1', 'dbspo', 'localhost', '5432', 'postgres', 'postgres'); | 2 | INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('1', 'dbspo', 'localhost', '5432', 'postgres', 'postgres'); |
3 | +INSERT INTO i3geoestat_conexao (codigo_estat_conexao, bancodedados, host, porta, usuario, senha) VALUES ('0', 'default', '', '', '', ''); | ||
3 | 4 | ||
4 | 5 | ||
5 | -- i3geoestat_tipo_periodo | 6 | -- i3geoestat_tipo_periodo |
@@ -9,6 +10,7 @@ INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUE | @@ -9,6 +10,7 @@ INSERT INTO i3geoestat_tipo_periodo (codigo_tipo_periodo, nome, descricao) VALUE | ||
9 | 10 | ||
10 | -- i3geoestat_tipo_regiao | 11 | -- i3geoestat_tipo_regiao |
11 | INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('1', 'Município', 'Limites municipais', '1', 'public', 'tb_ibge', 'the_geom', '', 'ibge', 'no_cidade', '4326', 'the_geom2'); | 12 | INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('1', 'Município', 'Limites municipais', '1', 'public', 'tb_ibge', 'the_geom', '', 'ibge', 'no_cidade', '4326', 'the_geom2'); |
13 | +INSERT INTO i3geoestat_tipo_regiao (codigo_tipo_regiao, nome_tipo_regiao, descricao_tipo_regiao, codigo_estat_conexao, esquemadb, tabela, colunageo, data, identificador, colunanomeregiao, srid, colunacentroide) VALUES ('3', 'Estados', 'Limites estaduais', '1', 'public', 'tb_ibge_estados', 'the_geom', '', 'co_ibge_uf', 'no_uf', '4326', 'the_geom'); | ||
12 | 14 | ||
13 | 15 | ||
14 | -- i3geoestat_unidade_medida | 16 | -- i3geoestat_unidade_medida |
classesjs/classe_cartograma.js
@@ -1,555 +0,0 @@ | @@ -1,555 +0,0 @@ | ||
1 | -/* | ||
2 | -Title: Cartogramas estatísticos | ||
3 | - | ||
4 | -Arquivo: | ||
5 | - | ||
6 | -i3geo/classesjs/classe_cartograma.js | ||
7 | - | ||
8 | -Licenca: | ||
9 | - | ||
10 | -GPL2 | ||
11 | - | ||
12 | -i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet | ||
13 | - | ||
14 | -Direitos Autorais Reservados (c) 2006 Ministério do Meio Ambiente Brasil | ||
15 | -Desenvolvedor: Edmar Moretti edmar.moretti@mma.gov.br | ||
16 | - | ||
17 | -Este programa é software livre; você pode redistribuí-lo | ||
18 | -e/ou modificá-lo sob os termos da Licença Pública Geral | ||
19 | -GNU conforme publicada pela Free Software Foundation; | ||
20 | - | ||
21 | -Este programa é distribuído na expectativa de que seja útil, | ||
22 | -porém, SEM NENHUMA GARANTIA; nem mesmo a garantia implícita | ||
23 | -de COMERCIABILIDADE OU ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. | ||
24 | -Consulte a Licença Pública Geral do GNU para mais detalhes. | ||
25 | -Você deve ter recebido uma cópia da Licença Pública Geral do | ||
26 | -GNU junto com este programa; se não, escreva para a | ||
27 | -Free Software Foundation, Inc., no endereço | ||
28 | -59 Temple Street, Suite 330, Boston, MA 02111-1307 USA. | ||
29 | -*/ | ||
30 | -if(typeof(i3GEO) === 'undefined'){ | ||
31 | - var i3GEO = {}; | ||
32 | -} | ||
33 | -/* | ||
34 | -Classe: i3GEO.cartograma | ||
35 | - | ||
36 | -Gerencia os componentes do módulo de geração de cartogramas estatísticos | ||
37 | -*/ | ||
38 | -i3GEO.cartograma = { | ||
39 | - INTERFACE: "flutuante", | ||
40 | - TOP: 50, | ||
41 | - LEFT: 100, | ||
42 | - LARGURA: 260, | ||
43 | - ALTURA: 300, | ||
44 | - //lista das camadas que foram adicionadas ao mapa | ||
45 | - CAMADAS: [], | ||
46 | - inicia: function(iddiv){ | ||
47 | - i3GEO.cartograma.principal.inicia(iddiv); | ||
48 | - }, | ||
49 | - desligaCamadas: function(){ | ||
50 | - if(i3GEO.cartograma.CAMADAS.length > 0){ | ||
51 | - i3GEO.arvoreDeCamadas.ligaDesligaTemas(i3GEO.cartograma.CAMADAS.join(","),false); | ||
52 | - } | ||
53 | - }, | ||
54 | - adicionaCamada: function(){ | ||
55 | - //function mapfileMedidaVariavel($id_medida_variavel,$filtro="",$todasascolunas = 0,$tipolayer="polygon",$titulolayer="",$id_classificacao="",$agruparpor=""){ | ||
56 | - var v = i3GEO.cartograma.verificaParametros(), | ||
57 | - temp = function(retorno){ | ||
58 | - if(i3GEO.arvoreDeCamadas.pegaTema(retorno.layer) == ""){ | ||
59 | - i3GEO.cartograma.desligaCamadas(); | ||
60 | - i3GEO.php.adtema(i3GEO.atualiza,retorno.mapfile); | ||
61 | - i3GEO.cartograma.CAMADAS.push(retorno.layer); | ||
62 | - } | ||
63 | - }; | ||
64 | - if(v != true){ | ||
65 | - alert("erro: "+v); | ||
66 | - } | ||
67 | - i3GEO.php.mapfileMedidaVariavel( | ||
68 | - temp, | ||
69 | - $i("i3geoCartoComboMedidasVariavel").value, | ||
70 | - i3GEO.cartograma.defineFiltro(), | ||
71 | - 0, | ||
72 | - $i("i3geoCartoComboTipoRep").value, | ||
73 | - i3GEO.cartograma.defineTitulo(), | ||
74 | - $i("i3geoCartoComboTipoClassificacao").value, | ||
75 | - i3GEO.cartograma.defineAgruparPor() | ||
76 | - ); | ||
77 | - }, | ||
78 | - defineTitulo: function(){ | ||
79 | - //se nao tiver parametros, filtro e vazio | ||
80 | - if(i3GEO.cartograma.parametros.dados.length == 0){ | ||
81 | - return ""; | ||
82 | - } | ||
83 | - //se tiver parametro e todos estiverem vazios, aborta | ||
84 | - var i,n,c,titulo, | ||
85 | - t=[], | ||
86 | - dados = i3GEO.cartograma.parametros.dados; | ||
87 | - titulo = $i("i3geoCartoComboVariavel").options[$i("i3geoCartoComboVariavel").selectedIndex].label +" - "+ | ||
88 | - $i("i3geoCartoComboMedidasVariavel").options[$i("i3geoCartoComboMedidasVariavel").selectedIndex].label +" - "+ | ||
89 | - $i("i3geoCartoComboTipoRep").options[$i("i3geoCartoComboTipoRep").selectedIndex].label +" - "+ | ||
90 | - $i("i3geoCartoComboTipoClassificacao").options[$i("i3geoCartoComboTipoClassificacao").selectedIndex].label; | ||
91 | - n = dados.length; | ||
92 | - for(i=0;i<n;i++){ | ||
93 | - c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai); | ||
94 | - if(c && c.value != ""){ | ||
95 | - t.push(dados[i].nome+" = "+c.value); | ||
96 | - } | ||
97 | - } | ||
98 | - if(t.length > 0){ | ||
99 | - return titulo+" - "+t.join(", "); | ||
100 | - } | ||
101 | - else{ | ||
102 | - return titulo; | ||
103 | - } | ||
104 | - }, | ||
105 | - defineFiltro: function(){ | ||
106 | - //se nao tiver parametros, filtro e vazio | ||
107 | - if(i3GEO.cartograma.parametros.dados.length == 0){ | ||
108 | - return ""; | ||
109 | - } | ||
110 | - //se tiver parametro e todos estiverem vazios, aborta | ||
111 | - var i,n,c, | ||
112 | - t=[], | ||
113 | - dados = i3GEO.cartograma.parametros.dados; | ||
114 | - n = dados.length; | ||
115 | - for(i=0;i<n;i++){ | ||
116 | - c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai); | ||
117 | - if(c && c.value != ""){ | ||
118 | - t.push(dados[i].coluna+"="+c.value); | ||
119 | - } | ||
120 | - } | ||
121 | - if(t.length > 0){ | ||
122 | - return t.join(" and "); | ||
123 | - } | ||
124 | - else{ | ||
125 | - return ""; | ||
126 | - } | ||
127 | - }, | ||
128 | - defineAgruparPor: function(){ | ||
129 | - //se nao tiver parametros, filtro e vazio | ||
130 | - if(i3GEO.cartograma.parametros.dados.length == 0){ | ||
131 | - return ""; | ||
132 | - } | ||
133 | - //se tiver parametro e todos estiverem vazios, aborta | ||
134 | - var i,n,c, | ||
135 | - t=[], | ||
136 | - dados = i3GEO.cartograma.parametros.dados; | ||
137 | - n = dados.length; | ||
138 | - for(i=0;i<n;i++){ | ||
139 | - c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai); | ||
140 | - if(c && c.value != ""){ | ||
141 | - t.push(dados[i].coluna); | ||
142 | - } | ||
143 | - } | ||
144 | - if(t.length > 0){ | ||
145 | - return t.join(","); | ||
146 | - } | ||
147 | - else{ | ||
148 | - return ""; | ||
149 | - } | ||
150 | - }, | ||
151 | - verificaParametros: function(){ | ||
152 | - var ok = true, | ||
153 | - combos = ["i3geoCartoComboVariavel","i3geoCartoComboMedidasVariavel","i3geoCartoComboTipoRep","i3geoCartoComboTipoClassificacao"], | ||
154 | - n = combos.length, | ||
155 | - i,temp; | ||
156 | - for(i=0;i<n;i++){ | ||
157 | - temp = $i(combos[i]); | ||
158 | - if(!temp){ | ||
159 | - return combos[i]; | ||
160 | - } | ||
161 | - if(temp.value == ""){ | ||
162 | - return combos[i]; | ||
163 | - } | ||
164 | - } | ||
165 | - return ok; | ||
166 | - }, | ||
167 | - aguarde: function(obj){ | ||
168 | - if(!obj){ | ||
169 | - return "<img style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />"; | ||
170 | - } | ||
171 | - var i = $i(obj.id+"_imagem"); | ||
172 | - if(!i){ | ||
173 | - obj.innerHTML = "<img id='"+obj.id+"_imagem' style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />"; | ||
174 | - } | ||
175 | - else{ | ||
176 | - if(i.style.display == "block"){ | ||
177 | - i.style.display = "none"; | ||
178 | - } | ||
179 | - else{ | ||
180 | - i.style.display = "block"; | ||
181 | - } | ||
182 | - } | ||
183 | - }, | ||
184 | - principal: { | ||
185 | - inicia: function(iddiv){ | ||
186 | - if(!iddiv){ | ||
187 | - iddiv = "i3geoCartoParametros_corpo"; | ||
188 | - } | ||
189 | - if(i3GEO.cartograma.INTERFACE == "flutuante"){ | ||
190 | - i3GEO.cartograma.principal.abreJanela(); | ||
191 | - } | ||
192 | - $i(iddiv).innerHTML = i3GEO.cartograma.principal.html(); | ||
193 | - i3GEO.cartograma.principal.comboVariaveis(); | ||
194 | - }, | ||
195 | - abreJanela: function(){ | ||
196 | - var cabecalho,minimiza,imagemxy,janela; | ||
197 | - if (!$i("i3geoCartoParametros")){ | ||
198 | - cabecalho = function(){ | ||
199 | - }; | ||
200 | - minimiza = function(){ | ||
201 | - i3GEO.janela.minimiza("i3geoCartoParametros"); | ||
202 | - }; | ||
203 | - janela = i3GEO.janela.cria( | ||
204 | - i3GEO.cartograma.LARGURA+"px", | ||
205 | - i3GEO.cartograma.ALTURA+"px", | ||
206 | - "", | ||
207 | - "", | ||
208 | - "", | ||
209 | - $trad("x57"), | ||
210 | - "i3geoCartoParametros", | ||
211 | - false, | ||
212 | - "hd", | ||
213 | - cabecalho, | ||
214 | - minimiza | ||
215 | - ); | ||
216 | - janela = janela[0]; | ||
217 | - YAHOO.i3GEO.janela.manager.register(janela); | ||
218 | - janela.render(); | ||
219 | - } | ||
220 | - else{ | ||
221 | - janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoParametros"); | ||
222 | - } | ||
223 | - janela.show(); | ||
224 | - imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); | ||
225 | - janela.moveTo(imagemxy[0]+i3GEO.cartograma.LEFT,i3GEO.cartograma.TOP); | ||
226 | - }, | ||
227 | - html: function(){ | ||
228 | - var ins = '<div id="i3geoCartoVariaveisContainer" style="margin-left:5px;">' + | ||
229 | - '<div class="paragrafo" id="i3geoCartoVariaveis" >' + | ||
230 | - '</div>' + | ||
231 | - '<div class="paragrafo" id="i3geoCartoMedidasVariavel" >' + | ||
232 | - '</div>' + | ||
233 | - '<div class="paragrafo" id="i3geoCartoParametrosMedidasVariavel" >' + | ||
234 | - '</div>' + | ||
235 | - '</div>'; | ||
236 | - return ins; | ||
237 | - }, | ||
238 | - maisInfo: function(){ | ||
239 | - var temp = "", | ||
240 | - v = $i("i3geoCartoComboVariavel"); | ||
241 | - if(!v || v.value === ""){ | ||
242 | - alert($trad("x61")); | ||
243 | - } | ||
244 | - else{ | ||
245 | - var cabecalho,minimiza,janela; | ||
246 | - if (!$i("i3geoCartoMaisInfo")){ | ||
247 | - cabecalho = function(){ | ||
248 | - }; | ||
249 | - minimiza = function(){ | ||
250 | - i3GEO.janela.minimiza("i3geoCartoMaisInfo"); | ||
251 | - }; | ||
252 | - janela = i3GEO.janela.cria( | ||
253 | - "400px", | ||
254 | - "300px", | ||
255 | - "", | ||
256 | - "", | ||
257 | - "", | ||
258 | - $trad("x62"), | ||
259 | - "i3geoCartoMaisInfo", | ||
260 | - false, | ||
261 | - "hd", | ||
262 | - cabecalho, | ||
263 | - minimiza | ||
264 | - ); | ||
265 | - janela = janela[0]; | ||
266 | - YAHOO.i3GEO.janela.manager.register(janela); | ||
267 | - janela.render(); | ||
268 | - //YAHOO.util.Event.addListener(janela.close, "click", i3GEO.cartograma.fechaJanelaParametros); | ||
269 | - } | ||
270 | - else{ | ||
271 | - janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoMaisInfo"); | ||
272 | - } | ||
273 | - janela.setBody(i3GEO.cartograma.aguarde()); | ||
274 | - temp = function(retorno){ | ||
275 | - janela.setBody(retorno); | ||
276 | - janela.show(); | ||
277 | - //imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); | ||
278 | - //janela.moveTo(imagemxy[0]+i3GEO.cartograma.LEFT,imagemxy[1]+i3GEO.cartograma.TOP); | ||
279 | - }; | ||
280 | - i3GEO.php.relatorioVariavel(v.value,temp); | ||
281 | - } | ||
282 | - }, | ||
283 | - comboVariaveis: function(){ | ||
284 | - var onde = $i("i3geoCartoVariaveis"), | ||
285 | - temp = function(dados){ | ||
286 | - var n = dados.length, | ||
287 | - ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoInfo" onclick="i3GEO.cartograma.principal.maisInfo()" value="'+$trad("x60")+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" /></p><br><p class="paragrafo" >'+$trad("x58")+'</p>', | ||
288 | - i; | ||
289 | - ins += "<select id='i3geoCartoComboVariavel' style='box-shadow:0 1px 5px gray;width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange='i3GEO.cartograma.principal.comboVariaveisOnchange(this)'><option value=''>---</option>"; | ||
290 | - for(i=0;i<n;i++){ | ||
291 | - ins += "<option title='"+dados[i].descricao+"' value='"+dados[i].codigo_variavel+"'>"+dados[i].nome+"</option>"; | ||
292 | - } | ||
293 | - ins += "</select>"; | ||
294 | - if(onde){ | ||
295 | - onde.innerHTML = ins; | ||
296 | - new YAHOO.widget.Button( | ||
297 | - "i3GEOcartoBotaoInfo", | ||
298 | - {onclick:{fn: i3GEO.cartograma.principal.maisInfo}} | ||
299 | - ); | ||
300 | - $i("i3GEOcartoBotaoInfo-button").style.width = i3GEO.cartograma.LARGURA - 25 + "px"; | ||
301 | - } | ||
302 | - return ins; | ||
303 | - }; | ||
304 | - i3GEO.cartograma.aguarde(onde); | ||
305 | - i3GEO.php.listaVariavel(temp); | ||
306 | - }, | ||
307 | - comboVariaveisOnchange: function(combo){ | ||
308 | - if(combo.value != ""){ | ||
309 | - i3GEO.cartograma.principal.comboMedidasVariavel(combo.value); | ||
310 | - } | ||
311 | - else{ | ||
312 | - $i("i3geoCartoMedidasVariavel").innerHTML = ""; | ||
313 | - $i("i3geoCartoParametrosMedidasVariavel").innerHTML = ""; | ||
314 | - } | ||
315 | - }, | ||
316 | - comboMedidasVariavel: function(codigo_variavel){ | ||
317 | - var onde = $i("i3geoCartoMedidasVariavel"), | ||
318 | - temp = function(dados){ | ||
319 | - var n = dados.length, | ||
320 | - ins = '<p class="paragrafo" >'+$trad("x59")+'</p>', | ||
321 | - i; | ||
322 | - ins += "<select id='i3geoCartoComboMedidasVariavel' style='width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange='i3GEO.cartograma.principal.comboMedidaVariavelOnchange(this)'><option value=''>---</option>"; | ||
323 | - for(i=0;i<n;i++){ | ||
324 | - ins += "<option value='"+dados[i].id_medida_variavel+"'>"+dados[i].nomemedida+"</option>"; | ||
325 | - } | ||
326 | - ins += "</select>"; | ||
327 | - if(onde){ | ||
328 | - onde.innerHTML = ins; | ||
329 | - } | ||
330 | - return ins; | ||
331 | - }; | ||
332 | - i3GEO.cartograma.aguarde(onde); | ||
333 | - i3GEO.php.listaMedidaVariavel(codigo_variavel,temp); | ||
334 | - }, | ||
335 | - comboMedidaVariavelOnchange: function(combo){ | ||
336 | - i3GEO.cartograma.classes.inicia(); | ||
337 | - if(combo.value != ""){ | ||
338 | - i3GEO.cartograma.parametros.lista(combo.value); | ||
339 | - } | ||
340 | - else{ | ||
341 | - $i("i3geoCartoParametrosMedidasVariavel").innerHTML = ""; | ||
342 | - } | ||
343 | - } | ||
344 | - }, | ||
345 | - parametros: { | ||
346 | - //guarda a lista de parametros | ||
347 | - dados: [], | ||
348 | - //obtem a lista com os parametros da medida | ||
349 | - //cria os combos para os parametros que sao pai de todos | ||
350 | - lista: function(id_medida_variavel){ | ||
351 | - i3GEO.cartograma.aguarde($i("i3geoCartoParametrosMedidasVariavel")); | ||
352 | - var temp = function(dados){ | ||
353 | - i3GEO.cartograma.parametros.dados = dados; | ||
354 | - i3GEO.cartograma.parametros.combos("0"); | ||
355 | - i3GEO.cartograma.aguarde($i("i3geoCartoParametrosMedidasVariavel")); | ||
356 | - }; | ||
357 | - i3GEO.php.listaParametrosMedidaVariavel(id_medida_variavel,temp); | ||
358 | - }, | ||
359 | - //cria um combo para escolher os valores de um parametro | ||
360 | - combos: function(nivel){ | ||
361 | - var dados = i3GEO.cartograma.parametros.dados, | ||
362 | - n = dados.length, | ||
363 | - onde = $i("i3geoCartoParametrosMedidasVariavel"), | ||
364 | - idpar,idcombo,i,novoel,teste; | ||
365 | - //cria o combo para o parametro cujo id_pai for do nivel escolhido | ||
366 | - for(i=0;i<n;i++){ | ||
367 | - if(dados[i].id_pai == nivel){ | ||
368 | - idpar = "parametro_"+dados[i].id_parametro_medida; | ||
369 | - idcombo = "parametro_"+dados[i].id_parametro_medida+"_"+nivel; | ||
370 | - teste = i3GEO.cartograma.parametros.retornaIdPai(dados[i].id_parametro_medida); | ||
371 | - if(teste != false){ | ||
372 | - idpar = "parametro_"+teste; | ||
373 | - } | ||
374 | - if(!$i(idpar)){ | ||
375 | - novoel = document.createElement("div"); | ||
376 | - novoel.id = idpar; | ||
377 | - novoel.className = "paragrafo"; | ||
378 | - onde.appendChild(novoel); | ||
379 | - onde = novoel; | ||
380 | - } | ||
381 | - onde = $i(idpar); | ||
382 | - if(!$i(idcombo)){ | ||
383 | - i3GEO.cartograma.aguarde(onde); | ||
384 | - novoel = document.createElement("div"); | ||
385 | - novoel.id = idcombo; | ||
386 | - novoel.className = "paragrafo"; | ||
387 | - onde.appendChild(novoel); | ||
388 | - i3GEO.cartograma.parametros.valoresCombo(dados[i].id_parametro_medida,dados[i].nome,nivel,onde,idcombo); | ||
389 | - } | ||
390 | - } | ||
391 | - } | ||
392 | - }, | ||
393 | - valoresCombo: function(id_parametro_medida,titulo,nivel,onde,idcombo){ | ||
394 | - var temp = function(dados){ | ||
395 | - var n = dados.length, | ||
396 | - ins = "", | ||
397 | - oc = "'i3GEO.cartograma.parametros.antesCombo();i3GEO.cartograma.parametros.combos(\""+id_parametro_medida+"\")'", | ||
398 | - filho = i3GEO.cartograma.parametros.retornaIdFilho(id_parametro_medida), | ||
399 | - i,novoel; | ||
400 | - if(filho == false){ | ||
401 | - oc = ""; | ||
402 | - } | ||
403 | - ins = "<p class=paragrafo >"+titulo+"</p>"; | ||
404 | - ins += "<select id='combo"+idcombo+"' style='background:beige;width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange="+oc+" ><option value=''>---</option>"; | ||
405 | - for(i=0;i<n;i++){ | ||
406 | - ins += "<option value='"+dados[i]+"'>"+dados[i]+"</option>"; | ||
407 | - } | ||
408 | - ins += "</select>"; | ||
409 | - novoel = document.createElement("div"); | ||
410 | - novoel.className = "paragrafo"; | ||
411 | - novoel.innerHTML = ins; | ||
412 | - i3GEO.cartograma.aguarde(onde); | ||
413 | - onde.appendChild(novoel); | ||
414 | - }; | ||
415 | - i3GEO.php.listaValoresParametroMedidaVariavel(id_parametro_medida,temp); | ||
416 | - }, | ||
417 | - antesCombo: function(){ | ||
418 | - if(!$i("i3geoCartoClasses_corpo")){ | ||
419 | - i3GEO.cartograma.classes.inicia(); | ||
420 | - } | ||
421 | - }, | ||
422 | - //retorna o id do parametro que e filho de um outro parametro | ||
423 | - retornaIdFilho:function(pai){ | ||
424 | - var dados = i3GEO.cartograma.parametros.dados, | ||
425 | - n = dados.length, | ||
426 | - i; | ||
427 | - for(i=0;i<n;i++){ | ||
428 | - if(dados[i].id_pai == pai){ | ||
429 | - return dados[i].id_parametro_medida; | ||
430 | - } | ||
431 | - } | ||
432 | - return false; | ||
433 | - }, | ||
434 | - //retorna o id do parametro que e pai de um outro parametro | ||
435 | - retornaIdPai:function(filho){ | ||
436 | - var dados = i3GEO.cartograma.parametros.dados, | ||
437 | - n = dados.length, | ||
438 | - i; | ||
439 | - for(i=0;i<n;i++){ | ||
440 | - if(dados[i].id_parametro_medida == filho){ | ||
441 | - return dados[i].id_pai; | ||
442 | - } | ||
443 | - } | ||
444 | - return false; | ||
445 | - } | ||
446 | - }, | ||
447 | - classes:{ | ||
448 | - inicia: function(iddiv){ | ||
449 | - if(!$i("i3geoCartoComboMedidasVariavel")){ | ||
450 | - alert("erro: i3geoCartoComboMedidasVariavel???"); | ||
451 | - return; | ||
452 | - } | ||
453 | - if(!iddiv){ | ||
454 | - iddiv = "i3geoCartoClasses_corpo"; | ||
455 | - } | ||
456 | - if(i3GEO.cartograma.INTERFACE == "flutuante"){ | ||
457 | - i3GEO.cartograma.classes.abreJanela(); | ||
458 | - } | ||
459 | - $i(iddiv).innerHTML = i3GEO.cartograma.classes.html(); | ||
460 | - i3GEO.cartograma.classes.comboTipoRep(); | ||
461 | - i3GEO.cartograma.classes.comboTipoClassificacao(); | ||
462 | - }, | ||
463 | - abreJanela: function(){ | ||
464 | - var cabecalho,minimiza,imagemxy,janela; | ||
465 | - if (!$i("i3geoCartoClasses")){ | ||
466 | - cabecalho = function(){ | ||
467 | - }; | ||
468 | - minimiza = function(){ | ||
469 | - i3GEO.janela.minimiza("i3geoCartoClasses"); | ||
470 | - }; | ||
471 | - janela = i3GEO.janela.cria( | ||
472 | - i3GEO.cartograma.LARGURA+"px", | ||
473 | - i3GEO.cartograma.ALTURA+"px", | ||
474 | - "", | ||
475 | - "", | ||
476 | - "", | ||
477 | - $trad("x63"), | ||
478 | - "i3geoCartoClasses", | ||
479 | - false, | ||
480 | - "hd", | ||
481 | - cabecalho, | ||
482 | - minimiza | ||
483 | - ); | ||
484 | - janela = janela[0]; | ||
485 | - YAHOO.i3GEO.janela.manager.register(janela); | ||
486 | - janela.render(); | ||
487 | - } | ||
488 | - else{ | ||
489 | - janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoClasses"); | ||
490 | - } | ||
491 | - janela.show(); | ||
492 | - imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); | ||
493 | - janela.moveTo(imagemxy[0]+i3GEO.cartograma.LEFT+i3GEO.cartograma.LARGURA+10,i3GEO.cartograma.TOP); | ||
494 | - }, | ||
495 | - html: function(){ | ||
496 | - var ins = '<div id="i3geoCartoClassesContainer" style="margin-left:5px;">' + | ||
497 | - '<div class="paragrafo" id="i3geoCartoTipoRep" >' + | ||
498 | - '</div>' + | ||
499 | - '<div class="paragrafo" id="i3geoCartoTipoClassificacao" >' + | ||
500 | - '</div>' + | ||
501 | - '</div>'; | ||
502 | - return ins; | ||
503 | - }, | ||
504 | - comboTipoRep: function(){ | ||
505 | - var onde = $i("i3geoCartoTipoRep"), | ||
506 | - ins,i, | ||
507 | - dados = [ | ||
508 | - {"codigo":"polygon","nome":"polígonos"}, | ||
509 | - {"codigo":"point","nome":"pontos"} | ||
510 | - ], | ||
511 | - n = dados.length; | ||
512 | - ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoAdicionarCamada" onclick="i3GEO.cartograma.principal.maisInfo()" value="'+$trad("x64")+'"class="paragrafo" style="cursor:pointer;color:blue" /></p>' + | ||
513 | - '<br><p class="paragrafo" >'+$trad("x65")+'</p>' + | ||
514 | - "<select id='i3geoCartoComboTipoRep' style='box-shadow:0 1px 5px gray;width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange=''>"; | ||
515 | - for(i=0;i<n;i++){ | ||
516 | - ins += "<option value='"+dados[i].codigo+"'>"+dados[i].nome+"</option>"; | ||
517 | - } | ||
518 | - ins += "</select>"; | ||
519 | - if(onde){ | ||
520 | - onde.innerHTML = ins; | ||
521 | - new YAHOO.widget.Button( | ||
522 | - "i3GEOcartoBotaoAdicionarCamada", | ||
523 | - {onclick:{fn: i3GEO.cartograma.adicionaCamada}} | ||
524 | - ); | ||
525 | - $i("i3GEOcartoBotaoAdicionarCamada-button").style.width = i3GEO.cartograma.LARGURA - 25 + "px"; | ||
526 | - } | ||
527 | - return ins; | ||
528 | - }, | ||
529 | - comboTipoClassificacao: function(){ | ||
530 | - var onde = $i("i3geoCartoTipoClassificacao"), | ||
531 | - combo = $i("i3geoCartoComboMedidasVariavel"), | ||
532 | - temp = function(dados){ | ||
533 | - var n = dados.length, | ||
534 | - ins = '<p class="paragrafo" >'+$trad("x66")+'</p>', | ||
535 | - i; | ||
536 | - ins += "<select id='i3geoCartoComboTipoClassificacao' style='width:"+(i3GEO.cartograma.LARGURA - 20)+"px' onchange='i3GEO.cartograma.classes.comboTipoClassificacaoOnchange(this)'><option value=''>---</option>"; | ||
537 | - for(i=0;i<n;i++){ | ||
538 | - ins += "<option title='"+dados[i].observacao+"' value='"+dados[i].id_classificacao+"'>"+dados[i].nome+"</option>"; | ||
539 | - } | ||
540 | - ins += "</select>"; | ||
541 | - //{"id_classificacao":"1","nome":"Pela media","id_medida_variavel":"1","observacao":""} | ||
542 | - if(onde){ | ||
543 | - onde.innerHTML = ins; | ||
544 | - } | ||
545 | - return ins; | ||
546 | - }; | ||
547 | - i3GEO.cartograma.aguarde(onde); | ||
548 | - i3GEO.php.listaClassificacaoMedida(combo.value,temp); | ||
549 | - }, | ||
550 | - comboTipoClassificacaoOnchange: function(){ | ||
551 | - | ||
552 | - } | ||
553 | - } | ||
554 | - | ||
555 | -}; | ||
556 | \ No newline at end of file | 0 | \ No newline at end of file |
classesjs/compactajs.php
@@ -118,7 +118,6 @@ packer("classe_interface.js","compactados/classe_interface_compacto.js","Normal" | @@ -118,7 +118,6 @@ packer("classe_interface.js","compactados/classe_interface_compacto.js","Normal" | ||
118 | packer("classe_i3geo.js","compactados/classe_i3geo_compacto.js","Normal"); | 118 | packer("classe_i3geo.js","compactados/classe_i3geo_compacto.js","Normal"); |
119 | packer("dicionario_ajuda.js","compactados/dicionario_ajuda_compacto.js","Normal"); | 119 | packer("dicionario_ajuda.js","compactados/dicionario_ajuda_compacto.js","Normal"); |
120 | packer("classe_social.js","compactados/classe_social_compacto.js","Normal"); | 120 | packer("classe_social.js","compactados/classe_social_compacto.js","Normal"); |
121 | -packer("classe_cartograma.js","compactados/classe_cartograma_compacto.js","Normal"); | ||
122 | //packer("../ferramentas/funcoes.js","../ferramentas/funcoes_compacto.js","Normal"); | 121 | //packer("../ferramentas/funcoes.js","../ferramentas/funcoes_compacto.js","Normal"); |
123 | packer("../pacotes/yui290/build/container/container.js","../pacotes/yui290/build/container/container_compacto.js","Normal"); | 122 | packer("../pacotes/yui290/build/container/container.js","../pacotes/yui290/build/container/container_compacto.js","Normal"); |
124 | packer("../pacotes/yui290/build/container/container_core.js","../pacotes/yui290/build/container/container_core_compacto.js","Normal"); | 123 | packer("../pacotes/yui290/build/container/container_core.js","../pacotes/yui290/build/container/container_core_compacto.js","Normal"); |
@@ -187,7 +186,6 @@ $jsfiles = array( | @@ -187,7 +186,6 @@ $jsfiles = array( | ||
187 | "compactados/classe_gadgets_compacto.js", | 186 | "compactados/classe_gadgets_compacto.js", |
188 | "compactados/classe_social_compacto.js", | 187 | "compactados/classe_social_compacto.js", |
189 | "compactados/classe_login_compacto.js", | 188 | "compactados/classe_login_compacto.js", |
190 | -"compactados/classe_cartograma_compacto.js", | ||
191 | "../pacotes/eudock/js/euDock.2.0.js", | 189 | "../pacotes/eudock/js/euDock.2.0.js", |
192 | "../pacotes/eudock/js/euDock.Image.js" | 190 | "../pacotes/eudock/js/euDock.Image.js" |
193 | ); | 191 | ); |
classesjs/dicionario.js
@@ -1936,69 +1936,6 @@ it:"" | @@ -1936,69 +1936,6 @@ it:"" | ||
1936 | }], | 1936 | }], |
1937 | "x58":[ | 1937 | "x58":[ |
1938 | { | 1938 | { |
1939 | -pt:"Escolha uma variável para o mapa", | ||
1940 | -en:"", | ||
1941 | -es:"", | ||
1942 | -it:"" | ||
1943 | -}], | ||
1944 | -"x59":[ | ||
1945 | -{ | ||
1946 | -pt:"Escolha uma medida da variável", | ||
1947 | -en:"", | ||
1948 | -es:"", | ||
1949 | -it:"" | ||
1950 | -}], | ||
1951 | -"x60":[ | ||
1952 | -{ | ||
1953 | -pt:"Mais informações sobre a variável ", | ||
1954 | -en:"", | ||
1955 | -es:"", | ||
1956 | -it:"" | ||
1957 | -}], | ||
1958 | -"x61":[ | ||
1959 | -{ | ||
1960 | -pt:"Escolha uma variavel primeiro", | ||
1961 | -en:"", | ||
1962 | -es:"", | ||
1963 | -it:"" | ||
1964 | -}], | ||
1965 | -"x62":[ | ||
1966 | -{ | ||
1967 | -pt:"Relatório", | ||
1968 | -en:"", | ||
1969 | -es:"", | ||
1970 | -it:"" | ||
1971 | -}], | ||
1972 | -"x63":[ | ||
1973 | -{ | ||
1974 | -pt:"Classes", | ||
1975 | -en:"", | ||
1976 | -es:"", | ||
1977 | -it:"" | ||
1978 | -}], | ||
1979 | -"x64":[ | ||
1980 | -{ | ||
1981 | -pt:"Adicionar camada ao mapa", | ||
1982 | -en:"", | ||
1983 | -es:"", | ||
1984 | -it:"" | ||
1985 | -}], | ||
1986 | -"x65":[ | ||
1987 | -{ | ||
1988 | -pt:"Como os dados serão representados", | ||
1989 | -en:"", | ||
1990 | -es:"", | ||
1991 | -it:"" | ||
1992 | -}], | ||
1993 | -"x66":[ | ||
1994 | -{ | ||
1995 | -pt:"Escolha um tipo de classificação", | ||
1996 | -en:"", | ||
1997 | -es:"", | ||
1998 | -it:"" | ||
1999 | -}], | ||
2000 | -"x67":[ | ||
2001 | -{ | ||
2002 | pt:"", | 1939 | pt:"", |
2003 | en:"", | 1940 | en:"", |
2004 | es:"", | 1941 | es:"", |
classesjs/i3geonaocompacto.js
@@ -65,8 +65,7 @@ | @@ -65,8 +65,7 @@ | ||
65 | "../pacotes/richdraw/richdraw_tudo_compacto.js", | 65 | "../pacotes/richdraw/richdraw_tudo_compacto.js", |
66 | "classe_coordenadas.js", | 66 | "classe_coordenadas.js", |
67 | "classe_gadgets.js", | 67 | "classe_gadgets.js", |
68 | - "classe_login.js", | ||
69 | - "classe_cartograma.js" | 68 | + "classe_login.js" |
70 | ); | 69 | ); |
71 | for (i = 0; i < jsfiles.length; i++) | 70 | for (i = 0; i < jsfiles.length; i++) |
72 | { | 71 | { |
classesjs/teste.txt
documentacao/diagramas/metaestat.erm
@@ -12,7 +12,7 @@ | @@ -12,7 +12,7 @@ | ||
12 | <category_index>0</category_index> | 12 | <category_index>0</category_index> |
13 | <zoom>1.0</zoom> | 13 | <zoom>1.0</zoom> |
14 | <x>-372</x> | 14 | <x>-372</x> |
15 | - <y>275</y> | 15 | + <y>179</y> |
16 | <default_color> | 16 | <default_color> |
17 | <r>255</r> | 17 | <r>255</r> |
18 | <g>128</g> | 18 | <g>128</g> |
@@ -78,7 +78,7 @@ | @@ -78,7 +78,7 @@ | ||
78 | </export_java_setting> | 78 | </export_java_setting> |
79 | <export_testdata_setting> | 79 | <export_testdata_setting> |
80 | <file_encoding>ISO-8859-1</file_encoding> | 80 | <file_encoding>ISO-8859-1</file_encoding> |
81 | - <file_path>C:\ms4w\Apache\htdocs\i3geo\admin\sql</file_path> | 81 | + <file_path>/var/www/i3geo/admin/sql</file_path> |
82 | <format>0</format> | 82 | <format>0</format> |
83 | </export_testdata_setting> | 83 | </export_testdata_setting> |
84 | </export_setting> | 84 | </export_setting> |
@@ -110,7 +110,7 @@ | @@ -110,7 +110,7 @@ | ||
110 | </connections> | 110 | </connections> |
111 | <display>false</display> | 111 | <display>false</display> |
112 | <creation_date>2012-07-17 15:03:53</creation_date> | 112 | <creation_date>2012-07-17 15:03:53</creation_date> |
113 | - <updated_date>2012-08-18 09:59:03</updated_date> | 113 | + <updated_date>2012-09-03 12:54:45</updated_date> |
114 | <model_property> | 114 | <model_property> |
115 | <name>Project Name</name> | 115 | <name>Project Name</name> |
116 | <value></value> | 116 | <value></value> |
@@ -1068,7 +1068,7 @@ | @@ -1068,7 +1068,7 @@ | ||
1068 | </sequence> | 1068 | </sequence> |
1069 | </normal_column> | 1069 | </normal_column> |
1070 | <normal_column> | 1070 | <normal_column> |
1071 | - <word_id>38</word_id> | 1071 | + <word_id>37</word_id> |
1072 | <id>1</id> | 1072 | <id>1</id> |
1073 | <description></description> | 1073 | <description></description> |
1074 | <unique_key_name></unique_key_name> | 1074 | <unique_key_name></unique_key_name> |
@@ -1259,7 +1259,7 @@ | @@ -1259,7 +1259,7 @@ | ||
1259 | </sequence> | 1259 | </sequence> |
1260 | </normal_column> | 1260 | </normal_column> |
1261 | <normal_column> | 1261 | <normal_column> |
1262 | - <word_id>41</word_id> | 1262 | + <word_id>36</word_id> |
1263 | <id>6</id> | 1263 | <id>6</id> |
1264 | <description></description> | 1264 | <description></description> |
1265 | <unique_key_name></unique_key_name> | 1265 | <unique_key_name></unique_key_name> |
@@ -1291,7 +1291,7 @@ | @@ -1291,7 +1291,7 @@ | ||
1291 | </sequence> | 1291 | </sequence> |
1292 | </normal_column> | 1292 | </normal_column> |
1293 | <normal_column> | 1293 | <normal_column> |
1294 | - <word_id>17</word_id> | 1294 | + <word_id>18</word_id> |
1295 | <id>7</id> | 1295 | <id>7</id> |
1296 | <description></description> | 1296 | <description></description> |
1297 | <unique_key_name></unique_key_name> | 1297 | <unique_key_name></unique_key_name> |
@@ -1386,7 +1386,7 @@ | @@ -1386,7 +1386,7 @@ | ||
1386 | </sequence> | 1386 | </sequence> |
1387 | </normal_column> | 1387 | </normal_column> |
1388 | <normal_column> | 1388 | <normal_column> |
1389 | - <word_id>37</word_id> | 1389 | + <word_id>41</word_id> |
1390 | <id>9</id> | 1390 | <id>9</id> |
1391 | <description></description> | 1391 | <description></description> |
1392 | <unique_key_name></unique_key_name> | 1392 | <unique_key_name></unique_key_name> |
@@ -1418,7 +1418,7 @@ | @@ -1418,7 +1418,7 @@ | ||
1418 | </sequence> | 1418 | </sequence> |
1419 | </normal_column> | 1419 | </normal_column> |
1420 | <normal_column> | 1420 | <normal_column> |
1421 | - <word_id>18</word_id> | 1421 | + <word_id>16</word_id> |
1422 | <id>10</id> | 1422 | <id>10</id> |
1423 | <description></description> | 1423 | <description></description> |
1424 | <unique_key_name></unique_key_name> | 1424 | <unique_key_name></unique_key_name> |
@@ -1460,28 +1460,45 @@ | @@ -1460,28 +1460,45 @@ | ||
1460 | </table> | 1460 | </table> |
1461 | <table> | 1461 | <table> |
1462 | <id>5</id> | 1462 | <id>5</id> |
1463 | - <height>170</height> | ||
1464 | - <width>292</width> | 1463 | + <height>128</height> |
1464 | + <width>247</width> | ||
1465 | <font_name>Ubuntu</font_name> | 1465 | <font_name>Ubuntu</font_name> |
1466 | <font_size>9</font_size> | 1466 | <font_size>9</font_size> |
1467 | - <x>8</x> | ||
1468 | - <y>499</y> | 1467 | + <x>673</x> |
1468 | + <y>-89</y> | ||
1469 | <color> | 1469 | <color> |
1470 | - <r>255</r> | ||
1471 | - <g>165</g> | ||
1472 | - <b>0</b> | 1470 | + <r>230</r> |
1471 | + <g>230</g> | ||
1472 | + <b>250</b> | ||
1473 | </color> | 1473 | </color> |
1474 | <connections> | 1474 | <connections> |
1475 | + <relation> | ||
1476 | + <id>0</id> | ||
1477 | + <source>8</source> | ||
1478 | + <target>5</target> | ||
1479 | + <child_cardinality>1..n</child_cardinality> | ||
1480 | + <parent_cardinality>1</parent_cardinality> | ||
1481 | + <reference_for_pk>true</reference_for_pk> | ||
1482 | + <name></name> | ||
1483 | + <on_delete_action>RESTRICT</on_delete_action> | ||
1484 | + <on_update_action>RESTRICT</on_update_action> | ||
1485 | + <source_xp>-1</source_xp> | ||
1486 | + <source_yp>-1</source_yp> | ||
1487 | + <target_xp>-1</target_xp> | ||
1488 | + <target_yp>-1</target_yp> | ||
1489 | + <referenced_column>null</referenced_column> | ||
1490 | + <referenced_complex_unique_key>null</referenced_complex_unique_key> | ||
1491 | + </relation> | ||
1475 | </connections> | 1492 | </connections> |
1476 | - <physical_name>i3geoestat_conexao</physical_name> | ||
1477 | - <logical_name>i3geoestat_conexao</logical_name> | ||
1478 | - <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados</description> | 1493 | + <physical_name>i3geoestat_classificacao</physical_name> |
1494 | + <logical_name>i3geoestat_classificacao</logical_name> | ||
1495 | + <description>Lista de classificacoes de uma medida de variável</description> | ||
1479 | <constraint></constraint> | 1496 | <constraint></constraint> |
1480 | <primary_key_name></primary_key_name> | 1497 | <primary_key_name></primary_key_name> |
1481 | <option></option> | 1498 | <option></option> |
1482 | <columns> | 1499 | <columns> |
1483 | <normal_column> | 1500 | <normal_column> |
1484 | - <word_id>2</word_id> | 1501 | + <word_id>28</word_id> |
1485 | <id>11</id> | 1502 | <id>11</id> |
1486 | <description></description> | 1503 | <description></description> |
1487 | <unique_key_name></unique_key_name> | 1504 | <unique_key_name></unique_key_name> |
@@ -1513,7 +1530,7 @@ | @@ -1513,7 +1530,7 @@ | ||
1513 | </sequence> | 1530 | </sequence> |
1514 | </normal_column> | 1531 | </normal_column> |
1515 | <normal_column> | 1532 | <normal_column> |
1516 | - <word_id>1</word_id> | 1533 | + <word_id>40</word_id> |
1517 | <id>12</id> | 1534 | <id>12</id> |
1518 | <description></description> | 1535 | <description></description> |
1519 | <unique_key_name></unique_key_name> | 1536 | <unique_key_name></unique_key_name> |
@@ -1545,17 +1562,18 @@ | @@ -1545,17 +1562,18 @@ | ||
1545 | </sequence> | 1562 | </sequence> |
1546 | </normal_column> | 1563 | </normal_column> |
1547 | <normal_column> | 1564 | <normal_column> |
1548 | - <word_id>24</word_id> | ||
1549 | <id>13</id> | 1565 | <id>13</id> |
1566 | + <referenced_column>31</referenced_column> | ||
1567 | + <relation>0</relation> | ||
1550 | <description></description> | 1568 | <description></description> |
1551 | <unique_key_name></unique_key_name> | 1569 | <unique_key_name></unique_key_name> |
1552 | <logical_name></logical_name> | 1570 | <logical_name></logical_name> |
1553 | <physical_name></physical_name> | 1571 | <physical_name></physical_name> |
1554 | - <type>text</type> | 1572 | + <type>integer</type> |
1555 | <constraint></constraint> | 1573 | <constraint></constraint> |
1556 | <default_value></default_value> | 1574 | <default_value></default_value> |
1557 | <auto_increment>false</auto_increment> | 1575 | <auto_increment>false</auto_increment> |
1558 | - <foreign_key>false</foreign_key> | 1576 | + <foreign_key>true</foreign_key> |
1559 | <not_null>false</not_null> | 1577 | <not_null>false</not_null> |
1560 | <primary_key>false</primary_key> | 1578 | <primary_key>false</primary_key> |
1561 | <unique_key>false</unique_key> | 1579 | <unique_key>false</unique_key> |
@@ -1577,7 +1595,7 @@ | @@ -1577,7 +1595,7 @@ | ||
1577 | </sequence> | 1595 | </sequence> |
1578 | </normal_column> | 1596 | </normal_column> |
1579 | <normal_column> | 1597 | <normal_column> |
1580 | - <word_id>51</word_id> | 1598 | + <word_id>45</word_id> |
1581 | <id>14</id> | 1599 | <id>14</id> |
1582 | <description></description> | 1600 | <description></description> |
1583 | <unique_key_name></unique_key_name> | 1601 | <unique_key_name></unique_key_name> |
@@ -1608,70 +1626,6 @@ | @@ -1608,70 +1626,6 @@ | ||
1608 | <decimal_size>0</decimal_size> | 1626 | <decimal_size>0</decimal_size> |
1609 | </sequence> | 1627 | </sequence> |
1610 | </normal_column> | 1628 | </normal_column> |
1611 | - <normal_column> | ||
1612 | - <word_id>61</word_id> | ||
1613 | - <id>15</id> | ||
1614 | - <description></description> | ||
1615 | - <unique_key_name></unique_key_name> | ||
1616 | - <logical_name></logical_name> | ||
1617 | - <physical_name></physical_name> | ||
1618 | - <type>text</type> | ||
1619 | - <constraint></constraint> | ||
1620 | - <default_value></default_value> | ||
1621 | - <auto_increment>false</auto_increment> | ||
1622 | - <foreign_key>false</foreign_key> | ||
1623 | - <not_null>false</not_null> | ||
1624 | - <primary_key>false</primary_key> | ||
1625 | - <unique_key>false</unique_key> | ||
1626 | - <character_set></character_set> | ||
1627 | - <collation></collation> | ||
1628 | - <sequence> | ||
1629 | - <name></name> | ||
1630 | - <schema></schema> | ||
1631 | - <increment></increment> | ||
1632 | - <min_value></min_value> | ||
1633 | - <max_value></max_value> | ||
1634 | - <start></start> | ||
1635 | - <cache></cache> | ||
1636 | - <cycle>false</cycle> | ||
1637 | - <order>false</order> | ||
1638 | - <description></description> | ||
1639 | - <data_type></data_type> | ||
1640 | - <decimal_size>0</decimal_size> | ||
1641 | - </sequence> | ||
1642 | - </normal_column> | ||
1643 | - <normal_column> | ||
1644 | - <word_id>52</word_id> | ||
1645 | - <id>16</id> | ||
1646 | - <description></description> | ||
1647 | - <unique_key_name></unique_key_name> | ||
1648 | - <logical_name></logical_name> | ||
1649 | - <physical_name></physical_name> | ||
1650 | - <type>text</type> | ||
1651 | - <constraint></constraint> | ||
1652 | - <default_value></default_value> | ||
1653 | - <auto_increment>false</auto_increment> | ||
1654 | - <foreign_key>false</foreign_key> | ||
1655 | - <not_null>false</not_null> | ||
1656 | - <primary_key>false</primary_key> | ||
1657 | - <unique_key>false</unique_key> | ||
1658 | - <character_set></character_set> | ||
1659 | - <collation></collation> | ||
1660 | - <sequence> | ||
1661 | - <name></name> | ||
1662 | - <schema></schema> | ||
1663 | - <increment></increment> | ||
1664 | - <min_value></min_value> | ||
1665 | - <max_value></max_value> | ||
1666 | - <start></start> | ||
1667 | - <cache></cache> | ||
1668 | - <cycle>false</cycle> | ||
1669 | - <order>false</order> | ||
1670 | - <description></description> | ||
1671 | - <data_type></data_type> | ||
1672 | - <decimal_size>0</decimal_size> | ||
1673 | - </sequence> | ||
1674 | - </normal_column> | ||
1675 | </columns> | 1629 | </columns> |
1676 | <indexes> | 1630 | <indexes> |
1677 | </indexes> | 1631 | </indexes> |
@@ -1683,12 +1637,12 @@ | @@ -1683,12 +1637,12 @@ | ||
1683 | </table> | 1637 | </table> |
1684 | <table> | 1638 | <table> |
1685 | <id>6</id> | 1639 | <id>6</id> |
1686 | - <height>128</height> | ||
1687 | - <width>247</width> | 1640 | + <height>317</height> |
1641 | + <width>210</width> | ||
1688 | <font_name>Ubuntu</font_name> | 1642 | <font_name>Ubuntu</font_name> |
1689 | <font_size>9</font_size> | 1643 | <font_size>9</font_size> |
1690 | - <x>673</x> | ||
1691 | - <y>-89</y> | 1644 | + <x>1018</x> |
1645 | + <y>-24</y> | ||
1692 | <color> | 1646 | <color> |
1693 | <r>230</r> | 1647 | <r>230</r> |
1694 | <g>230</g> | 1648 | <g>230</g> |
@@ -1696,8 +1650,8 @@ | @@ -1696,8 +1650,8 @@ | ||
1696 | </color> | 1650 | </color> |
1697 | <connections> | 1651 | <connections> |
1698 | <relation> | 1652 | <relation> |
1699 | - <id>0</id> | ||
1700 | - <source>9</source> | 1653 | + <id>1</id> |
1654 | + <source>5</source> | ||
1701 | <target>6</target> | 1655 | <target>6</target> |
1702 | <child_cardinality>1..n</child_cardinality> | 1656 | <child_cardinality>1..n</child_cardinality> |
1703 | <parent_cardinality>1</parent_cardinality> | 1657 | <parent_cardinality>1</parent_cardinality> |
@@ -1713,16 +1667,16 @@ | @@ -1713,16 +1667,16 @@ | ||
1713 | <referenced_complex_unique_key>null</referenced_complex_unique_key> | 1667 | <referenced_complex_unique_key>null</referenced_complex_unique_key> |
1714 | </relation> | 1668 | </relation> |
1715 | </connections> | 1669 | </connections> |
1716 | - <physical_name>i3geoestat_classificacao</physical_name> | ||
1717 | - <logical_name>i3geoestat_classificacao</logical_name> | ||
1718 | - <description>Lista de classificacoes de uma medida de variável</description> | 1670 | + <physical_name>i3geoestat_classes</physical_name> |
1671 | + <logical_name>i3geoestat_classes</logical_name> | ||
1672 | + <description>Classes pertencentes a uma classificação</description> | ||
1719 | <constraint></constraint> | 1673 | <constraint></constraint> |
1720 | <primary_key_name></primary_key_name> | 1674 | <primary_key_name></primary_key_name> |
1721 | <option></option> | 1675 | <option></option> |
1722 | <columns> | 1676 | <columns> |
1723 | <normal_column> | 1677 | <normal_column> |
1724 | - <word_id>28</word_id> | ||
1725 | - <id>17</id> | 1678 | + <word_id>27</word_id> |
1679 | + <id>15</id> | ||
1726 | <description></description> | 1680 | <description></description> |
1727 | <unique_key_name></unique_key_name> | 1681 | <unique_key_name></unique_key_name> |
1728 | <logical_name></logical_name> | 1682 | <logical_name></logical_name> |
@@ -1753,8 +1707,8 @@ | @@ -1753,8 +1707,8 @@ | ||
1753 | </sequence> | 1707 | </sequence> |
1754 | </normal_column> | 1708 | </normal_column> |
1755 | <normal_column> | 1709 | <normal_column> |
1756 | - <word_id>39</word_id> | ||
1757 | - <id>18</id> | 1710 | + <word_id>22</word_id> |
1711 | + <id>16</id> | ||
1758 | <description></description> | 1712 | <description></description> |
1759 | <unique_key_name></unique_key_name> | 1713 | <unique_key_name></unique_key_name> |
1760 | <logical_name></logical_name> | 1714 | <logical_name></logical_name> |
@@ -1785,18 +1739,17 @@ | @@ -1785,18 +1739,17 @@ | ||
1785 | </sequence> | 1739 | </sequence> |
1786 | </normal_column> | 1740 | </normal_column> |
1787 | <normal_column> | 1741 | <normal_column> |
1788 | - <id>19</id> | ||
1789 | - <referenced_column>37</referenced_column> | ||
1790 | - <relation>0</relation> | 1742 | + <word_id>60</word_id> |
1743 | + <id>17</id> | ||
1791 | <description></description> | 1744 | <description></description> |
1792 | <unique_key_name></unique_key_name> | 1745 | <unique_key_name></unique_key_name> |
1793 | <logical_name></logical_name> | 1746 | <logical_name></logical_name> |
1794 | <physical_name></physical_name> | 1747 | <physical_name></physical_name> |
1795 | - <type>integer</type> | 1748 | + <type>text</type> |
1796 | <constraint></constraint> | 1749 | <constraint></constraint> |
1797 | <default_value></default_value> | 1750 | <default_value></default_value> |
1798 | <auto_increment>false</auto_increment> | 1751 | <auto_increment>false</auto_increment> |
1799 | - <foreign_key>true</foreign_key> | 1752 | + <foreign_key>false</foreign_key> |
1800 | <not_null>false</not_null> | 1753 | <not_null>false</not_null> |
1801 | <primary_key>false</primary_key> | 1754 | <primary_key>false</primary_key> |
1802 | <unique_key>false</unique_key> | 1755 | <unique_key>false</unique_key> |
@@ -1818,8 +1771,8 @@ | @@ -1818,8 +1771,8 @@ | ||
1818 | </sequence> | 1771 | </sequence> |
1819 | </normal_column> | 1772 | </normal_column> |
1820 | <normal_column> | 1773 | <normal_column> |
1821 | - <word_id>45</word_id> | ||
1822 | - <id>20</id> | 1774 | + <word_id>63</word_id> |
1775 | + <id>18</id> | ||
1823 | <description></description> | 1776 | <description></description> |
1824 | <unique_key_name></unique_key_name> | 1777 | <unique_key_name></unique_key_name> |
1825 | <logical_name></logical_name> | 1778 | <logical_name></logical_name> |
@@ -1849,69 +1802,21 @@ | @@ -1849,69 +1802,21 @@ | ||
1849 | <decimal_size>0</decimal_size> | 1802 | <decimal_size>0</decimal_size> |
1850 | </sequence> | 1803 | </sequence> |
1851 | </normal_column> | 1804 | </normal_column> |
1852 | - </columns> | ||
1853 | - <indexes> | ||
1854 | - </indexes> | ||
1855 | - <complex_unique_key_list> | ||
1856 | - </complex_unique_key_list> | ||
1857 | - <table_properties> | ||
1858 | - <schema></schema> | ||
1859 | - </table_properties> | ||
1860 | - </table> | ||
1861 | - <table> | ||
1862 | - <id>7</id> | ||
1863 | - <height>317</height> | ||
1864 | - <width>210</width> | ||
1865 | - <font_name>Ubuntu</font_name> | ||
1866 | - <font_size>9</font_size> | ||
1867 | - <x>1018</x> | ||
1868 | - <y>-24</y> | ||
1869 | - <color> | ||
1870 | - <r>230</r> | ||
1871 | - <g>230</g> | ||
1872 | - <b>250</b> | ||
1873 | - </color> | ||
1874 | - <connections> | ||
1875 | - <relation> | ||
1876 | - <id>1</id> | ||
1877 | - <source>6</source> | ||
1878 | - <target>7</target> | ||
1879 | - <child_cardinality>1..n</child_cardinality> | ||
1880 | - <parent_cardinality>1</parent_cardinality> | ||
1881 | - <reference_for_pk>true</reference_for_pk> | ||
1882 | - <name></name> | ||
1883 | - <on_delete_action>RESTRICT</on_delete_action> | ||
1884 | - <on_update_action>RESTRICT</on_update_action> | ||
1885 | - <source_xp>-1</source_xp> | ||
1886 | - <source_yp>-1</source_yp> | ||
1887 | - <target_xp>-1</target_xp> | ||
1888 | - <target_yp>-1</target_yp> | ||
1889 | - <referenced_column>null</referenced_column> | ||
1890 | - <referenced_complex_unique_key>null</referenced_complex_unique_key> | ||
1891 | - </relation> | ||
1892 | - </connections> | ||
1893 | - <physical_name>i3geoestat_classes</physical_name> | ||
1894 | - <logical_name>i3geoestat_classes</logical_name> | ||
1895 | - <description>Classes pertencentes a uma classificação</description> | ||
1896 | - <constraint></constraint> | ||
1897 | - <primary_key_name></primary_key_name> | ||
1898 | - <option></option> | ||
1899 | - <columns> | ||
1900 | <normal_column> | 1805 | <normal_column> |
1901 | - <word_id>27</word_id> | ||
1902 | - <id>21</id> | 1806 | + <word_id>62</word_id> |
1807 | + <id>19</id> | ||
1903 | <description></description> | 1808 | <description></description> |
1904 | <unique_key_name></unique_key_name> | 1809 | <unique_key_name></unique_key_name> |
1905 | <logical_name></logical_name> | 1810 | <logical_name></logical_name> |
1906 | <physical_name></physical_name> | 1811 | <physical_name></physical_name> |
1907 | - <type>integer</type> | 1812 | + <type>text</type> |
1908 | <constraint></constraint> | 1813 | <constraint></constraint> |
1909 | <default_value></default_value> | 1814 | <default_value></default_value> |
1910 | - <auto_increment>true</auto_increment> | 1815 | + <auto_increment>false</auto_increment> |
1911 | <foreign_key>false</foreign_key> | 1816 | <foreign_key>false</foreign_key> |
1912 | - <not_null>true</not_null> | ||
1913 | - <primary_key>true</primary_key> | ||
1914 | - <unique_key>true</unique_key> | 1817 | + <not_null>false</not_null> |
1818 | + <primary_key>false</primary_key> | ||
1819 | + <unique_key>false</unique_key> | ||
1915 | <character_set></character_set> | 1820 | <character_set></character_set> |
1916 | <collation></collation> | 1821 | <collation></collation> |
1917 | <sequence> | 1822 | <sequence> |
@@ -1930,8 +1835,8 @@ | @@ -1930,8 +1835,8 @@ | ||
1930 | </sequence> | 1835 | </sequence> |
1931 | </normal_column> | 1836 | </normal_column> |
1932 | <normal_column> | 1837 | <normal_column> |
1933 | - <word_id>22</word_id> | ||
1934 | - <id>22</id> | 1838 | + <word_id>0</word_id> |
1839 | + <id>20</id> | ||
1935 | <description></description> | 1840 | <description></description> |
1936 | <unique_key_name></unique_key_name> | 1841 | <unique_key_name></unique_key_name> |
1937 | <logical_name></logical_name> | 1842 | <logical_name></logical_name> |
@@ -1962,17 +1867,18 @@ | @@ -1962,17 +1867,18 @@ | ||
1962 | </sequence> | 1867 | </sequence> |
1963 | </normal_column> | 1868 | </normal_column> |
1964 | <normal_column> | 1869 | <normal_column> |
1965 | - <word_id>60</word_id> | ||
1966 | - <id>23</id> | 1870 | + <id>21</id> |
1871 | + <referenced_column>11</referenced_column> | ||
1872 | + <relation>1</relation> | ||
1967 | <description></description> | 1873 | <description></description> |
1968 | <unique_key_name></unique_key_name> | 1874 | <unique_key_name></unique_key_name> |
1969 | <logical_name></logical_name> | 1875 | <logical_name></logical_name> |
1970 | <physical_name></physical_name> | 1876 | <physical_name></physical_name> |
1971 | - <type>text</type> | 1877 | + <type>integer</type> |
1972 | <constraint></constraint> | 1878 | <constraint></constraint> |
1973 | <default_value></default_value> | 1879 | <default_value></default_value> |
1974 | <auto_increment>false</auto_increment> | 1880 | <auto_increment>false</auto_increment> |
1975 | - <foreign_key>false</foreign_key> | 1881 | + <foreign_key>true</foreign_key> |
1976 | <not_null>false</not_null> | 1882 | <not_null>false</not_null> |
1977 | <primary_key>false</primary_key> | 1883 | <primary_key>false</primary_key> |
1978 | <unique_key>false</unique_key> | 1884 | <unique_key>false</unique_key> |
@@ -1994,8 +1900,8 @@ | @@ -1994,8 +1900,8 @@ | ||
1994 | </sequence> | 1900 | </sequence> |
1995 | </normal_column> | 1901 | </normal_column> |
1996 | <normal_column> | 1902 | <normal_column> |
1997 | - <word_id>63</word_id> | ||
1998 | - <id>24</id> | 1903 | + <word_id>58</word_id> |
1904 | + <id>22</id> | ||
1999 | <description></description> | 1905 | <description></description> |
2000 | <unique_key_name></unique_key_name> | 1906 | <unique_key_name></unique_key_name> |
2001 | <logical_name></logical_name> | 1907 | <logical_name></logical_name> |
@@ -2026,8 +1932,8 @@ | @@ -2026,8 +1932,8 @@ | ||
2026 | </sequence> | 1932 | </sequence> |
2027 | </normal_column> | 1933 | </normal_column> |
2028 | <normal_column> | 1934 | <normal_column> |
2029 | - <word_id>62</word_id> | ||
2030 | - <id>25</id> | 1935 | + <word_id>54</word_id> |
1936 | + <id>23</id> | ||
2031 | <description></description> | 1937 | <description></description> |
2032 | <unique_key_name></unique_key_name> | 1938 | <unique_key_name></unique_key_name> |
2033 | <logical_name></logical_name> | 1939 | <logical_name></logical_name> |
@@ -2058,8 +1964,8 @@ | @@ -2058,8 +1964,8 @@ | ||
2058 | </sequence> | 1964 | </sequence> |
2059 | </normal_column> | 1965 | </normal_column> |
2060 | <normal_column> | 1966 | <normal_column> |
2061 | - <word_id>0</word_id> | ||
2062 | - <id>26</id> | 1967 | + <word_id>48</word_id> |
1968 | + <id>24</id> | ||
2063 | <description></description> | 1969 | <description></description> |
2064 | <unique_key_name></unique_key_name> | 1970 | <unique_key_name></unique_key_name> |
2065 | <logical_name></logical_name> | 1971 | <logical_name></logical_name> |
@@ -2090,18 +1996,17 @@ | @@ -2090,18 +1996,17 @@ | ||
2090 | </sequence> | 1996 | </sequence> |
2091 | </normal_column> | 1997 | </normal_column> |
2092 | <normal_column> | 1998 | <normal_column> |
2093 | - <id>27</id> | ||
2094 | - <referenced_column>17</referenced_column> | ||
2095 | - <relation>1</relation> | 1999 | + <word_id>47</word_id> |
2000 | + <id>25</id> | ||
2096 | <description></description> | 2001 | <description></description> |
2097 | <unique_key_name></unique_key_name> | 2002 | <unique_key_name></unique_key_name> |
2098 | <logical_name></logical_name> | 2003 | <logical_name></logical_name> |
2099 | <physical_name></physical_name> | 2004 | <physical_name></physical_name> |
2100 | - <type>integer</type> | 2005 | + <type>text</type> |
2101 | <constraint></constraint> | 2006 | <constraint></constraint> |
2102 | <default_value></default_value> | 2007 | <default_value></default_value> |
2103 | <auto_increment>false</auto_increment> | 2008 | <auto_increment>false</auto_increment> |
2104 | - <foreign_key>true</foreign_key> | 2009 | + <foreign_key>false</foreign_key> |
2105 | <not_null>false</not_null> | 2010 | <not_null>false</not_null> |
2106 | <primary_key>false</primary_key> | 2011 | <primary_key>false</primary_key> |
2107 | <unique_key>false</unique_key> | 2012 | <unique_key>false</unique_key> |
@@ -2123,136 +2028,8 @@ | @@ -2123,136 +2028,8 @@ | ||
2123 | </sequence> | 2028 | </sequence> |
2124 | </normal_column> | 2029 | </normal_column> |
2125 | <normal_column> | 2030 | <normal_column> |
2126 | - <word_id>58</word_id> | ||
2127 | - <id>28</id> | ||
2128 | - <description></description> | ||
2129 | - <unique_key_name></unique_key_name> | ||
2130 | - <logical_name></logical_name> | ||
2131 | - <physical_name></physical_name> | ||
2132 | - <type>text</type> | ||
2133 | - <constraint></constraint> | ||
2134 | - <default_value></default_value> | ||
2135 | - <auto_increment>false</auto_increment> | ||
2136 | - <foreign_key>false</foreign_key> | ||
2137 | - <not_null>false</not_null> | ||
2138 | - <primary_key>false</primary_key> | ||
2139 | - <unique_key>false</unique_key> | ||
2140 | - <character_set></character_set> | ||
2141 | - <collation></collation> | ||
2142 | - <sequence> | ||
2143 | - <name></name> | ||
2144 | - <schema></schema> | ||
2145 | - <increment></increment> | ||
2146 | - <min_value></min_value> | ||
2147 | - <max_value></max_value> | ||
2148 | - <start></start> | ||
2149 | - <cache></cache> | ||
2150 | - <cycle>false</cycle> | ||
2151 | - <order>false</order> | ||
2152 | - <description></description> | ||
2153 | - <data_type></data_type> | ||
2154 | - <decimal_size>0</decimal_size> | ||
2155 | - </sequence> | ||
2156 | - </normal_column> | ||
2157 | - <normal_column> | ||
2158 | - <word_id>54</word_id> | ||
2159 | - <id>29</id> | ||
2160 | - <description></description> | ||
2161 | - <unique_key_name></unique_key_name> | ||
2162 | - <logical_name></logical_name> | ||
2163 | - <physical_name></physical_name> | ||
2164 | - <type>text</type> | ||
2165 | - <constraint></constraint> | ||
2166 | - <default_value></default_value> | ||
2167 | - <auto_increment>false</auto_increment> | ||
2168 | - <foreign_key>false</foreign_key> | ||
2169 | - <not_null>false</not_null> | ||
2170 | - <primary_key>false</primary_key> | ||
2171 | - <unique_key>false</unique_key> | ||
2172 | - <character_set></character_set> | ||
2173 | - <collation></collation> | ||
2174 | - <sequence> | ||
2175 | - <name></name> | ||
2176 | - <schema></schema> | ||
2177 | - <increment></increment> | ||
2178 | - <min_value></min_value> | ||
2179 | - <max_value></max_value> | ||
2180 | - <start></start> | ||
2181 | - <cache></cache> | ||
2182 | - <cycle>false</cycle> | ||
2183 | - <order>false</order> | ||
2184 | - <description></description> | ||
2185 | - <data_type></data_type> | ||
2186 | - <decimal_size>0</decimal_size> | ||
2187 | - </sequence> | ||
2188 | - </normal_column> | ||
2189 | - <normal_column> | ||
2190 | - <word_id>48</word_id> | ||
2191 | - <id>30</id> | ||
2192 | - <description></description> | ||
2193 | - <unique_key_name></unique_key_name> | ||
2194 | - <logical_name></logical_name> | ||
2195 | - <physical_name></physical_name> | ||
2196 | - <type>text</type> | ||
2197 | - <constraint></constraint> | ||
2198 | - <default_value></default_value> | ||
2199 | - <auto_increment>false</auto_increment> | ||
2200 | - <foreign_key>false</foreign_key> | ||
2201 | - <not_null>false</not_null> | ||
2202 | - <primary_key>false</primary_key> | ||
2203 | - <unique_key>false</unique_key> | ||
2204 | - <character_set></character_set> | ||
2205 | - <collation></collation> | ||
2206 | - <sequence> | ||
2207 | - <name></name> | ||
2208 | - <schema></schema> | ||
2209 | - <increment></increment> | ||
2210 | - <min_value></min_value> | ||
2211 | - <max_value></max_value> | ||
2212 | - <start></start> | ||
2213 | - <cache></cache> | ||
2214 | - <cycle>false</cycle> | ||
2215 | - <order>false</order> | ||
2216 | - <description></description> | ||
2217 | - <data_type></data_type> | ||
2218 | - <decimal_size>0</decimal_size> | ||
2219 | - </sequence> | ||
2220 | - </normal_column> | ||
2221 | - <normal_column> | ||
2222 | - <word_id>47</word_id> | ||
2223 | - <id>31</id> | ||
2224 | - <description></description> | ||
2225 | - <unique_key_name></unique_key_name> | ||
2226 | - <logical_name></logical_name> | ||
2227 | - <physical_name></physical_name> | ||
2228 | - <type>text</type> | ||
2229 | - <constraint></constraint> | ||
2230 | - <default_value></default_value> | ||
2231 | - <auto_increment>false</auto_increment> | ||
2232 | - <foreign_key>false</foreign_key> | ||
2233 | - <not_null>false</not_null> | ||
2234 | - <primary_key>false</primary_key> | ||
2235 | - <unique_key>false</unique_key> | ||
2236 | - <character_set></character_set> | ||
2237 | - <collation></collation> | ||
2238 | - <sequence> | ||
2239 | - <name></name> | ||
2240 | - <schema></schema> | ||
2241 | - <increment></increment> | ||
2242 | - <min_value></min_value> | ||
2243 | - <max_value></max_value> | ||
2244 | - <start></start> | ||
2245 | - <cache></cache> | ||
2246 | - <cycle>false</cycle> | ||
2247 | - <order>false</order> | ||
2248 | - <description></description> | ||
2249 | - <data_type></data_type> | ||
2250 | - <decimal_size>0</decimal_size> | ||
2251 | - </sequence> | ||
2252 | - </normal_column> | ||
2253 | - <normal_column> | ||
2254 | - <word_id>44</word_id> | ||
2255 | - <id>32</id> | 2031 | + <word_id>44</word_id> |
2032 | + <id>26</id> | ||
2256 | <description></description> | 2033 | <description></description> |
2257 | <unique_key_name></unique_key_name> | 2034 | <unique_key_name></unique_key_name> |
2258 | <logical_name></logical_name> | 2035 | <logical_name></logical_name> |
@@ -2284,7 +2061,7 @@ | @@ -2284,7 +2061,7 @@ | ||
2284 | </normal_column> | 2061 | </normal_column> |
2285 | <normal_column> | 2062 | <normal_column> |
2286 | <word_id>46</word_id> | 2063 | <word_id>46</word_id> |
2287 | - <id>33</id> | 2064 | + <id>27</id> |
2288 | <description></description> | 2065 | <description></description> |
2289 | <unique_key_name></unique_key_name> | 2066 | <unique_key_name></unique_key_name> |
2290 | <logical_name></logical_name> | 2067 | <logical_name></logical_name> |
@@ -2324,7 +2101,7 @@ | @@ -2324,7 +2101,7 @@ | ||
2324 | </table_properties> | 2101 | </table_properties> |
2325 | </table> | 2102 | </table> |
2326 | <table> | 2103 | <table> |
2327 | - <id>8</id> | 2104 | + <id>7</id> |
2328 | <height>107</height> | 2105 | <height>107</height> |
2329 | <width>228</width> | 2106 | <width>228</width> |
2330 | <font_name>Ubuntu</font_name> | 2107 | <font_name>Ubuntu</font_name> |
@@ -2347,7 +2124,7 @@ | @@ -2347,7 +2124,7 @@ | ||
2347 | <columns> | 2124 | <columns> |
2348 | <normal_column> | 2125 | <normal_column> |
2349 | <word_id>29</word_id> | 2126 | <word_id>29</word_id> |
2350 | - <id>34</id> | 2127 | + <id>28</id> |
2351 | <description></description> | 2128 | <description></description> |
2352 | <unique_key_name></unique_key_name> | 2129 | <unique_key_name></unique_key_name> |
2353 | <logical_name></logical_name> | 2130 | <logical_name></logical_name> |
@@ -2379,7 +2156,7 @@ | @@ -2379,7 +2156,7 @@ | ||
2379 | </normal_column> | 2156 | </normal_column> |
2380 | <normal_column> | 2157 | <normal_column> |
2381 | <word_id>59</word_id> | 2158 | <word_id>59</word_id> |
2382 | - <id>35</id> | 2159 | + <id>29</id> |
2383 | <description></description> | 2160 | <description></description> |
2384 | <unique_key_name></unique_key_name> | 2161 | <unique_key_name></unique_key_name> |
2385 | <logical_name></logical_name> | 2162 | <logical_name></logical_name> |
@@ -2410,8 +2187,8 @@ | @@ -2410,8 +2187,8 @@ | ||
2410 | </sequence> | 2187 | </sequence> |
2411 | </normal_column> | 2188 | </normal_column> |
2412 | <normal_column> | 2189 | <normal_column> |
2413 | - <word_id>34</word_id> | ||
2414 | - <id>36</id> | 2190 | + <word_id>35</word_id> |
2191 | + <id>30</id> | ||
2415 | <description></description> | 2192 | <description></description> |
2416 | <unique_key_name></unique_key_name> | 2193 | <unique_key_name></unique_key_name> |
2417 | <logical_name></logical_name> | 2194 | <logical_name></logical_name> |
@@ -2451,7 +2228,7 @@ | @@ -2451,7 +2228,7 @@ | ||
2451 | </table_properties> | 2228 | </table_properties> |
2452 | </table> | 2229 | </table> |
2453 | <table> | 2230 | <table> |
2454 | - <id>9</id> | 2231 | + <id>8</id> |
2455 | <height>339</height> | 2232 | <height>339</height> |
2456 | <width>292</width> | 2233 | <width>292</width> |
2457 | <font_name>Ubuntu</font_name> | 2234 | <font_name>Ubuntu</font_name> |
@@ -2466,8 +2243,8 @@ | @@ -2466,8 +2243,8 @@ | ||
2466 | <connections> | 2243 | <connections> |
2467 | <relation> | 2244 | <relation> |
2468 | <id>2</id> | 2245 | <id>2</id> |
2469 | - <source>13</source> | ||
2470 | - <target>9</target> | 2246 | + <source>4</source> |
2247 | + <target>8</target> | ||
2471 | <child_cardinality>1..n</child_cardinality> | 2248 | <child_cardinality>1..n</child_cardinality> |
2472 | <parent_cardinality>1</parent_cardinality> | 2249 | <parent_cardinality>1</parent_cardinality> |
2473 | <reference_for_pk>true</reference_for_pk> | 2250 | <reference_for_pk>true</reference_for_pk> |
@@ -2484,7 +2261,7 @@ | @@ -2484,7 +2261,7 @@ | ||
2484 | <relation> | 2261 | <relation> |
2485 | <id>3</id> | 2262 | <id>3</id> |
2486 | <source>3</source> | 2263 | <source>3</source> |
2487 | - <target>9</target> | 2264 | + <target>8</target> |
2488 | <child_cardinality>1..n</child_cardinality> | 2265 | <child_cardinality>1..n</child_cardinality> |
2489 | <parent_cardinality>1</parent_cardinality> | 2266 | <parent_cardinality>1</parent_cardinality> |
2490 | <reference_for_pk>true</reference_for_pk> | 2267 | <reference_for_pk>true</reference_for_pk> |
@@ -2500,8 +2277,8 @@ | @@ -2500,8 +2277,8 @@ | ||
2500 | </relation> | 2277 | </relation> |
2501 | <relation> | 2278 | <relation> |
2502 | <id>4</id> | 2279 | <id>4</id> |
2503 | - <source>4</source> | ||
2504 | - <target>9</target> | 2280 | + <source>14</source> |
2281 | + <target>8</target> | ||
2505 | <child_cardinality>1..n</child_cardinality> | 2282 | <child_cardinality>1..n</child_cardinality> |
2506 | <parent_cardinality>1</parent_cardinality> | 2283 | <parent_cardinality>1</parent_cardinality> |
2507 | <reference_for_pk>true</reference_for_pk> | 2284 | <reference_for_pk>true</reference_for_pk> |
@@ -2517,8 +2294,8 @@ | @@ -2517,8 +2294,8 @@ | ||
2517 | </relation> | 2294 | </relation> |
2518 | <relation> | 2295 | <relation> |
2519 | <id>5</id> | 2296 | <id>5</id> |
2520 | - <source>5</source> | ||
2521 | - <target>9</target> | 2297 | + <source>12</source> |
2298 | + <target>8</target> | ||
2522 | <child_cardinality>1..n</child_cardinality> | 2299 | <child_cardinality>1..n</child_cardinality> |
2523 | <parent_cardinality>1</parent_cardinality> | 2300 | <parent_cardinality>1</parent_cardinality> |
2524 | <reference_for_pk>true</reference_for_pk> | 2301 | <reference_for_pk>true</reference_for_pk> |
@@ -2535,7 +2312,7 @@ | @@ -2535,7 +2312,7 @@ | ||
2535 | <relation> | 2312 | <relation> |
2536 | <id>6</id> | 2313 | <id>6</id> |
2537 | <source>2</source> | 2314 | <source>2</source> |
2538 | - <target>9</target> | 2315 | + <target>8</target> |
2539 | <child_cardinality>1..n</child_cardinality> | 2316 | <child_cardinality>1..n</child_cardinality> |
2540 | <parent_cardinality>1</parent_cardinality> | 2317 | <parent_cardinality>1</parent_cardinality> |
2541 | <reference_for_pk>true</reference_for_pk> | 2318 | <reference_for_pk>true</reference_for_pk> |
@@ -2559,7 +2336,7 @@ | @@ -2559,7 +2336,7 @@ | ||
2559 | <columns> | 2336 | <columns> |
2560 | <normal_column> | 2337 | <normal_column> |
2561 | <word_id>31</word_id> | 2338 | <word_id>31</word_id> |
2562 | - <id>37</id> | 2339 | + <id>31</id> |
2563 | <description></description> | 2340 | <description></description> |
2564 | <unique_key_name></unique_key_name> | 2341 | <unique_key_name></unique_key_name> |
2565 | <logical_name></logical_name> | 2342 | <logical_name></logical_name> |
@@ -2590,7 +2367,7 @@ | @@ -2590,7 +2367,7 @@ | ||
2590 | </sequence> | 2367 | </sequence> |
2591 | </normal_column> | 2368 | </normal_column> |
2592 | <normal_column> | 2369 | <normal_column> |
2593 | - <id>38</id> | 2370 | + <id>32</id> |
2594 | <referenced_column>0</referenced_column> | 2371 | <referenced_column>0</referenced_column> |
2595 | <relation>6</relation> | 2372 | <relation>6</relation> |
2596 | <description></description> | 2373 | <description></description> |
@@ -2623,7 +2400,7 @@ | @@ -2623,7 +2400,7 @@ | ||
2623 | </sequence> | 2400 | </sequence> |
2624 | </normal_column> | 2401 | </normal_column> |
2625 | <normal_column> | 2402 | <normal_column> |
2626 | - <id>39</id> | 2403 | + <id>33</id> |
2627 | <referenced_column>5</referenced_column> | 2404 | <referenced_column>5</referenced_column> |
2628 | <relation>3</relation> | 2405 | <relation>3</relation> |
2629 | <description></description> | 2406 | <description></description> |
@@ -2656,9 +2433,9 @@ | @@ -2656,9 +2433,9 @@ | ||
2656 | </sequence> | 2433 | </sequence> |
2657 | </normal_column> | 2434 | </normal_column> |
2658 | <normal_column> | 2435 | <normal_column> |
2659 | - <id>40</id> | 2436 | + <id>34</id> |
2660 | <referenced_column>8</referenced_column> | 2437 | <referenced_column>8</referenced_column> |
2661 | - <relation>4</relation> | 2438 | + <relation>2</relation> |
2662 | <description></description> | 2439 | <description></description> |
2663 | <unique_key_name></unique_key_name> | 2440 | <unique_key_name></unique_key_name> |
2664 | <logical_name></logical_name> | 2441 | <logical_name></logical_name> |
@@ -2689,9 +2466,9 @@ | @@ -2689,9 +2466,9 @@ | ||
2689 | </sequence> | 2466 | </sequence> |
2690 | </normal_column> | 2467 | </normal_column> |
2691 | <normal_column> | 2468 | <normal_column> |
2692 | - <id>41</id> | ||
2693 | - <referenced_column>61</referenced_column> | ||
2694 | - <relation>2</relation> | 2469 | + <id>35</id> |
2470 | + <referenced_column>55</referenced_column> | ||
2471 | + <relation>5</relation> | ||
2695 | <description></description> | 2472 | <description></description> |
2696 | <unique_key_name></unique_key_name> | 2473 | <unique_key_name></unique_key_name> |
2697 | <logical_name></logical_name> | 2474 | <logical_name></logical_name> |
@@ -2722,9 +2499,9 @@ | @@ -2722,9 +2499,9 @@ | ||
2722 | </sequence> | 2499 | </sequence> |
2723 | </normal_column> | 2500 | </normal_column> |
2724 | <normal_column> | 2501 | <normal_column> |
2725 | - <id>42</id> | ||
2726 | - <referenced_column>11</referenced_column> | ||
2727 | - <relation>5</relation> | 2502 | + <id>36</id> |
2503 | + <referenced_column>71</referenced_column> | ||
2504 | + <relation>4</relation> | ||
2728 | <description></description> | 2505 | <description></description> |
2729 | <unique_key_name></unique_key_name> | 2506 | <unique_key_name></unique_key_name> |
2730 | <logical_name></logical_name> | 2507 | <logical_name></logical_name> |
@@ -2756,7 +2533,7 @@ | @@ -2756,7 +2533,7 @@ | ||
2756 | </normal_column> | 2533 | </normal_column> |
2757 | <normal_column> | 2534 | <normal_column> |
2758 | <word_id>20</word_id> | 2535 | <word_id>20</word_id> |
2759 | - <id>43</id> | 2536 | + <id>37</id> |
2760 | <description></description> | 2537 | <description></description> |
2761 | <unique_key_name></unique_key_name> | 2538 | <unique_key_name></unique_key_name> |
2762 | <logical_name></logical_name> | 2539 | <logical_name></logical_name> |
@@ -2788,7 +2565,7 @@ | @@ -2788,7 +2565,7 @@ | ||
2788 | </normal_column> | 2565 | </normal_column> |
2789 | <normal_column> | 2566 | <normal_column> |
2790 | <word_id>56</word_id> | 2567 | <word_id>56</word_id> |
2791 | - <id>44</id> | 2568 | + <id>38</id> |
2792 | <description></description> | 2569 | <description></description> |
2793 | <unique_key_name></unique_key_name> | 2570 | <unique_key_name></unique_key_name> |
2794 | <logical_name></logical_name> | 2571 | <logical_name></logical_name> |
@@ -2820,7 +2597,7 @@ | @@ -2820,7 +2597,7 @@ | ||
2820 | </normal_column> | 2597 | </normal_column> |
2821 | <normal_column> | 2598 | <normal_column> |
2822 | <word_id>14</word_id> | 2599 | <word_id>14</word_id> |
2823 | - <id>45</id> | 2600 | + <id>39</id> |
2824 | <description></description> | 2601 | <description></description> |
2825 | <unique_key_name></unique_key_name> | 2602 | <unique_key_name></unique_key_name> |
2826 | <logical_name></logical_name> | 2603 | <logical_name></logical_name> |
@@ -2852,7 +2629,7 @@ | @@ -2852,7 +2629,7 @@ | ||
2852 | </normal_column> | 2629 | </normal_column> |
2853 | <normal_column> | 2630 | <normal_column> |
2854 | <word_id>11</word_id> | 2631 | <word_id>11</word_id> |
2855 | - <id>46</id> | 2632 | + <id>40</id> |
2856 | <description></description> | 2633 | <description></description> |
2857 | <unique_key_name></unique_key_name> | 2634 | <unique_key_name></unique_key_name> |
2858 | <logical_name></logical_name> | 2635 | <logical_name></logical_name> |
@@ -2884,7 +2661,7 @@ | @@ -2884,7 +2661,7 @@ | ||
2884 | </normal_column> | 2661 | </normal_column> |
2885 | <normal_column> | 2662 | <normal_column> |
2886 | <word_id>23</word_id> | 2663 | <word_id>23</word_id> |
2887 | - <id>47</id> | 2664 | + <id>41</id> |
2888 | <description></description> | 2665 | <description></description> |
2889 | <unique_key_name></unique_key_name> | 2666 | <unique_key_name></unique_key_name> |
2890 | <logical_name></logical_name> | 2667 | <logical_name></logical_name> |
@@ -2916,7 +2693,7 @@ | @@ -2916,7 +2693,7 @@ | ||
2916 | </normal_column> | 2693 | </normal_column> |
2917 | <normal_column> | 2694 | <normal_column> |
2918 | <word_id>42</word_id> | 2695 | <word_id>42</word_id> |
2919 | - <id>48</id> | 2696 | + <id>42</id> |
2920 | <description></description> | 2697 | <description></description> |
2921 | <unique_key_name></unique_key_name> | 2698 | <unique_key_name></unique_key_name> |
2922 | <logical_name></logical_name> | 2699 | <logical_name></logical_name> |
@@ -2956,7 +2733,7 @@ | @@ -2956,7 +2733,7 @@ | ||
2956 | </table_properties> | 2733 | </table_properties> |
2957 | </table> | 2734 | </table> |
2958 | <table> | 2735 | <table> |
2959 | - <id>10</id> | 2736 | + <id>9</id> |
2960 | <height>128</height> | 2737 | <height>128</height> |
2961 | <width>269</width> | 2738 | <width>269</width> |
2962 | <font_name>Ubuntu</font_name> | 2739 | <font_name>Ubuntu</font_name> |
@@ -2971,8 +2748,8 @@ | @@ -2971,8 +2748,8 @@ | ||
2971 | <connections> | 2748 | <connections> |
2972 | <relation> | 2749 | <relation> |
2973 | <id>7</id> | 2750 | <id>7</id> |
2974 | - <source>9</source> | ||
2975 | - <target>10</target> | 2751 | + <source>8</source> |
2752 | + <target>9</target> | ||
2976 | <child_cardinality>1..n</child_cardinality> | 2753 | <child_cardinality>1..n</child_cardinality> |
2977 | <parent_cardinality>1</parent_cardinality> | 2754 | <parent_cardinality>1</parent_cardinality> |
2978 | <reference_for_pk>true</reference_for_pk> | 2755 | <reference_for_pk>true</reference_for_pk> |
@@ -2995,8 +2772,8 @@ | @@ -2995,8 +2772,8 @@ | ||
2995 | <option></option> | 2772 | <option></option> |
2996 | <columns> | 2773 | <columns> |
2997 | <normal_column> | 2774 | <normal_column> |
2998 | - <word_id>35</word_id> | ||
2999 | - <id>49</id> | 2775 | + <word_id>34</word_id> |
2776 | + <id>43</id> | ||
3000 | <description></description> | 2777 | <description></description> |
3001 | <unique_key_name></unique_key_name> | 2778 | <unique_key_name></unique_key_name> |
3002 | <logical_name></logical_name> | 2779 | <logical_name></logical_name> |
@@ -3027,8 +2804,8 @@ | @@ -3027,8 +2804,8 @@ | ||
3027 | </sequence> | 2804 | </sequence> |
3028 | </normal_column> | 2805 | </normal_column> |
3029 | <normal_column> | 2806 | <normal_column> |
3030 | - <id>50</id> | ||
3031 | - <referenced_column>37</referenced_column> | 2807 | + <id>44</id> |
2808 | + <referenced_column>31</referenced_column> | ||
3032 | <relation>7</relation> | 2809 | <relation>7</relation> |
3033 | <description></description> | 2810 | <description></description> |
3034 | <unique_key_name></unique_key_name> | 2811 | <unique_key_name></unique_key_name> |
@@ -3060,8 +2837,8 @@ | @@ -3060,8 +2837,8 @@ | ||
3060 | </sequence> | 2837 | </sequence> |
3061 | </normal_column> | 2838 | </normal_column> |
3062 | <normal_column> | 2839 | <normal_column> |
3063 | - <word_id>40</word_id> | ||
3064 | - <id>51</id> | 2840 | + <word_id>39</word_id> |
2841 | + <id>45</id> | ||
3065 | <description></description> | 2842 | <description></description> |
3066 | <unique_key_name></unique_key_name> | 2843 | <unique_key_name></unique_key_name> |
3067 | <logical_name></logical_name> | 2844 | <logical_name></logical_name> |
@@ -3093,7 +2870,7 @@ | @@ -3093,7 +2870,7 @@ | ||
3093 | </normal_column> | 2870 | </normal_column> |
3094 | <normal_column> | 2871 | <normal_column> |
3095 | <word_id>30</word_id> | 2872 | <word_id>30</word_id> |
3096 | - <id>52</id> | 2873 | + <id>46</id> |
3097 | <description></description> | 2874 | <description></description> |
3098 | <unique_key_name></unique_key_name> | 2875 | <unique_key_name></unique_key_name> |
3099 | <logical_name></logical_name> | 2876 | <logical_name></logical_name> |
@@ -3133,7 +2910,7 @@ | @@ -3133,7 +2910,7 @@ | ||
3133 | </table_properties> | 2910 | </table_properties> |
3134 | </table> | 2911 | </table> |
3135 | <table> | 2912 | <table> |
3136 | - <id>11</id> | 2913 | + <id>10</id> |
3137 | <height>86</height> | 2914 | <height>86</height> |
3138 | <width>269</width> | 2915 | <width>269</width> |
3139 | <font_name>Ubuntu</font_name> | 2916 | <font_name>Ubuntu</font_name> |
@@ -3149,7 +2926,7 @@ | @@ -3149,7 +2926,7 @@ | ||
3149 | <relation> | 2926 | <relation> |
3150 | <id>8</id> | 2927 | <id>8</id> |
3151 | <source>8</source> | 2928 | <source>8</source> |
3152 | - <target>11</target> | 2929 | + <target>10</target> |
3153 | <child_cardinality>1..n</child_cardinality> | 2930 | <child_cardinality>1..n</child_cardinality> |
3154 | <parent_cardinality>1</parent_cardinality> | 2931 | <parent_cardinality>1</parent_cardinality> |
3155 | <reference_for_pk>true</reference_for_pk> | 2932 | <reference_for_pk>true</reference_for_pk> |
@@ -3165,8 +2942,8 @@ | @@ -3165,8 +2942,8 @@ | ||
3165 | </relation> | 2942 | </relation> |
3166 | <relation> | 2943 | <relation> |
3167 | <id>9</id> | 2944 | <id>9</id> |
3168 | - <source>9</source> | ||
3169 | - <target>11</target> | 2945 | + <source>7</source> |
2946 | + <target>10</target> | ||
3170 | <child_cardinality>1..n</child_cardinality> | 2947 | <child_cardinality>1..n</child_cardinality> |
3171 | <parent_cardinality>1</parent_cardinality> | 2948 | <parent_cardinality>1</parent_cardinality> |
3172 | <reference_for_pk>true</reference_for_pk> | 2949 | <reference_for_pk>true</reference_for_pk> |
@@ -3189,9 +2966,9 @@ | @@ -3189,9 +2966,9 @@ | ||
3189 | <option></option> | 2966 | <option></option> |
3190 | <columns> | 2967 | <columns> |
3191 | <normal_column> | 2968 | <normal_column> |
3192 | - <id>53</id> | ||
3193 | - <referenced_column>37</referenced_column> | ||
3194 | - <relation>9</relation> | 2969 | + <id>47</id> |
2970 | + <referenced_column>31</referenced_column> | ||
2971 | + <relation>8</relation> | ||
3195 | <description></description> | 2972 | <description></description> |
3196 | <unique_key_name></unique_key_name> | 2973 | <unique_key_name></unique_key_name> |
3197 | <logical_name></logical_name> | 2974 | <logical_name></logical_name> |
@@ -3222,9 +2999,9 @@ | @@ -3222,9 +2999,9 @@ | ||
3222 | </sequence> | 2999 | </sequence> |
3223 | </normal_column> | 3000 | </normal_column> |
3224 | <normal_column> | 3001 | <normal_column> |
3225 | - <id>54</id> | ||
3226 | - <referenced_column>34</referenced_column> | ||
3227 | - <relation>8</relation> | 3002 | + <id>48</id> |
3003 | + <referenced_column>28</referenced_column> | ||
3004 | + <relation>9</relation> | ||
3228 | <description></description> | 3005 | <description></description> |
3229 | <unique_key_name></unique_key_name> | 3006 | <unique_key_name></unique_key_name> |
3230 | <logical_name></logical_name> | 3007 | <logical_name></logical_name> |
@@ -3264,7 +3041,7 @@ | @@ -3264,7 +3041,7 @@ | ||
3264 | </table_properties> | 3041 | </table_properties> |
3265 | </table> | 3042 | </table> |
3266 | <table> | 3043 | <table> |
3267 | - <id>12</id> | 3044 | + <id>11</id> |
3268 | <height>170</height> | 3045 | <height>170</height> |
3269 | <width>292</width> | 3046 | <width>292</width> |
3270 | <font_name>Ubuntu</font_name> | 3047 | <font_name>Ubuntu</font_name> |
@@ -3279,8 +3056,8 @@ | @@ -3279,8 +3056,8 @@ | ||
3279 | <connections> | 3056 | <connections> |
3280 | <relation> | 3057 | <relation> |
3281 | <id>10</id> | 3058 | <id>10</id> |
3282 | - <source>9</source> | ||
3283 | - <target>12</target> | 3059 | + <source>8</source> |
3060 | + <target>11</target> | ||
3284 | <child_cardinality>1..n</child_cardinality> | 3061 | <child_cardinality>1..n</child_cardinality> |
3285 | <parent_cardinality>1</parent_cardinality> | 3062 | <parent_cardinality>1</parent_cardinality> |
3286 | <reference_for_pk>true</reference_for_pk> | 3063 | <reference_for_pk>true</reference_for_pk> |
@@ -3304,7 +3081,7 @@ | @@ -3304,7 +3081,7 @@ | ||
3304 | <columns> | 3081 | <columns> |
3305 | <normal_column> | 3082 | <normal_column> |
3306 | <word_id>33</word_id> | 3083 | <word_id>33</word_id> |
3307 | - <id>55</id> | 3084 | + <id>49</id> |
3308 | <description></description> | 3085 | <description></description> |
3309 | <unique_key_name></unique_key_name> | 3086 | <unique_key_name></unique_key_name> |
3310 | <logical_name></logical_name> | 3087 | <logical_name></logical_name> |
@@ -3336,7 +3113,7 @@ | @@ -3336,7 +3113,7 @@ | ||
3336 | </normal_column> | 3113 | </normal_column> |
3337 | <normal_column> | 3114 | <normal_column> |
3338 | <word_id>8</word_id> | 3115 | <word_id>8</word_id> |
3339 | - <id>56</id> | 3116 | + <id>50</id> |
3340 | <description></description> | 3117 | <description></description> |
3341 | <unique_key_name></unique_key_name> | 3118 | <unique_key_name></unique_key_name> |
3342 | <logical_name></logical_name> | 3119 | <logical_name></logical_name> |
@@ -3367,8 +3144,8 @@ | @@ -3367,8 +3144,8 @@ | ||
3367 | </sequence> | 3144 | </sequence> |
3368 | </normal_column> | 3145 | </normal_column> |
3369 | <normal_column> | 3146 | <normal_column> |
3370 | - <word_id>36</word_id> | ||
3371 | - <id>57</id> | 3147 | + <word_id>38</word_id> |
3148 | + <id>51</id> | ||
3372 | <description></description> | 3149 | <description></description> |
3373 | <unique_key_name></unique_key_name> | 3150 | <unique_key_name></unique_key_name> |
3374 | <logical_name></logical_name> | 3151 | <logical_name></logical_name> |
@@ -3399,8 +3176,8 @@ | @@ -3399,8 +3176,8 @@ | ||
3399 | </sequence> | 3176 | </sequence> |
3400 | </normal_column> | 3177 | </normal_column> |
3401 | <normal_column> | 3178 | <normal_column> |
3402 | - <word_id>16</word_id> | ||
3403 | - <id>58</id> | 3179 | + <word_id>17</word_id> |
3180 | + <id>52</id> | ||
3404 | <description></description> | 3181 | <description></description> |
3405 | <unique_key_name></unique_key_name> | 3182 | <unique_key_name></unique_key_name> |
3406 | <logical_name></logical_name> | 3183 | <logical_name></logical_name> |
@@ -3432,7 +3209,7 @@ | @@ -3432,7 +3209,7 @@ | ||
3432 | </normal_column> | 3209 | </normal_column> |
3433 | <normal_column> | 3210 | <normal_column> |
3434 | <word_id>32</word_id> | 3211 | <word_id>32</word_id> |
3435 | - <id>59</id> | 3212 | + <id>53</id> |
3436 | <description></description> | 3213 | <description></description> |
3437 | <unique_key_name></unique_key_name> | 3214 | <unique_key_name></unique_key_name> |
3438 | <logical_name></logical_name> | 3215 | <logical_name></logical_name> |
@@ -3463,8 +3240,8 @@ | @@ -3463,8 +3240,8 @@ | ||
3463 | </sequence> | 3240 | </sequence> |
3464 | </normal_column> | 3241 | </normal_column> |
3465 | <normal_column> | 3242 | <normal_column> |
3466 | - <id>60</id> | ||
3467 | - <referenced_column>37</referenced_column> | 3243 | + <id>54</id> |
3244 | + <referenced_column>31</referenced_column> | ||
3468 | <relation>10</relation> | 3245 | <relation>10</relation> |
3469 | <description></description> | 3246 | <description></description> |
3470 | <unique_key_name></unique_key_name> | 3247 | <unique_key_name></unique_key_name> |
@@ -3505,7 +3282,7 @@ | @@ -3505,7 +3282,7 @@ | ||
3505 | </table_properties> | 3282 | </table_properties> |
3506 | </table> | 3283 | </table> |
3507 | <table> | 3284 | <table> |
3508 | - <id>13</id> | 3285 | + <id>12</id> |
3509 | <height>275</height> | 3286 | <height>275</height> |
3510 | <width>292</width> | 3287 | <width>292</width> |
3511 | <font_name>Ubuntu</font_name> | 3288 | <font_name>Ubuntu</font_name> |
@@ -3520,8 +3297,8 @@ | @@ -3520,8 +3297,8 @@ | ||
3520 | <connections> | 3297 | <connections> |
3521 | <relation> | 3298 | <relation> |
3522 | <id>11</id> | 3299 | <id>11</id> |
3523 | - <source>5</source> | ||
3524 | - <target>13</target> | 3300 | + <source>14</source> |
3301 | + <target>12</target> | ||
3525 | <child_cardinality>1..n</child_cardinality> | 3302 | <child_cardinality>1..n</child_cardinality> |
3526 | <parent_cardinality>1</parent_cardinality> | 3303 | <parent_cardinality>1</parent_cardinality> |
3527 | <reference_for_pk>true</reference_for_pk> | 3304 | <reference_for_pk>true</reference_for_pk> |
@@ -3545,7 +3322,7 @@ | @@ -3545,7 +3322,7 @@ | ||
3545 | <columns> | 3322 | <columns> |
3546 | <normal_column> | 3323 | <normal_column> |
3547 | <word_id>4</word_id> | 3324 | <word_id>4</word_id> |
3548 | - <id>61</id> | 3325 | + <id>55</id> |
3549 | <description></description> | 3326 | <description></description> |
3550 | <unique_key_name></unique_key_name> | 3327 | <unique_key_name></unique_key_name> |
3551 | <logical_name></logical_name> | 3328 | <logical_name></logical_name> |
@@ -3577,7 +3354,7 @@ | @@ -3577,7 +3354,7 @@ | ||
3577 | </normal_column> | 3354 | </normal_column> |
3578 | <normal_column> | 3355 | <normal_column> |
3579 | <word_id>43</word_id> | 3356 | <word_id>43</word_id> |
3580 | - <id>62</id> | 3357 | + <id>56</id> |
3581 | <description></description> | 3358 | <description></description> |
3582 | <unique_key_name></unique_key_name> | 3359 | <unique_key_name></unique_key_name> |
3583 | <logical_name></logical_name> | 3360 | <logical_name></logical_name> |
@@ -3609,7 +3386,7 @@ | @@ -3609,7 +3386,7 @@ | ||
3609 | </normal_column> | 3386 | </normal_column> |
3610 | <normal_column> | 3387 | <normal_column> |
3611 | <word_id>19</word_id> | 3388 | <word_id>19</word_id> |
3612 | - <id>63</id> | 3389 | + <id>57</id> |
3613 | <description></description> | 3390 | <description></description> |
3614 | <unique_key_name></unique_key_name> | 3391 | <unique_key_name></unique_key_name> |
3615 | <logical_name></logical_name> | 3392 | <logical_name></logical_name> |
@@ -3640,8 +3417,8 @@ | @@ -3640,8 +3417,8 @@ | ||
3640 | </sequence> | 3417 | </sequence> |
3641 | </normal_column> | 3418 | </normal_column> |
3642 | <normal_column> | 3419 | <normal_column> |
3643 | - <id>64</id> | ||
3644 | - <referenced_column>11</referenced_column> | 3420 | + <id>58</id> |
3421 | + <referenced_column>71</referenced_column> | ||
3645 | <relation>11</relation> | 3422 | <relation>11</relation> |
3646 | <description></description> | 3423 | <description></description> |
3647 | <unique_key_name></unique_key_name> | 3424 | <unique_key_name></unique_key_name> |
@@ -3674,7 +3451,7 @@ | @@ -3674,7 +3451,7 @@ | ||
3674 | </normal_column> | 3451 | </normal_column> |
3675 | <normal_column> | 3452 | <normal_column> |
3676 | <word_id>21</word_id> | 3453 | <word_id>21</word_id> |
3677 | - <id>65</id> | 3454 | + <id>59</id> |
3678 | <description></description> | 3455 | <description></description> |
3679 | <unique_key_name></unique_key_name> | 3456 | <unique_key_name></unique_key_name> |
3680 | <logical_name></logical_name> | 3457 | <logical_name></logical_name> |
@@ -3706,7 +3483,7 @@ | @@ -3706,7 +3483,7 @@ | ||
3706 | </normal_column> | 3483 | </normal_column> |
3707 | <normal_column> | 3484 | <normal_column> |
3708 | <word_id>57</word_id> | 3485 | <word_id>57</word_id> |
3709 | - <id>66</id> | 3486 | + <id>60</id> |
3710 | <description></description> | 3487 | <description></description> |
3711 | <unique_key_name></unique_key_name> | 3488 | <unique_key_name></unique_key_name> |
3712 | <logical_name></logical_name> | 3489 | <logical_name></logical_name> |
@@ -3738,7 +3515,7 @@ | @@ -3738,7 +3515,7 @@ | ||
3738 | </normal_column> | 3515 | </normal_column> |
3739 | <normal_column> | 3516 | <normal_column> |
3740 | <word_id>10</word_id> | 3517 | <word_id>10</word_id> |
3741 | - <id>67</id> | 3518 | + <id>61</id> |
3742 | <description></description> | 3519 | <description></description> |
3743 | <unique_key_name></unique_key_name> | 3520 | <unique_key_name></unique_key_name> |
3744 | <logical_name></logical_name> | 3521 | <logical_name></logical_name> |
@@ -3770,7 +3547,7 @@ | @@ -3770,7 +3547,7 @@ | ||
3770 | </normal_column> | 3547 | </normal_column> |
3771 | <normal_column> | 3548 | <normal_column> |
3772 | <word_id>15</word_id> | 3549 | <word_id>15</word_id> |
3773 | - <id>68</id> | 3550 | + <id>62</id> |
3774 | <description></description> | 3551 | <description></description> |
3775 | <unique_key_name></unique_key_name> | 3552 | <unique_key_name></unique_key_name> |
3776 | <logical_name></logical_name> | 3553 | <logical_name></logical_name> |
@@ -3802,7 +3579,7 @@ | @@ -3802,7 +3579,7 @@ | ||
3802 | </normal_column> | 3579 | </normal_column> |
3803 | <normal_column> | 3580 | <normal_column> |
3804 | <word_id>25</word_id> | 3581 | <word_id>25</word_id> |
3805 | - <id>69</id> | 3582 | + <id>63</id> |
3806 | <description></description> | 3583 | <description></description> |
3807 | <unique_key_name></unique_key_name> | 3584 | <unique_key_name></unique_key_name> |
3808 | <logical_name></logical_name> | 3585 | <logical_name></logical_name> |
@@ -3834,7 +3611,7 @@ | @@ -3834,7 +3611,7 @@ | ||
3834 | </normal_column> | 3611 | </normal_column> |
3835 | <normal_column> | 3612 | <normal_column> |
3836 | <word_id>13</word_id> | 3613 | <word_id>13</word_id> |
3837 | - <id>70</id> | 3614 | + <id>64</id> |
3838 | <description></description> | 3615 | <description></description> |
3839 | <unique_key_name></unique_key_name> | 3616 | <unique_key_name></unique_key_name> |
3840 | <logical_name></logical_name> | 3617 | <logical_name></logical_name> |
@@ -3866,7 +3643,7 @@ | @@ -3866,7 +3643,7 @@ | ||
3866 | </normal_column> | 3643 | </normal_column> |
3867 | <normal_column> | 3644 | <normal_column> |
3868 | <word_id>55</word_id> | 3645 | <word_id>55</word_id> |
3869 | - <id>71</id> | 3646 | + <id>65</id> |
3870 | <description></description> | 3647 | <description></description> |
3871 | <unique_key_name></unique_key_name> | 3648 | <unique_key_name></unique_key_name> |
3872 | <logical_name></logical_name> | 3649 | <logical_name></logical_name> |
@@ -3898,7 +3675,7 @@ | @@ -3898,7 +3675,7 @@ | ||
3898 | </normal_column> | 3675 | </normal_column> |
3899 | <normal_column> | 3676 | <normal_column> |
3900 | <word_id>9</word_id> | 3677 | <word_id>9</word_id> |
3901 | - <id>72</id> | 3678 | + <id>66</id> |
3902 | <description></description> | 3679 | <description></description> |
3903 | <unique_key_name></unique_key_name> | 3680 | <unique_key_name></unique_key_name> |
3904 | <logical_name></logical_name> | 3681 | <logical_name></logical_name> |
@@ -3938,7 +3715,7 @@ | @@ -3938,7 +3715,7 @@ | ||
3938 | </table_properties> | 3715 | </table_properties> |
3939 | </table> | 3716 | </table> |
3940 | <table> | 3717 | <table> |
3941 | - <id>14</id> | 3718 | + <id>13</id> |
3942 | <height>128</height> | 3719 | <height>128</height> |
3943 | <width>270</width> | 3720 | <width>270</width> |
3944 | <font_name>Ubuntu</font_name> | 3721 | <font_name>Ubuntu</font_name> |
@@ -3953,8 +3730,8 @@ | @@ -3953,8 +3730,8 @@ | ||
3953 | <connections> | 3730 | <connections> |
3954 | <relation> | 3731 | <relation> |
3955 | <id>12</id> | 3732 | <id>12</id> |
3956 | - <source>13</source> | ||
3957 | - <target>14</target> | 3733 | + <source>12</source> |
3734 | + <target>13</target> | ||
3958 | <child_cardinality>1..n</child_cardinality> | 3735 | <child_cardinality>1..n</child_cardinality> |
3959 | <parent_cardinality>1</parent_cardinality> | 3736 | <parent_cardinality>1</parent_cardinality> |
3960 | <reference_for_pk>true</reference_for_pk> | 3737 | <reference_for_pk>true</reference_for_pk> |
@@ -3978,7 +3755,7 @@ | @@ -3978,7 +3755,7 @@ | ||
3978 | <columns> | 3755 | <columns> |
3979 | <normal_column> | 3756 | <normal_column> |
3980 | <word_id>26</word_id> | 3757 | <word_id>26</word_id> |
3981 | - <id>73</id> | 3758 | + <id>67</id> |
3982 | <description></description> | 3759 | <description></description> |
3983 | <unique_key_name></unique_key_name> | 3760 | <unique_key_name></unique_key_name> |
3984 | <logical_name></logical_name> | 3761 | <logical_name></logical_name> |
@@ -4009,8 +3786,8 @@ | @@ -4009,8 +3786,8 @@ | ||
4009 | </sequence> | 3786 | </sequence> |
4010 | </normal_column> | 3787 | </normal_column> |
4011 | <normal_column> | 3788 | <normal_column> |
4012 | - <id>74</id> | ||
4013 | - <referenced_column>61</referenced_column> | 3789 | + <id>68</id> |
3790 | + <referenced_column>55</referenced_column> | ||
4014 | <relation>12</relation> | 3791 | <relation>12</relation> |
4015 | <description></description> | 3792 | <description></description> |
4016 | <unique_key_name></unique_key_name> | 3793 | <unique_key_name></unique_key_name> |
@@ -4043,7 +3820,7 @@ | @@ -4043,7 +3820,7 @@ | ||
4043 | </normal_column> | 3820 | </normal_column> |
4044 | <normal_column> | 3821 | <normal_column> |
4045 | <word_id>5</word_id> | 3822 | <word_id>5</word_id> |
4046 | - <id>75</id> | 3823 | + <id>69</id> |
4047 | <description></description> | 3824 | <description></description> |
4048 | <unique_key_name></unique_key_name> | 3825 | <unique_key_name></unique_key_name> |
4049 | <logical_name></logical_name> | 3826 | <logical_name></logical_name> |
@@ -4075,6 +3852,229 @@ | @@ -4075,6 +3852,229 @@ | ||
4075 | </normal_column> | 3852 | </normal_column> |
4076 | <normal_column> | 3853 | <normal_column> |
4077 | <word_id>12</word_id> | 3854 | <word_id>12</word_id> |
3855 | + <id>70</id> | ||
3856 | + <description></description> | ||
3857 | + <unique_key_name></unique_key_name> | ||
3858 | + <logical_name></logical_name> | ||
3859 | + <physical_name></physical_name> | ||
3860 | + <type>text</type> | ||
3861 | + <constraint></constraint> | ||
3862 | + <default_value></default_value> | ||
3863 | + <auto_increment>false</auto_increment> | ||
3864 | + <foreign_key>false</foreign_key> | ||
3865 | + <not_null>false</not_null> | ||
3866 | + <primary_key>false</primary_key> | ||
3867 | + <unique_key>false</unique_key> | ||
3868 | + <character_set></character_set> | ||
3869 | + <collation></collation> | ||
3870 | + <sequence> | ||
3871 | + <name></name> | ||
3872 | + <schema></schema> | ||
3873 | + <increment></increment> | ||
3874 | + <min_value></min_value> | ||
3875 | + <max_value></max_value> | ||
3876 | + <start></start> | ||
3877 | + <cache></cache> | ||
3878 | + <cycle>false</cycle> | ||
3879 | + <order>false</order> | ||
3880 | + <description></description> | ||
3881 | + <data_type></data_type> | ||
3882 | + <decimal_size>0</decimal_size> | ||
3883 | + </sequence> | ||
3884 | + </normal_column> | ||
3885 | + </columns> | ||
3886 | + <indexes> | ||
3887 | + </indexes> | ||
3888 | + <complex_unique_key_list> | ||
3889 | + </complex_unique_key_list> | ||
3890 | + <table_properties> | ||
3891 | + <schema></schema> | ||
3892 | + </table_properties> | ||
3893 | + </table> | ||
3894 | + <table> | ||
3895 | + <id>14</id> | ||
3896 | + <height>170</height> | ||
3897 | + <width>292</width> | ||
3898 | + <font_name>Ubuntu</font_name> | ||
3899 | + <font_size>9</font_size> | ||
3900 | + <x>8</x> | ||
3901 | + <y>499</y> | ||
3902 | + <color> | ||
3903 | + <r>255</r> | ||
3904 | + <g>165</g> | ||
3905 | + <b>0</b> | ||
3906 | + </color> | ||
3907 | + <connections> | ||
3908 | + </connections> | ||
3909 | + <physical_name>i3geoestat_conexao</physical_name> | ||
3910 | + <logical_name>i3geoestat_conexao</logical_name> | ||
3911 | + <description>Lista controlada dos parâmetros de conexão com o banco de dados onde residem dados
Código 0 indica que será utilizada a conexão padrão</description> | ||
3912 | + <constraint></constraint> | ||
3913 | + <primary_key_name></primary_key_name> | ||
3914 | + <option></option> | ||
3915 | + <columns> | ||
3916 | + <normal_column> | ||
3917 | + <word_id>2</word_id> | ||
3918 | + <id>71</id> | ||
3919 | + <description></description> | ||
3920 | + <unique_key_name></unique_key_name> | ||
3921 | + <logical_name></logical_name> | ||
3922 | + <physical_name></physical_name> | ||
3923 | + <type>integer</type> | ||
3924 | + <constraint></constraint> | ||
3925 | + <default_value></default_value> | ||
3926 | + <auto_increment>true</auto_increment> | ||
3927 | + <foreign_key>false</foreign_key> | ||
3928 | + <not_null>true</not_null> | ||
3929 | + <primary_key>true</primary_key> | ||
3930 | + <unique_key>true</unique_key> | ||
3931 | + <character_set></character_set> | ||
3932 | + <collation></collation> | ||
3933 | + <sequence> | ||
3934 | + <name></name> | ||
3935 | + <schema></schema> | ||
3936 | + <increment></increment> | ||
3937 | + <min_value></min_value> | ||
3938 | + <max_value></max_value> | ||
3939 | + <start></start> | ||
3940 | + <cache></cache> | ||
3941 | + <cycle>false</cycle> | ||
3942 | + <order>false</order> | ||
3943 | + <description></description> | ||
3944 | + <data_type></data_type> | ||
3945 | + <decimal_size>0</decimal_size> | ||
3946 | + </sequence> | ||
3947 | + </normal_column> | ||
3948 | + <normal_column> | ||
3949 | + <word_id>1</word_id> | ||
3950 | + <id>72</id> | ||
3951 | + <description></description> | ||
3952 | + <unique_key_name></unique_key_name> | ||
3953 | + <logical_name></logical_name> | ||
3954 | + <physical_name></physical_name> | ||
3955 | + <type>text</type> | ||
3956 | + <constraint></constraint> | ||
3957 | + <default_value></default_value> | ||
3958 | + <auto_increment>false</auto_increment> | ||
3959 | + <foreign_key>false</foreign_key> | ||
3960 | + <not_null>false</not_null> | ||
3961 | + <primary_key>false</primary_key> | ||
3962 | + <unique_key>false</unique_key> | ||
3963 | + <character_set></character_set> | ||
3964 | + <collation></collation> | ||
3965 | + <sequence> | ||
3966 | + <name></name> | ||
3967 | + <schema></schema> | ||
3968 | + <increment></increment> | ||
3969 | + <min_value></min_value> | ||
3970 | + <max_value></max_value> | ||
3971 | + <start></start> | ||
3972 | + <cache></cache> | ||
3973 | + <cycle>false</cycle> | ||
3974 | + <order>false</order> | ||
3975 | + <description></description> | ||
3976 | + <data_type></data_type> | ||
3977 | + <decimal_size>0</decimal_size> | ||
3978 | + </sequence> | ||
3979 | + </normal_column> | ||
3980 | + <normal_column> | ||
3981 | + <word_id>24</word_id> | ||
3982 | + <id>73</id> | ||
3983 | + <description></description> | ||
3984 | + <unique_key_name></unique_key_name> | ||
3985 | + <logical_name></logical_name> | ||
3986 | + <physical_name></physical_name> | ||
3987 | + <type>text</type> | ||
3988 | + <constraint></constraint> | ||
3989 | + <default_value></default_value> | ||
3990 | + <auto_increment>false</auto_increment> | ||
3991 | + <foreign_key>false</foreign_key> | ||
3992 | + <not_null>false</not_null> | ||
3993 | + <primary_key>false</primary_key> | ||
3994 | + <unique_key>false</unique_key> | ||
3995 | + <character_set></character_set> | ||
3996 | + <collation></collation> | ||
3997 | + <sequence> | ||
3998 | + <name></name> | ||
3999 | + <schema></schema> | ||
4000 | + <increment></increment> | ||
4001 | + <min_value></min_value> | ||
4002 | + <max_value></max_value> | ||
4003 | + <start></start> | ||
4004 | + <cache></cache> | ||
4005 | + <cycle>false</cycle> | ||
4006 | + <order>false</order> | ||
4007 | + <description></description> | ||
4008 | + <data_type></data_type> | ||
4009 | + <decimal_size>0</decimal_size> | ||
4010 | + </sequence> | ||
4011 | + </normal_column> | ||
4012 | + <normal_column> | ||
4013 | + <word_id>51</word_id> | ||
4014 | + <id>74</id> | ||
4015 | + <description></description> | ||
4016 | + <unique_key_name></unique_key_name> | ||
4017 | + <logical_name></logical_name> | ||
4018 | + <physical_name></physical_name> | ||
4019 | + <type>text</type> | ||
4020 | + <constraint></constraint> | ||
4021 | + <default_value></default_value> | ||
4022 | + <auto_increment>false</auto_increment> | ||
4023 | + <foreign_key>false</foreign_key> | ||
4024 | + <not_null>false</not_null> | ||
4025 | + <primary_key>false</primary_key> | ||
4026 | + <unique_key>false</unique_key> | ||
4027 | + <character_set></character_set> | ||
4028 | + <collation></collation> | ||
4029 | + <sequence> | ||
4030 | + <name></name> | ||
4031 | + <schema></schema> | ||
4032 | + <increment></increment> | ||
4033 | + <min_value></min_value> | ||
4034 | + <max_value></max_value> | ||
4035 | + <start></start> | ||
4036 | + <cache></cache> | ||
4037 | + <cycle>false</cycle> | ||
4038 | + <order>false</order> | ||
4039 | + <description></description> | ||
4040 | + <data_type></data_type> | ||
4041 | + <decimal_size>0</decimal_size> | ||
4042 | + </sequence> | ||
4043 | + </normal_column> | ||
4044 | + <normal_column> | ||
4045 | + <word_id>61</word_id> | ||
4046 | + <id>75</id> | ||
4047 | + <description></description> | ||
4048 | + <unique_key_name></unique_key_name> | ||
4049 | + <logical_name></logical_name> | ||
4050 | + <physical_name></physical_name> | ||
4051 | + <type>text</type> | ||
4052 | + <constraint></constraint> | ||
4053 | + <default_value></default_value> | ||
4054 | + <auto_increment>false</auto_increment> | ||
4055 | + <foreign_key>false</foreign_key> | ||
4056 | + <not_null>false</not_null> | ||
4057 | + <primary_key>false</primary_key> | ||
4058 | + <unique_key>false</unique_key> | ||
4059 | + <character_set></character_set> | ||
4060 | + <collation></collation> | ||
4061 | + <sequence> | ||
4062 | + <name></name> | ||
4063 | + <schema></schema> | ||
4064 | + <increment></increment> | ||
4065 | + <min_value></min_value> | ||
4066 | + <max_value></max_value> | ||
4067 | + <start></start> | ||
4068 | + <cache></cache> | ||
4069 | + <cycle>false</cycle> | ||
4070 | + <order>false</order> | ||
4071 | + <description></description> | ||
4072 | + <data_type></data_type> | ||
4073 | + <decimal_size>0</decimal_size> | ||
4074 | + </sequence> | ||
4075 | + </normal_column> | ||
4076 | + <normal_column> | ||
4077 | + <word_id>52</word_id> | ||
4078 | <id>76</id> | 4078 | <id>76</id> |
4079 | <description></description> | 4079 | <description></description> |
4080 | <unique_key_name></unique_key_name> | 4080 | <unique_key_name></unique_key_name> |
@@ -4122,40 +4122,66 @@ | @@ -4122,40 +4122,66 @@ | ||
4122 | <name>metaestat_basededados</name> | 4122 | <name>metaestat_basededados</name> |
4123 | <export_order>0</export_order> | 4123 | <export_order>0</export_order> |
4124 | <table_test_data> | 4124 | <table_test_data> |
4125 | - <table_id>5</table_id> | 4125 | + <table_id>14</table_id> |
4126 | <direct_test_data> | 4126 | <direct_test_data> |
4127 | <data> | 4127 | <data> |
4128 | <column_data> | 4128 | <column_data> |
4129 | - <column_id>11</column_id> | 4129 | + <column_id>71</column_id> |
4130 | <value>1</value> | 4130 | <value>1</value> |
4131 | </column_data> | 4131 | </column_data> |
4132 | <column_data> | 4132 | <column_data> |
4133 | - <column_id>12</column_id> | 4133 | + <column_id>72</column_id> |
4134 | <value>dbspo</value> | 4134 | <value>dbspo</value> |
4135 | </column_data> | 4135 | </column_data> |
4136 | <column_data> | 4136 | <column_data> |
4137 | - <column_id>13</column_id> | 4137 | + <column_id>73</column_id> |
4138 | <value>localhost</value> | 4138 | <value>localhost</value> |
4139 | </column_data> | 4139 | </column_data> |
4140 | <column_data> | 4140 | <column_data> |
4141 | - <column_id>14</column_id> | 4141 | + <column_id>74</column_id> |
4142 | <value>5432</value> | 4142 | <value>5432</value> |
4143 | </column_data> | 4143 | </column_data> |
4144 | <column_data> | 4144 | <column_data> |
4145 | - <column_id>15</column_id> | 4145 | + <column_id>75</column_id> |
4146 | <value>postgres</value> | 4146 | <value>postgres</value> |
4147 | </column_data> | 4147 | </column_data> |
4148 | <column_data> | 4148 | <column_data> |
4149 | - <column_id>16</column_id> | 4149 | + <column_id>76</column_id> |
4150 | <value>postgres</value> | 4150 | <value>postgres</value> |
4151 | </column_data> | 4151 | </column_data> |
4152 | </data> | 4152 | </data> |
4153 | + <data> | ||
4154 | + <column_data> | ||
4155 | + <column_id>71</column_id> | ||
4156 | + <value>0</value> | ||
4157 | + </column_data> | ||
4158 | + <column_data> | ||
4159 | + <column_id>72</column_id> | ||
4160 | + <value>default</value> | ||
4161 | + </column_data> | ||
4162 | + <column_data> | ||
4163 | + <column_id>73</column_id> | ||
4164 | + <value></value> | ||
4165 | + </column_data> | ||
4166 | + <column_data> | ||
4167 | + <column_id>74</column_id> | ||
4168 | + <value></value> | ||
4169 | + </column_data> | ||
4170 | + <column_data> | ||
4171 | + <column_id>75</column_id> | ||
4172 | + <value></value> | ||
4173 | + </column_data> | ||
4174 | + <column_data> | ||
4175 | + <column_id>76</column_id> | ||
4176 | + <value></value> | ||
4177 | + </column_data> | ||
4178 | + </data> | ||
4153 | </direct_test_data> | 4179 | </direct_test_data> |
4154 | <repeat_test_data> | 4180 | <repeat_test_data> |
4155 | <test_data_num>0</test_data_num> | 4181 | <test_data_num>0</test_data_num> |
4156 | <data_def_list> | 4182 | <data_def_list> |
4157 | <data_def> | 4183 | <data_def> |
4158 | - <column_id>11</column_id> | 4184 | + <column_id>71</column_id> |
4159 | <type>Format</type> | 4185 | <type>Format</type> |
4160 | <repeat_num>1</repeat_num> | 4186 | <repeat_num>1</repeat_num> |
4161 | <template>%</template> | 4187 | <template>%</template> |
@@ -4170,7 +4196,7 @@ | @@ -4170,7 +4196,7 @@ | ||
4170 | </modified_values> | 4196 | </modified_values> |
4171 | </data_def> | 4197 | </data_def> |
4172 | <data_def> | 4198 | <data_def> |
4173 | - <column_id>12</column_id> | 4199 | + <column_id>72</column_id> |
4174 | <type>Format</type> | 4200 | <type>Format</type> |
4175 | <repeat_num>1</repeat_num> | 4201 | <repeat_num>1</repeat_num> |
4176 | <template>database%</template> | 4202 | <template>database%</template> |
@@ -4185,7 +4211,7 @@ | @@ -4185,7 +4211,7 @@ | ||
4185 | </modified_values> | 4211 | </modified_values> |
4186 | </data_def> | 4212 | </data_def> |
4187 | <data_def> | 4213 | <data_def> |
4188 | - <column_id>13</column_id> | 4214 | + <column_id>73</column_id> |
4189 | <type>Format</type> | 4215 | <type>Format</type> |
4190 | <repeat_num>1</repeat_num> | 4216 | <repeat_num>1</repeat_num> |
4191 | <template>host%</template> | 4217 | <template>host%</template> |
@@ -4200,7 +4226,7 @@ | @@ -4200,7 +4226,7 @@ | ||
4200 | </modified_values> | 4226 | </modified_values> |
4201 | </data_def> | 4227 | </data_def> |
4202 | <data_def> | 4228 | <data_def> |
4203 | - <column_id>14</column_id> | 4229 | + <column_id>74</column_id> |
4204 | <type>Format</type> | 4230 | <type>Format</type> |
4205 | <repeat_num>1</repeat_num> | 4231 | <repeat_num>1</repeat_num> |
4206 | <template>porta%</template> | 4232 | <template>porta%</template> |
@@ -4215,7 +4241,7 @@ | @@ -4215,7 +4241,7 @@ | ||
4215 | </modified_values> | 4241 | </modified_values> |
4216 | </data_def> | 4242 | </data_def> |
4217 | <data_def> | 4243 | <data_def> |
4218 | - <column_id>15</column_id> | 4244 | + <column_id>75</column_id> |
4219 | <type>Format</type> | 4245 | <type>Format</type> |
4220 | <repeat_num>1</repeat_num> | 4246 | <repeat_num>1</repeat_num> |
4221 | <template>usuario%</template> | 4247 | <template>usuario%</template> |
@@ -4230,7 +4256,7 @@ | @@ -4230,7 +4256,7 @@ | ||
4230 | </modified_values> | 4256 | </modified_values> |
4231 | </data_def> | 4257 | </data_def> |
4232 | <data_def> | 4258 | <data_def> |
4233 | - <column_id>16</column_id> | 4259 | + <column_id>76</column_id> |
4234 | <type>Format</type> | 4260 | <type>Format</type> |
4235 | <repeat_num>1</repeat_num> | 4261 | <repeat_num>1</repeat_num> |
4236 | <template>senha%</template> | 4262 | <template>senha%</template> |
@@ -4331,105 +4357,105 @@ | @@ -4331,105 +4357,105 @@ | ||
4331 | </repeat_test_data> | 4357 | </repeat_test_data> |
4332 | </table_test_data> | 4358 | </table_test_data> |
4333 | <table_test_data> | 4359 | <table_test_data> |
4334 | - <table_id>13</table_id> | 4360 | + <table_id>12</table_id> |
4335 | <direct_test_data> | 4361 | <direct_test_data> |
4336 | <data> | 4362 | <data> |
4337 | <column_data> | 4363 | <column_data> |
4338 | - <column_id>61</column_id> | 4364 | + <column_id>55</column_id> |
4339 | <value>1</value> | 4365 | <value>1</value> |
4340 | </column_data> | 4366 | </column_data> |
4341 | <column_data> | 4367 | <column_data> |
4342 | - <column_id>62</column_id> | 4368 | + <column_id>56</column_id> |
4343 | <value>Município</value> | 4369 | <value>Município</value> |
4344 | </column_data> | 4370 | </column_data> |
4345 | <column_data> | 4371 | <column_data> |
4346 | - <column_id>63</column_id> | 4372 | + <column_id>57</column_id> |
4347 | <value>Limites municipais</value> | 4373 | <value>Limites municipais</value> |
4348 | </column_data> | 4374 | </column_data> |
4349 | <column_data> | 4375 | <column_data> |
4350 | - <column_id>64</column_id> | 4376 | + <column_id>58</column_id> |
4351 | <value>1</value> | 4377 | <value>1</value> |
4352 | </column_data> | 4378 | </column_data> |
4353 | <column_data> | 4379 | <column_data> |
4354 | - <column_id>65</column_id> | 4380 | + <column_id>59</column_id> |
4355 | <value>public</value> | 4381 | <value>public</value> |
4356 | </column_data> | 4382 | </column_data> |
4357 | <column_data> | 4383 | <column_data> |
4358 | - <column_id>66</column_id> | 4384 | + <column_id>60</column_id> |
4359 | <value>tb_ibge</value> | 4385 | <value>tb_ibge</value> |
4360 | </column_data> | 4386 | </column_data> |
4361 | <column_data> | 4387 | <column_data> |
4362 | - <column_id>67</column_id> | 4388 | + <column_id>61</column_id> |
4363 | <value>the_geom</value> | 4389 | <value>the_geom</value> |
4364 | </column_data> | 4390 | </column_data> |
4365 | <column_data> | 4391 | <column_data> |
4366 | - <column_id>68</column_id> | 4392 | + <column_id>62</column_id> |
4367 | <value></value> | 4393 | <value></value> |
4368 | </column_data> | 4394 | </column_data> |
4369 | <column_data> | 4395 | <column_data> |
4370 | - <column_id>69</column_id> | 4396 | + <column_id>63</column_id> |
4371 | <value>ibge</value> | 4397 | <value>ibge</value> |
4372 | </column_data> | 4398 | </column_data> |
4373 | <column_data> | 4399 | <column_data> |
4374 | - <column_id>70</column_id> | 4400 | + <column_id>64</column_id> |
4375 | <value>no_cidade</value> | 4401 | <value>no_cidade</value> |
4376 | </column_data> | 4402 | </column_data> |
4377 | <column_data> | 4403 | <column_data> |
4378 | - <column_id>71</column_id> | 4404 | + <column_id>65</column_id> |
4379 | <value>4326</value> | 4405 | <value>4326</value> |
4380 | </column_data> | 4406 | </column_data> |
4381 | <column_data> | 4407 | <column_data> |
4382 | - <column_id>72</column_id> | 4408 | + <column_id>66</column_id> |
4383 | <value>the_geom2</value> | 4409 | <value>the_geom2</value> |
4384 | </column_data> | 4410 | </column_data> |
4385 | </data> | 4411 | </data> |
4386 | <data> | 4412 | <data> |
4387 | <column_data> | 4413 | <column_data> |
4388 | - <column_id>61</column_id> | 4414 | + <column_id>55</column_id> |
4389 | <value>3</value> | 4415 | <value>3</value> |
4390 | </column_data> | 4416 | </column_data> |
4391 | <column_data> | 4417 | <column_data> |
4392 | - <column_id>62</column_id> | 4418 | + <column_id>56</column_id> |
4393 | <value>Estados</value> | 4419 | <value>Estados</value> |
4394 | </column_data> | 4420 | </column_data> |
4395 | <column_data> | 4421 | <column_data> |
4396 | - <column_id>63</column_id> | 4422 | + <column_id>57</column_id> |
4397 | <value>Limites estaduais</value> | 4423 | <value>Limites estaduais</value> |
4398 | </column_data> | 4424 | </column_data> |
4399 | <column_data> | 4425 | <column_data> |
4400 | - <column_id>64</column_id> | 4426 | + <column_id>58</column_id> |
4401 | <value>1</value> | 4427 | <value>1</value> |
4402 | </column_data> | 4428 | </column_data> |
4403 | <column_data> | 4429 | <column_data> |
4404 | - <column_id>65</column_id> | 4430 | + <column_id>59</column_id> |
4405 | <value>public</value> | 4431 | <value>public</value> |
4406 | </column_data> | 4432 | </column_data> |
4407 | <column_data> | 4433 | <column_data> |
4408 | - <column_id>66</column_id> | 4434 | + <column_id>60</column_id> |
4409 | <value>tb_ibge_estados</value> | 4435 | <value>tb_ibge_estados</value> |
4410 | </column_data> | 4436 | </column_data> |
4411 | <column_data> | 4437 | <column_data> |
4412 | - <column_id>67</column_id> | 4438 | + <column_id>61</column_id> |
4413 | <value>the_geom</value> | 4439 | <value>the_geom</value> |
4414 | </column_data> | 4440 | </column_data> |
4415 | <column_data> | 4441 | <column_data> |
4416 | - <column_id>68</column_id> | 4442 | + <column_id>62</column_id> |
4417 | <value></value> | 4443 | <value></value> |
4418 | </column_data> | 4444 | </column_data> |
4419 | <column_data> | 4445 | <column_data> |
4420 | - <column_id>69</column_id> | 4446 | + <column_id>63</column_id> |
4421 | <value>co_ibge_uf</value> | 4447 | <value>co_ibge_uf</value> |
4422 | </column_data> | 4448 | </column_data> |
4423 | <column_data> | 4449 | <column_data> |
4424 | - <column_id>70</column_id> | 4450 | + <column_id>64</column_id> |
4425 | <value>no_uf</value> | 4451 | <value>no_uf</value> |
4426 | </column_data> | 4452 | </column_data> |
4427 | <column_data> | 4453 | <column_data> |
4428 | - <column_id>71</column_id> | 4454 | + <column_id>65</column_id> |
4429 | <value>4326</value> | 4455 | <value>4326</value> |
4430 | </column_data> | 4456 | </column_data> |
4431 | <column_data> | 4457 | <column_data> |
4432 | - <column_id>72</column_id> | 4458 | + <column_id>66</column_id> |
4433 | <value>the_geom</value> | 4459 | <value>the_geom</value> |
4434 | </column_data> | 4460 | </column_data> |
4435 | </data> | 4461 | </data> |
@@ -4438,7 +4464,7 @@ | @@ -4438,7 +4464,7 @@ | ||
4438 | <test_data_num>0</test_data_num> | 4464 | <test_data_num>0</test_data_num> |
4439 | <data_def_list> | 4465 | <data_def_list> |
4440 | <data_def> | 4466 | <data_def> |
4441 | - <column_id>61</column_id> | 4467 | + <column_id>55</column_id> |
4442 | <type>Format</type> | 4468 | <type>Format</type> |
4443 | <repeat_num>1</repeat_num> | 4469 | <repeat_num>1</repeat_num> |
4444 | <template>%</template> | 4470 | <template>%</template> |
@@ -4453,7 +4479,7 @@ | @@ -4453,7 +4479,7 @@ | ||
4453 | </modified_values> | 4479 | </modified_values> |
4454 | </data_def> | 4480 | </data_def> |
4455 | <data_def> | 4481 | <data_def> |
4456 | - <column_id>62</column_id> | 4482 | + <column_id>56</column_id> |
4457 | <type>Format</type> | 4483 | <type>Format</type> |
4458 | <repeat_num>1</repeat_num> | 4484 | <repeat_num>1</repeat_num> |
4459 | <template>nome_tipo_regiao%</template> | 4485 | <template>nome_tipo_regiao%</template> |
@@ -4468,7 +4494,7 @@ | @@ -4468,7 +4494,7 @@ | ||
4468 | </modified_values> | 4494 | </modified_values> |
4469 | </data_def> | 4495 | </data_def> |
4470 | <data_def> | 4496 | <data_def> |
4471 | - <column_id>63</column_id> | 4497 | + <column_id>57</column_id> |
4472 | <type>Format</type> | 4498 | <type>Format</type> |
4473 | <repeat_num>1</repeat_num> | 4499 | <repeat_num>1</repeat_num> |
4474 | <template>descricao_tipo_regiao%</template> | 4500 | <template>descricao_tipo_regiao%</template> |
@@ -4483,7 +4509,7 @@ | @@ -4483,7 +4509,7 @@ | ||
4483 | </modified_values> | 4509 | </modified_values> |
4484 | </data_def> | 4510 | </data_def> |
4485 | <data_def> | 4511 | <data_def> |
4486 | - <column_id>64</column_id> | 4512 | + <column_id>58</column_id> |
4487 | <type>Foreign Key</type> | 4513 | <type>Foreign Key</type> |
4488 | <repeat_num>1</repeat_num> | 4514 | <repeat_num>1</repeat_num> |
4489 | <template>%</template> | 4515 | <template>%</template> |
@@ -4498,7 +4524,7 @@ | @@ -4498,7 +4524,7 @@ | ||
4498 | </modified_values> | 4524 | </modified_values> |
4499 | </data_def> | 4525 | </data_def> |
4500 | <data_def> | 4526 | <data_def> |
4501 | - <column_id>65</column_id> | 4527 | + <column_id>59</column_id> |
4502 | <type>Format</type> | 4528 | <type>Format</type> |
4503 | <repeat_num>1</repeat_num> | 4529 | <repeat_num>1</repeat_num> |
4504 | <template>esquemadb%</template> | 4530 | <template>esquemadb%</template> |
@@ -4513,7 +4539,7 @@ | @@ -4513,7 +4539,7 @@ | ||
4513 | </modified_values> | 4539 | </modified_values> |
4514 | </data_def> | 4540 | </data_def> |
4515 | <data_def> | 4541 | <data_def> |
4516 | - <column_id>66</column_id> | 4542 | + <column_id>60</column_id> |
4517 | <type>Format</type> | 4543 | <type>Format</type> |
4518 | <repeat_num>1</repeat_num> | 4544 | <repeat_num>1</repeat_num> |
4519 | <template>tabela%</template> | 4545 | <template>tabela%</template> |
@@ -4528,7 +4554,7 @@ | @@ -4528,7 +4554,7 @@ | ||
4528 | </modified_values> | 4554 | </modified_values> |
4529 | </data_def> | 4555 | </data_def> |
4530 | <data_def> | 4556 | <data_def> |
4531 | - <column_id>67</column_id> | 4557 | + <column_id>61</column_id> |
4532 | <type>Format</type> | 4558 | <type>Format</type> |
4533 | <repeat_num>1</repeat_num> | 4559 | <repeat_num>1</repeat_num> |
4534 | <template>colunageo%</template> | 4560 | <template>colunageo%</template> |
@@ -4543,7 +4569,7 @@ | @@ -4543,7 +4569,7 @@ | ||
4543 | </modified_values> | 4569 | </modified_values> |
4544 | </data_def> | 4570 | </data_def> |
4545 | <data_def> | 4571 | <data_def> |
4546 | - <column_id>68</column_id> | 4572 | + <column_id>62</column_id> |
4547 | <type>Format</type> | 4573 | <type>Format</type> |
4548 | <repeat_num>1</repeat_num> | 4574 | <repeat_num>1</repeat_num> |
4549 | <template>data%</template> | 4575 | <template>data%</template> |
@@ -4558,7 +4584,7 @@ | @@ -4558,7 +4584,7 @@ | ||
4558 | </modified_values> | 4584 | </modified_values> |
4559 | </data_def> | 4585 | </data_def> |
4560 | <data_def> | 4586 | <data_def> |
4561 | - <column_id>69</column_id> | 4587 | + <column_id>63</column_id> |
4562 | <type>Format</type> | 4588 | <type>Format</type> |
4563 | <repeat_num>1</repeat_num> | 4589 | <repeat_num>1</repeat_num> |
4564 | <template>%</template> | 4590 | <template>%</template> |
@@ -4573,7 +4599,7 @@ | @@ -4573,7 +4599,7 @@ | ||
4573 | </modified_values> | 4599 | </modified_values> |
4574 | </data_def> | 4600 | </data_def> |
4575 | <data_def> | 4601 | <data_def> |
4576 | - <column_id>70</column_id> | 4602 | + <column_id>64</column_id> |
4577 | <type>Format</type> | 4603 | <type>Format</type> |
4578 | <repeat_num>1</repeat_num> | 4604 | <repeat_num>1</repeat_num> |
4579 | <template>colunanomeregiao%</template> | 4605 | <template>colunanomeregiao%</template> |
@@ -4588,7 +4614,7 @@ | @@ -4588,7 +4614,7 @@ | ||
4588 | </modified_values> | 4614 | </modified_values> |
4589 | </data_def> | 4615 | </data_def> |
4590 | <data_def> | 4616 | <data_def> |
4591 | - <column_id>71</column_id> | 4617 | + <column_id>65</column_id> |
4592 | <type>Format</type> | 4618 | <type>Format</type> |
4593 | <repeat_num>1</repeat_num> | 4619 | <repeat_num>1</repeat_num> |
4594 | <template>srid%</template> | 4620 | <template>srid%</template> |
@@ -4603,7 +4629,7 @@ | @@ -4603,7 +4629,7 @@ | ||
4603 | </modified_values> | 4629 | </modified_values> |
4604 | </data_def> | 4630 | </data_def> |
4605 | <data_def> | 4631 | <data_def> |
4606 | - <column_id>72</column_id> | 4632 | + <column_id>66</column_id> |
4607 | <type>Format</type> | 4633 | <type>Format</type> |
4608 | <repeat_num>1</repeat_num> | 4634 | <repeat_num>1</repeat_num> |
4609 | <template>colunacentroide%</template> | 4635 | <template>colunacentroide%</template> |
@@ -4728,55 +4754,55 @@ | @@ -4728,55 +4754,55 @@ | ||
4728 | </repeat_test_data> | 4754 | </repeat_test_data> |
4729 | </table_test_data> | 4755 | </table_test_data> |
4730 | <table_test_data> | 4756 | <table_test_data> |
4731 | - <table_id>9</table_id> | 4757 | + <table_id>8</table_id> |
4732 | <direct_test_data> | 4758 | <direct_test_data> |
4733 | <data> | 4759 | <data> |
4734 | <column_data> | 4760 | <column_data> |
4735 | - <column_id>37</column_id> | 4761 | + <column_id>31</column_id> |
4736 | <value>1</value> | 4762 | <value>1</value> |
4737 | </column_data> | 4763 | </column_data> |
4738 | <column_data> | 4764 | <column_data> |
4739 | - <column_id>38</column_id> | 4765 | + <column_id>32</column_id> |
4740 | <value>1</value> | 4766 | <value>1</value> |
4741 | </column_data> | 4767 | </column_data> |
4742 | <column_data> | 4768 | <column_data> |
4743 | - <column_id>39</column_id> | 4769 | + <column_id>33</column_id> |
4744 | <value>2</value> | 4770 | <value>2</value> |
4745 | </column_data> | 4771 | </column_data> |
4746 | <column_data> | 4772 | <column_data> |
4747 | - <column_id>40</column_id> | 4773 | + <column_id>34</column_id> |
4748 | <value>1</value> | 4774 | <value>1</value> |
4749 | </column_data> | 4775 | </column_data> |
4750 | <column_data> | 4776 | <column_data> |
4751 | - <column_id>41</column_id> | 4777 | + <column_id>35</column_id> |
4752 | <value>1</value> | 4778 | <value>1</value> |
4753 | </column_data> | 4779 | </column_data> |
4754 | <column_data> | 4780 | <column_data> |
4755 | - <column_id>42</column_id> | 4781 | + <column_id>36</column_id> |
4756 | <value>1</value> | 4782 | <value>1</value> |
4757 | </column_data> | 4783 | </column_data> |
4758 | <column_data> | 4784 | <column_data> |
4759 | - <column_id>43</column_id> | 4785 | + <column_id>37</column_id> |
4760 | <value>dbacoes_saude</value> | 4786 | <value>dbacoes_saude</value> |
4761 | </column_data> | 4787 | </column_data> |
4762 | <column_data> | 4788 | <column_data> |
4763 | - <column_id>44</column_id> | 4789 | + <column_id>38</column_id> |
4764 | <value>tb_farmacia_pop</value> | 4790 | <value>tb_farmacia_pop</value> |
4765 | </column_data> | 4791 | </column_data> |
4766 | <column_data> | 4792 | <column_data> |
4767 | - <column_id>45</column_id> | 4793 | + <column_id>39</column_id> |
4768 | <value>nu_farm_funcionando</value> | 4794 | <value>nu_farm_funcionando</value> |
4769 | </column_data> | 4795 | </column_data> |
4770 | <column_data> | 4796 | <column_data> |
4771 | - <column_id>46</column_id> | 4797 | + <column_id>40</column_id> |
4772 | <value>co_ibge</value> | 4798 | <value>co_ibge</value> |
4773 | </column_data> | 4799 | </column_data> |
4774 | <column_data> | 4800 | <column_data> |
4775 | - <column_id>47</column_id> | 4801 | + <column_id>41</column_id> |
4776 | <value></value> | 4802 | <value></value> |
4777 | </column_data> | 4803 | </column_data> |
4778 | <column_data> | 4804 | <column_data> |
4779 | - <column_id>48</column_id> | 4805 | + <column_id>42</column_id> |
4780 | <value>Número de farmácias em funcionamento por mês e ano</value> | 4806 | <value>Número de farmácias em funcionamento por mês e ano</value> |
4781 | </column_data> | 4807 | </column_data> |
4782 | </data> | 4808 | </data> |
@@ -4785,7 +4811,7 @@ | @@ -4785,7 +4811,7 @@ | ||
4785 | <test_data_num>0</test_data_num> | 4811 | <test_data_num>0</test_data_num> |
4786 | <data_def_list> | 4812 | <data_def_list> |
4787 | <data_def> | 4813 | <data_def> |
4788 | - <column_id>37</column_id> | 4814 | + <column_id>31</column_id> |
4789 | <type>Format</type> | 4815 | <type>Format</type> |
4790 | <repeat_num>1</repeat_num> | 4816 | <repeat_num>1</repeat_num> |
4791 | <template>%</template> | 4817 | <template>%</template> |
@@ -4800,7 +4826,7 @@ | @@ -4800,7 +4826,7 @@ | ||
4800 | </modified_values> | 4826 | </modified_values> |
4801 | </data_def> | 4827 | </data_def> |
4802 | <data_def> | 4828 | <data_def> |
4803 | - <column_id>38</column_id> | 4829 | + <column_id>32</column_id> |
4804 | <type>Foreign Key</type> | 4830 | <type>Foreign Key</type> |
4805 | <repeat_num>1</repeat_num> | 4831 | <repeat_num>1</repeat_num> |
4806 | <template>%</template> | 4832 | <template>%</template> |
@@ -4815,7 +4841,7 @@ | @@ -4815,7 +4841,7 @@ | ||
4815 | </modified_values> | 4841 | </modified_values> |
4816 | </data_def> | 4842 | </data_def> |
4817 | <data_def> | 4843 | <data_def> |
4818 | - <column_id>39</column_id> | 4844 | + <column_id>33</column_id> |
4819 | <type>Foreign Key</type> | 4845 | <type>Foreign Key</type> |
4820 | <repeat_num>1</repeat_num> | 4846 | <repeat_num>1</repeat_num> |
4821 | <template>%</template> | 4847 | <template>%</template> |
@@ -4830,7 +4856,7 @@ | @@ -4830,7 +4856,7 @@ | ||
4830 | </modified_values> | 4856 | </modified_values> |
4831 | </data_def> | 4857 | </data_def> |
4832 | <data_def> | 4858 | <data_def> |
4833 | - <column_id>40</column_id> | 4859 | + <column_id>34</column_id> |
4834 | <type>Foreign Key</type> | 4860 | <type>Foreign Key</type> |
4835 | <repeat_num>1</repeat_num> | 4861 | <repeat_num>1</repeat_num> |
4836 | <template>%</template> | 4862 | <template>%</template> |
@@ -4845,7 +4871,7 @@ | @@ -4845,7 +4871,7 @@ | ||
4845 | </modified_values> | 4871 | </modified_values> |
4846 | </data_def> | 4872 | </data_def> |
4847 | <data_def> | 4873 | <data_def> |
4848 | - <column_id>41</column_id> | 4874 | + <column_id>35</column_id> |
4849 | <type>Foreign Key</type> | 4875 | <type>Foreign Key</type> |
4850 | <repeat_num>1</repeat_num> | 4876 | <repeat_num>1</repeat_num> |
4851 | <template>%</template> | 4877 | <template>%</template> |
@@ -4860,7 +4886,7 @@ | @@ -4860,7 +4886,7 @@ | ||
4860 | </modified_values> | 4886 | </modified_values> |
4861 | </data_def> | 4887 | </data_def> |
4862 | <data_def> | 4888 | <data_def> |
4863 | - <column_id>42</column_id> | 4889 | + <column_id>36</column_id> |
4864 | <type>Foreign Key</type> | 4890 | <type>Foreign Key</type> |
4865 | <repeat_num>1</repeat_num> | 4891 | <repeat_num>1</repeat_num> |
4866 | <template>%</template> | 4892 | <template>%</template> |
@@ -4875,7 +4901,7 @@ | @@ -4875,7 +4901,7 @@ | ||
4875 | </modified_values> | 4901 | </modified_values> |
4876 | </data_def> | 4902 | </data_def> |
4877 | <data_def> | 4903 | <data_def> |
4878 | - <column_id>43</column_id> | 4904 | + <column_id>37</column_id> |
4879 | <type>Format</type> | 4905 | <type>Format</type> |
4880 | <repeat_num>1</repeat_num> | 4906 | <repeat_num>1</repeat_num> |
4881 | <template>esquemadb%</template> | 4907 | <template>esquemadb%</template> |
@@ -4890,7 +4916,7 @@ | @@ -4890,7 +4916,7 @@ | ||
4890 | </modified_values> | 4916 | </modified_values> |
4891 | </data_def> | 4917 | </data_def> |
4892 | <data_def> | 4918 | <data_def> |
4893 | - <column_id>44</column_id> | 4919 | + <column_id>38</column_id> |
4894 | <type>Format</type> | 4920 | <type>Format</type> |
4895 | <repeat_num>1</repeat_num> | 4921 | <repeat_num>1</repeat_num> |
4896 | <template>tabela%</template> | 4922 | <template>tabela%</template> |
@@ -4905,7 +4931,7 @@ | @@ -4905,7 +4931,7 @@ | ||
4905 | </modified_values> | 4931 | </modified_values> |
4906 | </data_def> | 4932 | </data_def> |
4907 | <data_def> | 4933 | <data_def> |
4908 | - <column_id>45</column_id> | 4934 | + <column_id>39</column_id> |
4909 | <type>Format</type> | 4935 | <type>Format</type> |
4910 | <repeat_num>1</repeat_num> | 4936 | <repeat_num>1</repeat_num> |
4911 | <template>colunavalor%</template> | 4937 | <template>colunavalor%</template> |
@@ -4920,7 +4946,7 @@ | @@ -4920,7 +4946,7 @@ | ||
4920 | </modified_values> | 4946 | </modified_values> |
4921 | </data_def> | 4947 | </data_def> |
4922 | <data_def> | 4948 | <data_def> |
4923 | - <column_id>46</column_id> | 4949 | + <column_id>40</column_id> |
4924 | <type>Format</type> | 4950 | <type>Format</type> |
4925 | <repeat_num>1</repeat_num> | 4951 | <repeat_num>1</repeat_num> |
4926 | <template>colunaidgeo_%</template> | 4952 | <template>colunaidgeo_%</template> |
@@ -4935,7 +4961,7 @@ | @@ -4935,7 +4961,7 @@ | ||
4935 | </modified_values> | 4961 | </modified_values> |
4936 | </data_def> | 4962 | </data_def> |
4937 | <data_def> | 4963 | <data_def> |
4938 | - <column_id>47</column_id> | 4964 | + <column_id>41</column_id> |
4939 | <type>Format</type> | 4965 | <type>Format</type> |
4940 | <repeat_num>1</repeat_num> | 4966 | <repeat_num>1</repeat_num> |
4941 | <template>filtro%</template> | 4967 | <template>filtro%</template> |
@@ -4950,7 +4976,7 @@ | @@ -4950,7 +4976,7 @@ | ||
4950 | </modified_values> | 4976 | </modified_values> |
4951 | </data_def> | 4977 | </data_def> |
4952 | <data_def> | 4978 | <data_def> |
4953 | - <column_id>48</column_id> | 4979 | + <column_id>42</column_id> |
4954 | <type>Format</type> | 4980 | <type>Format</type> |
4955 | <repeat_num>1</repeat_num> | 4981 | <repeat_num>1</repeat_num> |
4956 | <template>nomemedida_%</template> | 4982 | <template>nomemedida_%</template> |
@@ -4968,57 +4994,57 @@ | @@ -4968,57 +4994,57 @@ | ||
4968 | </repeat_test_data> | 4994 | </repeat_test_data> |
4969 | </table_test_data> | 4995 | </table_test_data> |
4970 | <table_test_data> | 4996 | <table_test_data> |
4971 | - <table_id>12</table_id> | 4997 | + <table_id>11</table_id> |
4972 | <direct_test_data> | 4998 | <direct_test_data> |
4973 | <data> | 4999 | <data> |
4974 | <column_data> | 5000 | <column_data> |
4975 | - <column_id>55</column_id> | 5001 | + <column_id>49</column_id> |
4976 | <value>1</value> | 5002 | <value>1</value> |
4977 | </column_data> | 5003 | </column_data> |
4978 | <column_data> | 5004 | <column_data> |
4979 | - <column_id>56</column_id> | 5005 | + <column_id>50</column_id> |
4980 | <value>mes_farm_pop</value> | 5006 | <value>mes_farm_pop</value> |
4981 | </column_data> | 5007 | </column_data> |
4982 | <column_data> | 5008 | <column_data> |
4983 | - <column_id>57</column_id> | 5009 | + <column_id>51</column_id> |
4984 | <value>mês</value> | 5010 | <value>mês</value> |
4985 | </column_data> | 5011 | </column_data> |
4986 | <column_data> | 5012 | <column_data> |
4987 | - <column_id>58</column_id> | 5013 | + <column_id>52</column_id> |
4988 | <value></value> | 5014 | <value></value> |
4989 | </column_data> | 5015 | </column_data> |
4990 | <column_data> | 5016 | <column_data> |
4991 | - <column_id>59</column_id> | 5017 | + <column_id>53</column_id> |
4992 | <value>2</value> | 5018 | <value>2</value> |
4993 | </column_data> | 5019 | </column_data> |
4994 | <column_data> | 5020 | <column_data> |
4995 | - <column_id>60</column_id> | 5021 | + <column_id>54</column_id> |
4996 | <value>1</value> | 5022 | <value>1</value> |
4997 | </column_data> | 5023 | </column_data> |
4998 | </data> | 5024 | </data> |
4999 | <data> | 5025 | <data> |
5000 | <column_data> | 5026 | <column_data> |
5001 | - <column_id>55</column_id> | 5027 | + <column_id>49</column_id> |
5002 | <value>2</value> | 5028 | <value>2</value> |
5003 | </column_data> | 5029 | </column_data> |
5004 | <column_data> | 5030 | <column_data> |
5005 | - <column_id>56</column_id> | 5031 | + <column_id>50</column_id> |
5006 | <value>ano_farm</value> | 5032 | <value>ano_farm</value> |
5007 | </column_data> | 5033 | </column_data> |
5008 | <column_data> | 5034 | <column_data> |
5009 | - <column_id>57</column_id> | 5035 | + <column_id>51</column_id> |
5010 | <value>ano</value> | 5036 | <value>ano</value> |
5011 | </column_data> | 5037 | </column_data> |
5012 | <column_data> | 5038 | <column_data> |
5013 | - <column_id>58</column_id> | 5039 | + <column_id>52</column_id> |
5014 | <value></value> | 5040 | <value></value> |
5015 | </column_data> | 5041 | </column_data> |
5016 | <column_data> | 5042 | <column_data> |
5017 | - <column_id>59</column_id> | 5043 | + <column_id>53</column_id> |
5018 | <value>0</value> | 5044 | <value>0</value> |
5019 | </column_data> | 5045 | </column_data> |
5020 | <column_data> | 5046 | <column_data> |
5021 | - <column_id>60</column_id> | 5047 | + <column_id>54</column_id> |
5022 | <value>1</value> | 5048 | <value>1</value> |
5023 | </column_data> | 5049 | </column_data> |
5024 | </data> | 5050 | </data> |
@@ -5027,7 +5053,7 @@ | @@ -5027,7 +5053,7 @@ | ||
5027 | <test_data_num>0</test_data_num> | 5053 | <test_data_num>0</test_data_num> |
5028 | <data_def_list> | 5054 | <data_def_list> |
5029 | <data_def> | 5055 | <data_def> |
5030 | - <column_id>55</column_id> | 5056 | + <column_id>49</column_id> |
5031 | <type>Format</type> | 5057 | <type>Format</type> |
5032 | <repeat_num>1</repeat_num> | 5058 | <repeat_num>1</repeat_num> |
5033 | <template>%</template> | 5059 | <template>%</template> |
@@ -5042,7 +5068,7 @@ | @@ -5042,7 +5068,7 @@ | ||
5042 | </modified_values> | 5068 | </modified_values> |
5043 | </data_def> | 5069 | </data_def> |
5044 | <data_def> | 5070 | <data_def> |
5045 | - <column_id>56</column_id> | 5071 | + <column_id>50</column_id> |
5046 | <type>Format</type> | 5072 | <type>Format</type> |
5047 | <repeat_num>1</repeat_num> | 5073 | <repeat_num>1</repeat_num> |
5048 | <template>coluna%</template> | 5074 | <template>coluna%</template> |
@@ -5057,7 +5083,7 @@ | @@ -5057,7 +5083,7 @@ | ||
5057 | </modified_values> | 5083 | </modified_values> |
5058 | </data_def> | 5084 | </data_def> |
5059 | <data_def> | 5085 | <data_def> |
5060 | - <column_id>57</column_id> | 5086 | + <column_id>51</column_id> |
5061 | <type>Format</type> | 5087 | <type>Format</type> |
5062 | <repeat_num>1</repeat_num> | 5088 | <repeat_num>1</repeat_num> |
5063 | <template>nomedimensao%</template> | 5089 | <template>nomedimensao%</template> |
@@ -5072,7 +5098,7 @@ | @@ -5072,7 +5098,7 @@ | ||
5072 | </modified_values> | 5098 | </modified_values> |
5073 | </data_def> | 5099 | </data_def> |
5074 | <data_def> | 5100 | <data_def> |
5075 | - <column_id>58</column_id> | 5101 | + <column_id>52</column_id> |
5076 | <type>Format</type> | 5102 | <type>Format</type> |
5077 | <repeat_num>1</repeat_num> | 5103 | <repeat_num>1</repeat_num> |
5078 | <template>descricao%</template> | 5104 | <template>descricao%</template> |
@@ -5087,7 +5113,7 @@ | @@ -5087,7 +5113,7 @@ | ||
5087 | </modified_values> | 5113 | </modified_values> |
5088 | </data_def> | 5114 | </data_def> |
5089 | <data_def> | 5115 | <data_def> |
5090 | - <column_id>59</column_id> | 5116 | + <column_id>53</column_id> |
5091 | <type>Format</type> | 5117 | <type>Format</type> |
5092 | <repeat_num>1</repeat_num> | 5118 | <repeat_num>1</repeat_num> |
5093 | <template>%</template> | 5119 | <template>%</template> |
@@ -5102,7 +5128,7 @@ | @@ -5102,7 +5128,7 @@ | ||
5102 | </modified_values> | 5128 | </modified_values> |
5103 | </data_def> | 5129 | </data_def> |
5104 | <data_def> | 5130 | <data_def> |
5105 | - <column_id>60</column_id> | 5131 | + <column_id>54</column_id> |
5106 | <type>Foreign Key</type> | 5132 | <type>Foreign Key</type> |
5107 | <repeat_num>1</repeat_num> | 5133 | <repeat_num>1</repeat_num> |
5108 | <template>%</template> | 5134 | <template>%</template> |
@@ -5189,23 +5215,23 @@ | @@ -5189,23 +5215,23 @@ | ||
5189 | </repeat_test_data> | 5215 | </repeat_test_data> |
5190 | </table_test_data> | 5216 | </table_test_data> |
5191 | <table_test_data> | 5217 | <table_test_data> |
5192 | - <table_id>6</table_id> | 5218 | + <table_id>5</table_id> |
5193 | <direct_test_data> | 5219 | <direct_test_data> |
5194 | <data> | 5220 | <data> |
5195 | <column_data> | 5221 | <column_data> |
5196 | - <column_id>17</column_id> | 5222 | + <column_id>11</column_id> |
5197 | <value>1</value> | 5223 | <value>1</value> |
5198 | </column_data> | 5224 | </column_data> |
5199 | <column_data> | 5225 | <column_data> |
5200 | - <column_id>18</column_id> | 5226 | + <column_id>12</column_id> |
5201 | <value>Pela média</value> | 5227 | <value>Pela média</value> |
5202 | </column_data> | 5228 | </column_data> |
5203 | <column_data> | 5229 | <column_data> |
5204 | - <column_id>19</column_id> | 5230 | + <column_id>13</column_id> |
5205 | <value>1</value> | 5231 | <value>1</value> |
5206 | </column_data> | 5232 | </column_data> |
5207 | <column_data> | 5233 | <column_data> |
5208 | - <column_id>20</column_id> | 5234 | + <column_id>14</column_id> |
5209 | <value></value> | 5235 | <value></value> |
5210 | </column_data> | 5236 | </column_data> |
5211 | </data> | 5237 | </data> |
@@ -5214,7 +5240,7 @@ | @@ -5214,7 +5240,7 @@ | ||
5214 | <test_data_num>0</test_data_num> | 5240 | <test_data_num>0</test_data_num> |
5215 | <data_def_list> | 5241 | <data_def_list> |
5216 | <data_def> | 5242 | <data_def> |
5217 | - <column_id>17</column_id> | 5243 | + <column_id>11</column_id> |
5218 | <type>Format</type> | 5244 | <type>Format</type> |
5219 | <repeat_num>1</repeat_num> | 5245 | <repeat_num>1</repeat_num> |
5220 | <template>%</template> | 5246 | <template>%</template> |
@@ -5229,7 +5255,7 @@ | @@ -5229,7 +5255,7 @@ | ||
5229 | </modified_values> | 5255 | </modified_values> |
5230 | </data_def> | 5256 | </data_def> |
5231 | <data_def> | 5257 | <data_def> |
5232 | - <column_id>18</column_id> | 5258 | + <column_id>12</column_id> |
5233 | <type>Format</type> | 5259 | <type>Format</type> |
5234 | <repeat_num>1</repeat_num> | 5260 | <repeat_num>1</repeat_num> |
5235 | <template>nome%</template> | 5261 | <template>nome%</template> |
@@ -5244,7 +5270,7 @@ | @@ -5244,7 +5270,7 @@ | ||
5244 | </modified_values> | 5270 | </modified_values> |
5245 | </data_def> | 5271 | </data_def> |
5246 | <data_def> | 5272 | <data_def> |
5247 | - <column_id>19</column_id> | 5273 | + <column_id>13</column_id> |
5248 | <type>Foreign Key</type> | 5274 | <type>Foreign Key</type> |
5249 | <repeat_num>1</repeat_num> | 5275 | <repeat_num>1</repeat_num> |
5250 | <template>%</template> | 5276 | <template>%</template> |
@@ -5259,7 +5285,7 @@ | @@ -5259,7 +5285,7 @@ | ||
5259 | </modified_values> | 5285 | </modified_values> |
5260 | </data_def> | 5286 | </data_def> |
5261 | <data_def> | 5287 | <data_def> |
5262 | - <column_id>20</column_id> | 5288 | + <column_id>14</column_id> |
5263 | <type>Format</type> | 5289 | <type>Format</type> |
5264 | <repeat_num>1</repeat_num> | 5290 | <repeat_num>1</repeat_num> |
5265 | <template>observacao%</template> | 5291 | <template>observacao%</template> |
@@ -5277,167 +5303,167 @@ | @@ -5277,167 +5303,167 @@ | ||
5277 | </repeat_test_data> | 5303 | </repeat_test_data> |
5278 | </table_test_data> | 5304 | </table_test_data> |
5279 | <table_test_data> | 5305 | <table_test_data> |
5280 | - <table_id>7</table_id> | 5306 | + <table_id>6</table_id> |
5281 | <direct_test_data> | 5307 | <direct_test_data> |
5282 | <data> | 5308 | <data> |
5283 | <column_data> | 5309 | <column_data> |
5284 | - <column_id>21</column_id> | 5310 | + <column_id>15</column_id> |
5285 | <value>1</value> | 5311 | <value>1</value> |
5286 | </column_data> | 5312 | </column_data> |
5287 | <column_data> | 5313 | <column_data> |
5288 | - <column_id>22</column_id> | 5314 | + <column_id>16</column_id> |
5289 | <value>([nu_farm_funcionando] < 1)</value> | 5315 | <value>([nu_farm_funcionando] < 1)</value> |
5290 | </column_data> | 5316 | </column_data> |
5291 | <column_data> | 5317 | <column_data> |
5292 | - <column_id>23</column_id> | 5318 | + <column_id>17</column_id> |
5293 | <value>Nenhuma</value> | 5319 | <value>Nenhuma</value> |
5294 | </column_data> | 5320 | </column_data> |
5295 | <column_data> | 5321 | <column_data> |
5296 | - <column_id>24</column_id> | 5322 | + <column_id>18</column_id> |
5297 | <value>255</value> | 5323 | <value>255</value> |
5298 | </column_data> | 5324 | </column_data> |
5299 | <column_data> | 5325 | <column_data> |
5300 | - <column_id>25</column_id> | 5326 | + <column_id>19</column_id> |
5301 | <value>0</value> | 5327 | <value>0</value> |
5302 | </column_data> | 5328 | </column_data> |
5303 | <column_data> | 5329 | <column_data> |
5304 | - <column_id>26</column_id> | 5330 | + <column_id>20</column_id> |
5305 | <value>0</value> | 5331 | <value>0</value> |
5306 | </column_data> | 5332 | </column_data> |
5307 | <column_data> | 5333 | <column_data> |
5308 | - <column_id>27</column_id> | 5334 | + <column_id>21</column_id> |
5309 | <value>1</value> | 5335 | <value>1</value> |
5310 | </column_data> | 5336 | </column_data> |
5311 | <column_data> | 5337 | <column_data> |
5312 | - <column_id>28</column_id> | 5338 | + <column_id>22</column_id> |
5313 | <value></value> | 5339 | <value></value> |
5314 | </column_data> | 5340 | </column_data> |
5315 | <column_data> | 5341 | <column_data> |
5316 | - <column_id>29</column_id> | 5342 | + <column_id>23</column_id> |
5317 | <value></value> | 5343 | <value></value> |
5318 | </column_data> | 5344 | </column_data> |
5319 | <column_data> | 5345 | <column_data> |
5320 | - <column_id>30</column_id> | 5346 | + <column_id>24</column_id> |
5321 | <value>0</value> | 5347 | <value>0</value> |
5322 | </column_data> | 5348 | </column_data> |
5323 | <column_data> | 5349 | <column_data> |
5324 | - <column_id>31</column_id> | 5350 | + <column_id>25</column_id> |
5325 | <value>0</value> | 5351 | <value>0</value> |
5326 | </column_data> | 5352 | </column_data> |
5327 | <column_data> | 5353 | <column_data> |
5328 | - <column_id>32</column_id> | 5354 | + <column_id>26</column_id> |
5329 | <value>0</value> | 5355 | <value>0</value> |
5330 | </column_data> | 5356 | </column_data> |
5331 | <column_data> | 5357 | <column_data> |
5332 | - <column_id>33</column_id> | 5358 | + <column_id>27</column_id> |
5333 | <value></value> | 5359 | <value></value> |
5334 | </column_data> | 5360 | </column_data> |
5335 | </data> | 5361 | </data> |
5336 | <data> | 5362 | <data> |
5337 | <column_data> | 5363 | <column_data> |
5338 | - <column_id>21</column_id> | 5364 | + <column_id>15</column_id> |
5339 | <value>2</value> | 5365 | <value>2</value> |
5340 | </column_data> | 5366 | </column_data> |
5341 | <column_data> | 5367 | <column_data> |
5342 | - <column_id>22</column_id> | 5368 | + <column_id>16</column_id> |
5343 | <value>([nu_farm_funcionando] = 1)</value> | 5369 | <value>([nu_farm_funcionando] = 1)</value> |
5344 | </column_data> | 5370 | </column_data> |
5345 | <column_data> | 5371 | <column_data> |
5346 | - <column_id>23</column_id> | 5372 | + <column_id>17</column_id> |
5347 | <value>Uma</value> | 5373 | <value>Uma</value> |
5348 | </column_data> | 5374 | </column_data> |
5349 | <column_data> | 5375 | <column_data> |
5350 | - <column_id>24</column_id> | 5376 | + <column_id>18</column_id> |
5351 | <value>0</value> | 5377 | <value>0</value> |
5352 | </column_data> | 5378 | </column_data> |
5353 | <column_data> | 5379 | <column_data> |
5354 | - <column_id>25</column_id> | 5380 | + <column_id>19</column_id> |
5355 | <value>255</value> | 5381 | <value>255</value> |
5356 | </column_data> | 5382 | </column_data> |
5357 | <column_data> | 5383 | <column_data> |
5358 | - <column_id>26</column_id> | 5384 | + <column_id>20</column_id> |
5359 | <value>0</value> | 5385 | <value>0</value> |
5360 | </column_data> | 5386 | </column_data> |
5361 | <column_data> | 5387 | <column_data> |
5362 | - <column_id>27</column_id> | 5388 | + <column_id>21</column_id> |
5363 | <value>1</value> | 5389 | <value>1</value> |
5364 | </column_data> | 5390 | </column_data> |
5365 | <column_data> | 5391 | <column_data> |
5366 | - <column_id>28</column_id> | 5392 | + <column_id>22</column_id> |
5367 | <value></value> | 5393 | <value></value> |
5368 | </column_data> | 5394 | </column_data> |
5369 | <column_data> | 5395 | <column_data> |
5370 | - <column_id>29</column_id> | 5396 | + <column_id>23</column_id> |
5371 | <value></value> | 5397 | <value></value> |
5372 | </column_data> | 5398 | </column_data> |
5373 | <column_data> | 5399 | <column_data> |
5374 | - <column_id>30</column_id> | 5400 | + <column_id>24</column_id> |
5375 | <value></value> | 5401 | <value></value> |
5376 | </column_data> | 5402 | </column_data> |
5377 | <column_data> | 5403 | <column_data> |
5378 | - <column_id>31</column_id> | 5404 | + <column_id>25</column_id> |
5379 | <value></value> | 5405 | <value></value> |
5380 | </column_data> | 5406 | </column_data> |
5381 | <column_data> | 5407 | <column_data> |
5382 | - <column_id>32</column_id> | 5408 | + <column_id>26</column_id> |
5383 | <value></value> | 5409 | <value></value> |
5384 | </column_data> | 5410 | </column_data> |
5385 | <column_data> | 5411 | <column_data> |
5386 | - <column_id>33</column_id> | 5412 | + <column_id>27</column_id> |
5387 | <value></value> | 5413 | <value></value> |
5388 | </column_data> | 5414 | </column_data> |
5389 | </data> | 5415 | </data> |
5390 | <data> | 5416 | <data> |
5391 | <column_data> | 5417 | <column_data> |
5392 | - <column_id>21</column_id> | 5418 | + <column_id>15</column_id> |
5393 | <value>3</value> | 5419 | <value>3</value> |
5394 | </column_data> | 5420 | </column_data> |
5395 | <column_data> | 5421 | <column_data> |
5396 | - <column_id>22</column_id> | 5422 | + <column_id>16</column_id> |
5397 | <value>([nu_farm_funcionando] > 1)</value> | 5423 | <value>([nu_farm_funcionando] > 1)</value> |
5398 | </column_data> | 5424 | </column_data> |
5399 | <column_data> | 5425 | <column_data> |
5400 | - <column_id>23</column_id> | 5426 | + <column_id>17</column_id> |
5401 | <value>Mais de uma</value> | 5427 | <value>Mais de uma</value> |
5402 | </column_data> | 5428 | </column_data> |
5403 | <column_data> | 5429 | <column_data> |
5404 | - <column_id>24</column_id> | 5430 | + <column_id>18</column_id> |
5405 | <value>0</value> | 5431 | <value>0</value> |
5406 | </column_data> | 5432 | </column_data> |
5407 | <column_data> | 5433 | <column_data> |
5408 | - <column_id>25</column_id> | 5434 | + <column_id>19</column_id> |
5409 | <value>0</value> | 5435 | <value>0</value> |
5410 | </column_data> | 5436 | </column_data> |
5411 | <column_data> | 5437 | <column_data> |
5412 | - <column_id>26</column_id> | 5438 | + <column_id>20</column_id> |
5413 | <value>255</value> | 5439 | <value>255</value> |
5414 | </column_data> | 5440 | </column_data> |
5415 | <column_data> | 5441 | <column_data> |
5416 | - <column_id>27</column_id> | 5442 | + <column_id>21</column_id> |
5417 | <value>1</value> | 5443 | <value>1</value> |
5418 | </column_data> | 5444 | </column_data> |
5419 | <column_data> | 5445 | <column_data> |
5420 | - <column_id>28</column_id> | 5446 | + <column_id>22</column_id> |
5421 | <value></value> | 5447 | <value></value> |
5422 | </column_data> | 5448 | </column_data> |
5423 | <column_data> | 5449 | <column_data> |
5424 | - <column_id>29</column_id> | 5450 | + <column_id>23</column_id> |
5425 | <value></value> | 5451 | <value></value> |
5426 | </column_data> | 5452 | </column_data> |
5427 | <column_data> | 5453 | <column_data> |
5428 | - <column_id>30</column_id> | 5454 | + <column_id>24</column_id> |
5429 | <value></value> | 5455 | <value></value> |
5430 | </column_data> | 5456 | </column_data> |
5431 | <column_data> | 5457 | <column_data> |
5432 | - <column_id>31</column_id> | 5458 | + <column_id>25</column_id> |
5433 | <value></value> | 5459 | <value></value> |
5434 | </column_data> | 5460 | </column_data> |
5435 | <column_data> | 5461 | <column_data> |
5436 | - <column_id>32</column_id> | 5462 | + <column_id>26</column_id> |
5437 | <value></value> | 5463 | <value></value> |
5438 | </column_data> | 5464 | </column_data> |
5439 | <column_data> | 5465 | <column_data> |
5440 | - <column_id>33</column_id> | 5466 | + <column_id>27</column_id> |
5441 | <value></value> | 5467 | <value></value> |
5442 | </column_data> | 5468 | </column_data> |
5443 | </data> | 5469 | </data> |
@@ -5446,7 +5472,7 @@ | @@ -5446,7 +5472,7 @@ | ||
5446 | <test_data_num>0</test_data_num> | 5472 | <test_data_num>0</test_data_num> |
5447 | <data_def_list> | 5473 | <data_def_list> |
5448 | <data_def> | 5474 | <data_def> |
5449 | - <column_id>21</column_id> | 5475 | + <column_id>15</column_id> |
5450 | <type>Format</type> | 5476 | <type>Format</type> |
5451 | <repeat_num>1</repeat_num> | 5477 | <repeat_num>1</repeat_num> |
5452 | <template>%</template> | 5478 | <template>%</template> |
@@ -5461,7 +5487,7 @@ | @@ -5461,7 +5487,7 @@ | ||
5461 | </modified_values> | 5487 | </modified_values> |
5462 | </data_def> | 5488 | </data_def> |
5463 | <data_def> | 5489 | <data_def> |
5464 | - <column_id>22</column_id> | 5490 | + <column_id>16</column_id> |
5465 | <type>Format</type> | 5491 | <type>Format</type> |
5466 | <repeat_num>1</repeat_num> | 5492 | <repeat_num>1</repeat_num> |
5467 | <template>expressao%</template> | 5493 | <template>expressao%</template> |
@@ -5476,7 +5502,7 @@ | @@ -5476,7 +5502,7 @@ | ||
5476 | </modified_values> | 5502 | </modified_values> |
5477 | </data_def> | 5503 | </data_def> |
5478 | <data_def> | 5504 | <data_def> |
5479 | - <column_id>23</column_id> | 5505 | + <column_id>17</column_id> |
5480 | <type>Format</type> | 5506 | <type>Format</type> |
5481 | <repeat_num>1</repeat_num> | 5507 | <repeat_num>1</repeat_num> |
5482 | <template>titulo%</template> | 5508 | <template>titulo%</template> |
@@ -5491,7 +5517,7 @@ | @@ -5491,7 +5517,7 @@ | ||
5491 | </modified_values> | 5517 | </modified_values> |
5492 | </data_def> | 5518 | </data_def> |
5493 | <data_def> | 5519 | <data_def> |
5494 | - <column_id>24</column_id> | 5520 | + <column_id>18</column_id> |
5495 | <type>Format</type> | 5521 | <type>Format</type> |
5496 | <repeat_num>1</repeat_num> | 5522 | <repeat_num>1</repeat_num> |
5497 | <template>vermelho%</template> | 5523 | <template>vermelho%</template> |
@@ -5506,7 +5532,7 @@ | @@ -5506,7 +5532,7 @@ | ||
5506 | </modified_values> | 5532 | </modified_values> |
5507 | </data_def> | 5533 | </data_def> |
5508 | <data_def> | 5534 | <data_def> |
5509 | - <column_id>25</column_id> | 5535 | + <column_id>19</column_id> |
5510 | <type>Format</type> | 5536 | <type>Format</type> |
5511 | <repeat_num>1</repeat_num> | 5537 | <repeat_num>1</repeat_num> |
5512 | <template>verde%</template> | 5538 | <template>verde%</template> |
@@ -5521,7 +5547,7 @@ | @@ -5521,7 +5547,7 @@ | ||
5521 | </modified_values> | 5547 | </modified_values> |
5522 | </data_def> | 5548 | </data_def> |
5523 | <data_def> | 5549 | <data_def> |
5524 | - <column_id>26</column_id> | 5550 | + <column_id>20</column_id> |
5525 | <type>Format</type> | 5551 | <type>Format</type> |
5526 | <repeat_num>1</repeat_num> | 5552 | <repeat_num>1</repeat_num> |
5527 | <template>azul%</template> | 5553 | <template>azul%</template> |
@@ -5536,7 +5562,7 @@ | @@ -5536,7 +5562,7 @@ | ||
5536 | </modified_values> | 5562 | </modified_values> |
5537 | </data_def> | 5563 | </data_def> |
5538 | <data_def> | 5564 | <data_def> |
5539 | - <column_id>27</column_id> | 5565 | + <column_id>21</column_id> |
5540 | <type>Foreign Key</type> | 5566 | <type>Foreign Key</type> |
5541 | <repeat_num>1</repeat_num> | 5567 | <repeat_num>1</repeat_num> |
5542 | <template>%</template> | 5568 | <template>%</template> |
@@ -5551,7 +5577,7 @@ | @@ -5551,7 +5577,7 @@ | ||
5551 | </modified_values> | 5577 | </modified_values> |
5552 | </data_def> | 5578 | </data_def> |
5553 | <data_def> | 5579 | <data_def> |
5554 | - <column_id>28</column_id> | 5580 | + <column_id>22</column_id> |
5555 | <type>Format</type> | 5581 | <type>Format</type> |
5556 | <repeat_num>1</repeat_num> | 5582 | <repeat_num>1</repeat_num> |
5557 | <template>tamanho%</template> | 5583 | <template>tamanho%</template> |
@@ -5566,7 +5592,7 @@ | @@ -5566,7 +5592,7 @@ | ||
5566 | </modified_values> | 5592 | </modified_values> |
5567 | </data_def> | 5593 | </data_def> |
5568 | <data_def> | 5594 | <data_def> |
5569 | - <column_id>29</column_id> | 5595 | + <column_id>23</column_id> |
5570 | <type>Format</type> | 5596 | <type>Format</type> |
5571 | <repeat_num>1</repeat_num> | 5597 | <repeat_num>1</repeat_num> |
5572 | <template>simbolo%</template> | 5598 | <template>simbolo%</template> |
@@ -5581,7 +5607,7 @@ | @@ -5581,7 +5607,7 @@ | ||
5581 | </modified_values> | 5607 | </modified_values> |
5582 | </data_def> | 5608 | </data_def> |
5583 | <data_def> | 5609 | <data_def> |
5584 | - <column_id>30</column_id> | 5610 | + <column_id>24</column_id> |
5585 | <type>Format</type> | 5611 | <type>Format</type> |
5586 | <repeat_num>1</repeat_num> | 5612 | <repeat_num>1</repeat_num> |
5587 | <template>overmelho%</template> | 5613 | <template>overmelho%</template> |
@@ -5596,7 +5622,7 @@ | @@ -5596,7 +5622,7 @@ | ||
5596 | </modified_values> | 5622 | </modified_values> |
5597 | </data_def> | 5623 | </data_def> |
5598 | <data_def> | 5624 | <data_def> |
5599 | - <column_id>31</column_id> | 5625 | + <column_id>25</column_id> |
5600 | <type>Format</type> | 5626 | <type>Format</type> |
5601 | <repeat_num>1</repeat_num> | 5627 | <repeat_num>1</repeat_num> |
5602 | <template>overde%</template> | 5628 | <template>overde%</template> |
@@ -5611,7 +5637,7 @@ | @@ -5611,7 +5637,7 @@ | ||
5611 | </modified_values> | 5637 | </modified_values> |
5612 | </data_def> | 5638 | </data_def> |
5613 | <data_def> | 5639 | <data_def> |
5614 | - <column_id>32</column_id> | 5640 | + <column_id>26</column_id> |
5615 | <type>Format</type> | 5641 | <type>Format</type> |
5616 | <repeat_num>1</repeat_num> | 5642 | <repeat_num>1</repeat_num> |
5617 | <template>oazul%</template> | 5643 | <template>oazul%</template> |
@@ -5626,7 +5652,7 @@ | @@ -5626,7 +5652,7 @@ | ||
5626 | </modified_values> | 5652 | </modified_values> |
5627 | </data_def> | 5653 | </data_def> |
5628 | <data_def> | 5654 | <data_def> |
5629 | - <column_id>33</column_id> | 5655 | + <column_id>27</column_id> |
5630 | <type>Format</type> | 5656 | <type>Format</type> |
5631 | <repeat_num>1</repeat_num> | 5657 | <repeat_num>1</repeat_num> |
5632 | <template>otamanho%</template> | 5658 | <template>otamanho%</template> |
@@ -5644,23 +5670,23 @@ | @@ -5644,23 +5670,23 @@ | ||
5644 | </repeat_test_data> | 5670 | </repeat_test_data> |
5645 | </table_test_data> | 5671 | </table_test_data> |
5646 | <table_test_data> | 5672 | <table_test_data> |
5647 | - <table_id>10</table_id> | 5673 | + <table_id>9</table_id> |
5648 | <direct_test_data> | 5674 | <direct_test_data> |
5649 | <data> | 5675 | <data> |
5650 | <column_data> | 5676 | <column_data> |
5651 | - <column_id>49</column_id> | 5677 | + <column_id>43</column_id> |
5652 | <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value> | 5678 | <value>http://portal.saude.gov.br/portal/saude/area.cfm?id_area=1095</value> |
5653 | </column_data> | 5679 | </column_data> |
5654 | <column_data> | 5680 | <column_data> |
5655 | - <column_id>50</column_id> | 5681 | + <column_id>44</column_id> |
5656 | <value>1</value> | 5682 | <value>1</value> |
5657 | </column_data> | 5683 | </column_data> |
5658 | <column_data> | 5684 | <column_data> |
5659 | - <column_id>51</column_id> | 5685 | + <column_id>45</column_id> |
5660 | <value>Site das Fármacias Populares</value> | 5686 | <value>Site das Fármacias Populares</value> |
5661 | </column_data> | 5687 | </column_data> |
5662 | <column_data> | 5688 | <column_data> |
5663 | - <column_id>52</column_id> | 5689 | + <column_id>46</column_id> |
5664 | <value>1</value> | 5690 | <value>1</value> |
5665 | </column_data> | 5691 | </column_data> |
5666 | </data> | 5692 | </data> |
@@ -5669,7 +5695,7 @@ | @@ -5669,7 +5695,7 @@ | ||
5669 | <test_data_num>0</test_data_num> | 5695 | <test_data_num>0</test_data_num> |
5670 | <data_def_list> | 5696 | <data_def_list> |
5671 | <data_def> | 5697 | <data_def> |
5672 | - <column_id>49</column_id> | 5698 | + <column_id>43</column_id> |
5673 | <type>Format</type> | 5699 | <type>Format</type> |
5674 | <repeat_num>1</repeat_num> | 5700 | <repeat_num>1</repeat_num> |
5675 | <template>link%</template> | 5701 | <template>link%</template> |
@@ -5684,7 +5710,7 @@ | @@ -5684,7 +5710,7 @@ | ||
5684 | </modified_values> | 5710 | </modified_values> |
5685 | </data_def> | 5711 | </data_def> |
5686 | <data_def> | 5712 | <data_def> |
5687 | - <column_id>50</column_id> | 5713 | + <column_id>44</column_id> |
5688 | <type>Foreign Key</type> | 5714 | <type>Foreign Key</type> |
5689 | <repeat_num>1</repeat_num> | 5715 | <repeat_num>1</repeat_num> |
5690 | <template>%</template> | 5716 | <template>%</template> |
@@ -5699,7 +5725,7 @@ | @@ -5699,7 +5725,7 @@ | ||
5699 | </modified_values> | 5725 | </modified_values> |
5700 | </data_def> | 5726 | </data_def> |
5701 | <data_def> | 5727 | <data_def> |
5702 | - <column_id>51</column_id> | 5728 | + <column_id>45</column_id> |
5703 | <type>Format</type> | 5729 | <type>Format</type> |
5704 | <repeat_num>1</repeat_num> | 5730 | <repeat_num>1</repeat_num> |
5705 | <template>nome%</template> | 5731 | <template>nome%</template> |
@@ -5714,7 +5740,7 @@ | @@ -5714,7 +5740,7 @@ | ||
5714 | </modified_values> | 5740 | </modified_values> |
5715 | </data_def> | 5741 | </data_def> |
5716 | <data_def> | 5742 | <data_def> |
5717 | - <column_id>52</column_id> | 5743 | + <column_id>46</column_id> |
5718 | <type>Format</type> | 5744 | <type>Format</type> |
5719 | <repeat_num>1</repeat_num> | 5745 | <repeat_num>1</repeat_num> |
5720 | <template>%</template> | 5746 | <template>%</template> |
@@ -5732,15 +5758,15 @@ | @@ -5732,15 +5758,15 @@ | ||
5732 | </repeat_test_data> | 5758 | </repeat_test_data> |
5733 | </table_test_data> | 5759 | </table_test_data> |
5734 | <table_test_data> | 5760 | <table_test_data> |
5735 | - <table_id>11</table_id> | 5761 | + <table_id>10</table_id> |
5736 | <direct_test_data> | 5762 | <direct_test_data> |
5737 | <data> | 5763 | <data> |
5738 | <column_data> | 5764 | <column_data> |
5739 | - <column_id>53</column_id> | 5765 | + <column_id>47</column_id> |
5740 | <value>1</value> | 5766 | <value>1</value> |
5741 | </column_data> | 5767 | </column_data> |
5742 | <column_data> | 5768 | <column_data> |
5743 | - <column_id>54</column_id> | 5769 | + <column_id>48</column_id> |
5744 | <value>1</value> | 5770 | <value>1</value> |
5745 | </column_data> | 5771 | </column_data> |
5746 | </data> | 5772 | </data> |
@@ -5749,7 +5775,7 @@ | @@ -5749,7 +5775,7 @@ | ||
5749 | <test_data_num>0</test_data_num> | 5775 | <test_data_num>0</test_data_num> |
5750 | <data_def_list> | 5776 | <data_def_list> |
5751 | <data_def> | 5777 | <data_def> |
5752 | - <column_id>53</column_id> | 5778 | + <column_id>47</column_id> |
5753 | <type>Foreign Key</type> | 5779 | <type>Foreign Key</type> |
5754 | <repeat_num>1</repeat_num> | 5780 | <repeat_num>1</repeat_num> |
5755 | <template>%</template> | 5781 | <template>%</template> |
@@ -5764,7 +5790,7 @@ | @@ -5764,7 +5790,7 @@ | ||
5764 | </modified_values> | 5790 | </modified_values> |
5765 | </data_def> | 5791 | </data_def> |
5766 | <data_def> | 5792 | <data_def> |
5767 | - <column_id>54</column_id> | 5793 | + <column_id>48</column_id> |
5768 | <type>Foreign Key</type> | 5794 | <type>Foreign Key</type> |
5769 | <repeat_num>1</repeat_num> | 5795 | <repeat_num>1</repeat_num> |
5770 | <template>%</template> | 5796 | <template>%</template> |
@@ -5782,19 +5808,19 @@ | @@ -5782,19 +5808,19 @@ | ||
5782 | </repeat_test_data> | 5808 | </repeat_test_data> |
5783 | </table_test_data> | 5809 | </table_test_data> |
5784 | <table_test_data> | 5810 | <table_test_data> |
5785 | - <table_id>8</table_id> | 5811 | + <table_id>7</table_id> |
5786 | <direct_test_data> | 5812 | <direct_test_data> |
5787 | <data> | 5813 | <data> |
5788 | <column_data> | 5814 | <column_data> |
5789 | - <column_id>34</column_id> | 5815 | + <column_id>28</column_id> |
5790 | <value>1</value> | 5816 | <value>1</value> |
5791 | </column_data> | 5817 | </column_data> |
5792 | <column_data> | 5818 | <column_data> |
5793 | - <column_id>35</column_id> | 5819 | + <column_id>29</column_id> |
5794 | <value>Ministério da Saúde</value> | 5820 | <value>Ministério da Saúde</value> |
5795 | </column_data> | 5821 | </column_data> |
5796 | <column_data> | 5822 | <column_data> |
5797 | - <column_id>36</column_id> | 5823 | + <column_id>30</column_id> |
5798 | <value>http://saude.gov.br</value> | 5824 | <value>http://saude.gov.br</value> |
5799 | </column_data> | 5825 | </column_data> |
5800 | </data> | 5826 | </data> |
@@ -5803,7 +5829,7 @@ | @@ -5803,7 +5829,7 @@ | ||
5803 | <test_data_num>0</test_data_num> | 5829 | <test_data_num>0</test_data_num> |
5804 | <data_def_list> | 5830 | <data_def_list> |
5805 | <data_def> | 5831 | <data_def> |
5806 | - <column_id>34</column_id> | 5832 | + <column_id>28</column_id> |
5807 | <type>Format</type> | 5833 | <type>Format</type> |
5808 | <repeat_num>1</repeat_num> | 5834 | <repeat_num>1</repeat_num> |
5809 | <template>%</template> | 5835 | <template>%</template> |
@@ -5818,7 +5844,7 @@ | @@ -5818,7 +5844,7 @@ | ||
5818 | </modified_values> | 5844 | </modified_values> |
5819 | </data_def> | 5845 | </data_def> |
5820 | <data_def> | 5846 | <data_def> |
5821 | - <column_id>35</column_id> | 5847 | + <column_id>29</column_id> |
5822 | <type>Format</type> | 5848 | <type>Format</type> |
5823 | <repeat_num>1</repeat_num> | 5849 | <repeat_num>1</repeat_num> |
5824 | <template>titulo%</template> | 5850 | <template>titulo%</template> |
@@ -5833,7 +5859,7 @@ | @@ -5833,7 +5859,7 @@ | ||
5833 | </modified_values> | 5859 | </modified_values> |
5834 | </data_def> | 5860 | </data_def> |
5835 | <data_def> | 5861 | <data_def> |
5836 | - <column_id>36</column_id> | 5862 | + <column_id>30</column_id> |
5837 | <type>Format</type> | 5863 | <type>Format</type> |
5838 | <repeat_num>1</repeat_num> | 5864 | <repeat_num>1</repeat_num> |
5839 | <template>link%</template> | 5865 | <template>link%</template> |
@@ -0,0 +1,80 @@ | @@ -0,0 +1,80 @@ | ||
1 | +//+$trad(1,i3GEOF.metaestat.dicionario)+ | ||
2 | +i3GEOF.metaestat.dicionario = { | ||
3 | +"1":[ | ||
4 | +{ | ||
5 | +pt:"Escolha uma variável para o mapa", | ||
6 | +en:"", | ||
7 | +es:"", | ||
8 | +it:"" | ||
9 | +}], | ||
10 | +"2":[ | ||
11 | +{ | ||
12 | +pt:"Escolha uma medida da variável", | ||
13 | +en:"", | ||
14 | +es:"", | ||
15 | +it:"" | ||
16 | +}], | ||
17 | +"3":[ | ||
18 | +{ | ||
19 | +pt:"Mais informações sobre a variável ", | ||
20 | +en:"", | ||
21 | +es:"", | ||
22 | +it:"" | ||
23 | +}], | ||
24 | +"4":[ | ||
25 | +{ | ||
26 | +pt:"Escolha uma variavel primeiro", | ||
27 | +en:"", | ||
28 | +es:"", | ||
29 | +it:"" | ||
30 | +}], | ||
31 | +"5":[ | ||
32 | +{ | ||
33 | +pt:"Relatório", | ||
34 | +en:"", | ||
35 | +es:"", | ||
36 | +it:"" | ||
37 | +}], | ||
38 | +"6":[ | ||
39 | +{ | ||
40 | +pt:"Classes", | ||
41 | +en:"", | ||
42 | +es:"", | ||
43 | +it:"" | ||
44 | +}], | ||
45 | +"7":[ | ||
46 | +{ | ||
47 | +pt:"Adicionar camada ao mapa", | ||
48 | +en:"", | ||
49 | +es:"", | ||
50 | +it:"" | ||
51 | +}], | ||
52 | +"8":[ | ||
53 | +{ | ||
54 | +pt:"Como os dados serão representados", | ||
55 | +en:"", | ||
56 | +es:"", | ||
57 | +it:"" | ||
58 | +}], | ||
59 | +"9":[ | ||
60 | +{ | ||
61 | +pt:"Escolha um tipo de classificação", | ||
62 | +en:"", | ||
63 | +es:"", | ||
64 | +it:"" | ||
65 | +}], | ||
66 | +"10":[ | ||
67 | +{ | ||
68 | +pt:"Criar camada", | ||
69 | +en:"", | ||
70 | +es:"", | ||
71 | +it:"" | ||
72 | +}], | ||
73 | +"11":[ | ||
74 | +{ | ||
75 | +pt:"Análise", | ||
76 | +en:"", | ||
77 | +es:"", | ||
78 | +it:"" | ||
79 | +}] | ||
80 | +}; | ||
0 | \ No newline at end of file | 81 | \ No newline at end of file |
@@ -0,0 +1,629 @@ | @@ -0,0 +1,629 @@ | ||
1 | +/* | ||
2 | +Title: Cartogramas estatísticos | ||
3 | + | ||
4 | +Arquivo: | ||
5 | + | ||
6 | +i3geo/ferramentas/metaestat/index.js | ||
7 | + | ||
8 | +Licenca: | ||
9 | + | ||
10 | +GPL2 | ||
11 | + | ||
12 | +i3Geo Interface Integrada de Ferramentas de Geoprocessamento para Internet | ||
13 | + | ||
14 | +Direitos Autorais Reservados (c) 2006 Ministério do Meio Ambiente Brasil | ||
15 | +Desenvolvedor: Edmar Moretti edmar.moretti@mma.gov.br | ||
16 | + | ||
17 | +Este programa é software livre; você pode redistribuí-lo | ||
18 | +e/ou modificá-lo sob os termos da Licença Pública Geral | ||
19 | +GNU conforme publicada pela Free Software Foundation; | ||
20 | + | ||
21 | +Este programa é distribuído na expectativa de que seja útil, | ||
22 | +porém, SEM NENHUMA GARANTIA; nem mesmo a garantia implícita | ||
23 | +de COMERCIABILIDADE OU ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. | ||
24 | +Consulte a Licença Pública Geral do GNU para mais detalhes. | ||
25 | +Você deve ter recebido uma cópia da Licença Pública Geral do | ||
26 | +GNU junto com este programa; se não, escreva para a | ||
27 | +Free Software Foundation, Inc., no endereço | ||
28 | +59 Temple Street, Suite 330, Boston, MA 02111-1307 USA. | ||
29 | +*/ | ||
30 | +if(typeof(i3GEOF) === 'undefined'){ | ||
31 | + var i3GEOF = {}; | ||
32 | +} | ||
33 | +/* | ||
34 | +Classe: i3GEOF.metaestat | ||
35 | + | ||
36 | +Gerencia os componentes do módulo de geração de cartogramas estatísticos | ||
37 | +*/ | ||
38 | +i3GEOF.metaestat = { | ||
39 | + INTERFACE: "flutuante", | ||
40 | + TOP: 50, | ||
41 | + LEFT: 100, | ||
42 | + LARGURA: 260, | ||
43 | + ALTURA: 300, | ||
44 | + //lista das camadas que foram adicionadas ao mapa | ||
45 | + CAMADAS: [], | ||
46 | + inicia: function(iddiv){ | ||
47 | + i3GEOF.metaestat.iniciaDicionario(); | ||
48 | + }, | ||
49 | + iniciaDicionario: function(){ | ||
50 | + if(typeof(i3GEOF.metaestat.dicionario) === 'undefined'){ | ||
51 | + i3GEO.util.scriptTag( | ||
52 | + i3GEO.configura.locaplic+"/ferramentas/metaestat/dicionario.js", | ||
53 | + "i3GEOF.metaestat.principal.inicia()", | ||
54 | + "i3GEOF.metaestat.dicionario_script" | ||
55 | + ); | ||
56 | + } | ||
57 | + else{ | ||
58 | + i3GEOF.metaestat.principal.inicia(); | ||
59 | + } | ||
60 | + }, | ||
61 | + desligaCamadas: function(){ | ||
62 | + if(i3GEOF.metaestat.CAMADAS.length > 0){ | ||
63 | + i3GEO.arvoreDeCamadas.ligaDesligaTemas(i3GEOF.metaestat.CAMADAS.join(","),false); | ||
64 | + } | ||
65 | + }, | ||
66 | + adicionaCamada: function(){ | ||
67 | + //function mapfileMedidaVariavel($id_medida_variavel,$filtro="",$todasascolunas = 0,$tipolayer="polygon",$titulolayer="",$id_classificacao="",$agruparpor=""){ | ||
68 | + var v = i3GEOF.metaestat.verificaParametros(), | ||
69 | + temp = function(retorno){ | ||
70 | + if(i3GEO.arvoreDeCamadas.pegaTema(retorno.layer) == ""){ | ||
71 | + i3GEOF.metaestat.desligaCamadas(); | ||
72 | + i3GEO.php.adtema(i3GEO.atualiza,retorno.mapfile); | ||
73 | + i3GEOF.metaestat.CAMADAS.push(retorno.layer); | ||
74 | + } | ||
75 | + }; | ||
76 | + if(v != true){ | ||
77 | + alert("erro: "+v); | ||
78 | + } | ||
79 | + i3GEO.php.mapfileMedidaVariavel( | ||
80 | + temp, | ||
81 | + $i("i3geoCartoComboMedidasVariavel").value, | ||
82 | + i3GEOF.metaestat.defineFiltro(), | ||
83 | + 0, | ||
84 | + $i("i3geoCartoComboTipoRep").value, | ||
85 | + i3GEOF.metaestat.defineTitulo(), | ||
86 | + $i("i3geoCartoComboTipoClassificacao").value, | ||
87 | + i3GEOF.metaestat.defineAgruparPor() | ||
88 | + ); | ||
89 | + }, | ||
90 | + defineTitulo: function(){ | ||
91 | + //se nao tiver parametros, filtro e vazio | ||
92 | + if(i3GEOF.metaestat.parametros.dados.length == 0){ | ||
93 | + return ""; | ||
94 | + } | ||
95 | + //se tiver parametro e todos estiverem vazios, aborta | ||
96 | + var i,n,c,titulo, | ||
97 | + t=[], | ||
98 | + dados = i3GEOF.metaestat.parametros.dados; | ||
99 | + titulo = $i("i3geoCartoComboVariavel").options[$i("i3geoCartoComboVariavel").selectedIndex].label +" - "+ | ||
100 | + $i("i3geoCartoComboMedidasVariavel").options[$i("i3geoCartoComboMedidasVariavel").selectedIndex].label +" - "+ | ||
101 | + $i("i3geoCartoComboTipoRep").options[$i("i3geoCartoComboTipoRep").selectedIndex].label +" - "+ | ||
102 | + $i("i3geoCartoComboTipoClassificacao").options[$i("i3geoCartoComboTipoClassificacao").selectedIndex].label; | ||
103 | + n = dados.length; | ||
104 | + for(i=0;i<n;i++){ | ||
105 | + c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai); | ||
106 | + if(c && c.value != ""){ | ||
107 | + t.push(dados[i].nome+" = "+c.value); | ||
108 | + } | ||
109 | + } | ||
110 | + if(t.length > 0){ | ||
111 | + return titulo+" - "+t.join(", "); | ||
112 | + } | ||
113 | + else{ | ||
114 | + return titulo; | ||
115 | + } | ||
116 | + }, | ||
117 | + defineFiltro: function(){ | ||
118 | + //se nao tiver parametros, filtro e vazio | ||
119 | + if(i3GEOF.metaestat.parametros.dados.length == 0){ | ||
120 | + return ""; | ||
121 | + } | ||
122 | + //se tiver parametro e todos estiverem vazios, aborta | ||
123 | + var i,n,c, | ||
124 | + t=[], | ||
125 | + dados = i3GEOF.metaestat.parametros.dados; | ||
126 | + n = dados.length; | ||
127 | + for(i=0;i<n;i++){ | ||
128 | + c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai); | ||
129 | + if(c && c.value != ""){ | ||
130 | + t.push(dados[i].coluna+"="+c.value); | ||
131 | + } | ||
132 | + } | ||
133 | + if(t.length > 0){ | ||
134 | + return t.join(" and "); | ||
135 | + } | ||
136 | + else{ | ||
137 | + return ""; | ||
138 | + } | ||
139 | + }, | ||
140 | + defineAgruparPor: function(){ | ||
141 | + //se nao tiver parametros, filtro e vazio | ||
142 | + if(i3GEOF.metaestat.parametros.dados.length == 0){ | ||
143 | + return ""; | ||
144 | + } | ||
145 | + //se tiver parametro e todos estiverem vazios, aborta | ||
146 | + var i,n,c, | ||
147 | + t=[], | ||
148 | + dados = i3GEOF.metaestat.parametros.dados; | ||
149 | + n = dados.length; | ||
150 | + for(i=0;i<n;i++){ | ||
151 | + c = $i("comboparametro_"+dados[i].id_parametro_medida+"_"+dados[i].id_pai); | ||
152 | + if(c && c.value != ""){ | ||
153 | + t.push(dados[i].coluna); | ||
154 | + } | ||
155 | + } | ||
156 | + if(t.length > 0){ | ||
157 | + return t.join(","); | ||
158 | + } | ||
159 | + else{ | ||
160 | + return ""; | ||
161 | + } | ||
162 | + }, | ||
163 | + verificaParametros: function(){ | ||
164 | + var ok = true, | ||
165 | + combos = ["i3geoCartoComboVariavel","i3geoCartoComboMedidasVariavel","i3geoCartoComboTipoRep","i3geoCartoComboTipoClassificacao"], | ||
166 | + n = combos.length, | ||
167 | + i,temp; | ||
168 | + for(i=0;i<n;i++){ | ||
169 | + temp = $i(combos[i]); | ||
170 | + if(!temp){ | ||
171 | + return combos[i]; | ||
172 | + } | ||
173 | + if(temp.value == ""){ | ||
174 | + return combos[i]; | ||
175 | + } | ||
176 | + } | ||
177 | + return ok; | ||
178 | + }, | ||
179 | + aguarde: function(obj){ | ||
180 | + if(!obj){ | ||
181 | + return "<img style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />"; | ||
182 | + } | ||
183 | + var i = $i(obj.id+"_imagem"); | ||
184 | + if(!i){ | ||
185 | + obj.innerHTML = "<img id='"+obj.id+"_imagem' style='display:block;z-index:2' src=\'"+i3GEO.configura.locaplic+"/imagens/aguarde.gif\' />"; | ||
186 | + } | ||
187 | + else{ | ||
188 | + if(i.style.display == "block"){ | ||
189 | + i.style.display = "none"; | ||
190 | + } | ||
191 | + else{ | ||
192 | + i.style.display = "block"; | ||
193 | + } | ||
194 | + } | ||
195 | + }, | ||
196 | + principal: { | ||
197 | + inicia: function(iddiv){ | ||
198 | + if(!iddiv){ | ||
199 | + iddiv = "i3geoCartoParametros_corpo"; | ||
200 | + } | ||
201 | + if(i3GEOF.metaestat.INTERFACE == "flutuante"){ | ||
202 | + i3GEOF.metaestat.principal.abreJanela(); | ||
203 | + } | ||
204 | + $i(iddiv).innerHTML = i3GEOF.metaestat.principal.html(); | ||
205 | + i3GEOF.metaestat.principal.comboVariaveis(); | ||
206 | + }, | ||
207 | + abreJanela: function(){ | ||
208 | + var cabecalho,minimiza,imagemxy,janela; | ||
209 | + if (!$i("i3geoCartoParametros")){ | ||
210 | + cabecalho = function(){ | ||
211 | + }; | ||
212 | + minimiza = function(){ | ||
213 | + i3GEO.janela.minimiza("i3geoCartoParametros"); | ||
214 | + }; | ||
215 | + janela = i3GEO.janela.cria( | ||
216 | + i3GEOF.metaestat.LARGURA+"px", | ||
217 | + i3GEOF.metaestat.ALTURA+"px", | ||
218 | + "", | ||
219 | + "", | ||
220 | + "", | ||
221 | + $trad("x57"), | ||
222 | + "i3geoCartoParametros", | ||
223 | + false, | ||
224 | + "hd", | ||
225 | + cabecalho, | ||
226 | + minimiza | ||
227 | + ); | ||
228 | + janela = janela[0]; | ||
229 | + YAHOO.i3GEO.janela.manager.register(janela); | ||
230 | + janela.render(); | ||
231 | + } | ||
232 | + else{ | ||
233 | + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoParametros"); | ||
234 | + } | ||
235 | + janela.show(); | ||
236 | + imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); | ||
237 | + janela.moveTo(imagemxy[0]+i3GEOF.metaestat.LEFT,i3GEOF.metaestat.TOP); | ||
238 | + }, | ||
239 | + html: function(){ | ||
240 | + var ins = '<div id="i3geoCartoVariaveisContainer" style="margin-left:5px;">' + | ||
241 | + '<div class="paragrafo" id="i3geoCartoVariaveis" >' + | ||
242 | + '</div>' + | ||
243 | + '<div class="paragrafo" id="i3geoCartoMedidasVariavel" >' + | ||
244 | + '</div>' + | ||
245 | + '<div class="paragrafo" id="i3geoCartoParametrosMedidasVariavel" >' + | ||
246 | + '</div>' + | ||
247 | + '</div>'; | ||
248 | + return ins; | ||
249 | + }, | ||
250 | + maisInfo: function(){ | ||
251 | + var temp = "", | ||
252 | + v = $i("i3geoCartoComboVariavel"); | ||
253 | + if(!v || v.value === ""){ | ||
254 | + alert($trad(4,i3GEOF.metaestat.dicionario)); | ||
255 | + } | ||
256 | + else{ | ||
257 | + var cabecalho,minimiza,janela; | ||
258 | + if (!$i("i3geoCartoMaisInfo")){ | ||
259 | + cabecalho = function(){ | ||
260 | + }; | ||
261 | + minimiza = function(){ | ||
262 | + i3GEO.janela.minimiza("i3geoCartoMaisInfo"); | ||
263 | + }; | ||
264 | + janela = i3GEO.janela.cria( | ||
265 | + "400px", | ||
266 | + "300px", | ||
267 | + "", | ||
268 | + "", | ||
269 | + "", | ||
270 | + $trad(5,i3GEOF.metaestat.dicionario), | ||
271 | + "i3geoCartoMaisInfo", | ||
272 | + false, | ||
273 | + "hd", | ||
274 | + cabecalho, | ||
275 | + minimiza | ||
276 | + ); | ||
277 | + janela = janela[0]; | ||
278 | + YAHOO.i3GEO.janela.manager.register(janela); | ||
279 | + janela.render(); | ||
280 | + //YAHOO.util.Event.addListener(janela.close, "click", i3GEOF.metaestat.fechaJanelaParametros); | ||
281 | + } | ||
282 | + else{ | ||
283 | + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoMaisInfo"); | ||
284 | + } | ||
285 | + janela.setBody(i3GEOF.metaestat.aguarde()); | ||
286 | + temp = function(retorno){ | ||
287 | + janela.setBody(retorno); | ||
288 | + janela.show(); | ||
289 | + //imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); | ||
290 | + //janela.moveTo(imagemxy[0]+i3GEOF.metaestat.LEFT,imagemxy[1]+i3GEOF.metaestat.TOP); | ||
291 | + }; | ||
292 | + i3GEO.php.relatorioVariavel(v.value,temp); | ||
293 | + } | ||
294 | + }, | ||
295 | + comboVariaveis: function(){ | ||
296 | + var onde = $i("i3geoCartoVariaveis"), | ||
297 | + temp = function(dados){ | ||
298 | + var n = dados.length, | ||
299 | + ins = '', | ||
300 | + i; | ||
301 | + //botao para obter mais info | ||
302 | + ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoInfo" value="'+$trad(3,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" /></p>' + | ||
303 | + '<br><p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoClasses" value="'+$trad(10,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" />' + | ||
304 | + '<input type="button" id="i3GEOcartoBotaoAnalise" value="'+$trad(11,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="width:200px;cursor:pointer;color:blue" /></p>' + | ||
305 | + '<br><p class="paragrafo" >'+$trad(1,i3GEOF.metaestat.dicionario)+'</p>' + | ||
306 | + "<select id='i3geoCartoComboVariavel' style='box-shadow:0 1px 5px gray;width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange='i3GEOF.metaestat.principal.comboVariaveisOnchange(this)'><option value=''>---</option>"; | ||
307 | + for(i=0;i<n;i++){ | ||
308 | + ins += "<option title='"+dados[i].descricao+"' value='"+dados[i].codigo_variavel+"'>"+dados[i].nome+"</option>"; | ||
309 | + } | ||
310 | + ins += "</select>"; | ||
311 | + if(onde){ | ||
312 | + onde.innerHTML = ins; | ||
313 | + new YAHOO.widget.Button( | ||
314 | + "i3GEOcartoBotaoInfo", | ||
315 | + {onclick:{fn: i3GEOF.metaestat.principal.maisInfo}} | ||
316 | + ); | ||
317 | + $i("i3GEOcartoBotaoInfo-button").style.width = i3GEOF.metaestat.LARGURA - 25 + "px"; | ||
318 | + new YAHOO.widget.Button( | ||
319 | + "i3GEOcartoBotaoClasses", | ||
320 | + {onclick:{fn: i3GEOF.metaestat.classes.inicia}} | ||
321 | + ); | ||
322 | + $i("i3GEOcartoBotaoClasses-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; | ||
323 | + new YAHOO.widget.Button( | ||
324 | + "i3GEOcartoBotaoAnalise", | ||
325 | + {onclick:{fn: i3GEOF.metaestat.analise.inicia}} | ||
326 | + ); | ||
327 | + $i("i3GEOcartoBotaoAnalise-button").style.width = (i3GEOF.metaestat.LARGURA / 2) - 15 + "px"; | ||
328 | + } | ||
329 | + return ins; | ||
330 | + }; | ||
331 | + i3GEOF.metaestat.aguarde(onde); | ||
332 | + i3GEO.php.listaVariavel(temp); | ||
333 | + }, | ||
334 | + comboVariaveisOnchange: function(combo){ | ||
335 | + if(combo.value != ""){ | ||
336 | + i3GEOF.metaestat.principal.comboMedidasVariavel(combo.value); | ||
337 | + } | ||
338 | + else{ | ||
339 | + $i("i3geoCartoMedidasVariavel").innerHTML = ""; | ||
340 | + $i("i3geoCartoParametrosMedidasVariavel").innerHTML = ""; | ||
341 | + } | ||
342 | + }, | ||
343 | + comboMedidasVariavel: function(codigo_variavel){ | ||
344 | + var onde = $i("i3geoCartoMedidasVariavel"), | ||
345 | + temp = function(dados){ | ||
346 | + var n = dados.length, | ||
347 | + ins = '<p class="paragrafo" >'+$trad(2,i3GEOF.metaestat.dicionario)+'</p>', | ||
348 | + i; | ||
349 | + ins += "<select id='i3geoCartoComboMedidasVariavel' style='width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange='i3GEOF.metaestat.principal.comboMedidaVariavelOnchange(this)'><option value=''>---</option>"; | ||
350 | + for(i=0;i<n;i++){ | ||
351 | + ins += "<option value='"+dados[i].id_medida_variavel+"'>"+dados[i].nomemedida+"</option>"; | ||
352 | + } | ||
353 | + ins += "</select>"; | ||
354 | + if(onde){ | ||
355 | + onde.innerHTML = ins; | ||
356 | + } | ||
357 | + return ins; | ||
358 | + }; | ||
359 | + i3GEOF.metaestat.aguarde(onde); | ||
360 | + i3GEO.php.listaMedidaVariavel(codigo_variavel,temp); | ||
361 | + }, | ||
362 | + comboMedidaVariavelOnchange: function(combo){ | ||
363 | + i3GEOF.metaestat.classes.inicia(); | ||
364 | + if(combo.value != ""){ | ||
365 | + i3GEOF.metaestat.parametros.lista(combo.value); | ||
366 | + } | ||
367 | + else{ | ||
368 | + $i("i3geoCartoParametrosMedidasVariavel").innerHTML = ""; | ||
369 | + } | ||
370 | + } | ||
371 | + }, | ||
372 | + parametros: { | ||
373 | + //guarda a lista de parametros | ||
374 | + dados: [], | ||
375 | + //obtem a lista com os parametros da medida | ||
376 | + //cria os combos para os parametros que sao pai de todos | ||
377 | + lista: function(id_medida_variavel){ | ||
378 | + i3GEOF.metaestat.aguarde($i("i3geoCartoParametrosMedidasVariavel")); | ||
379 | + var temp = function(dados){ | ||
380 | + i3GEOF.metaestat.parametros.dados = dados; | ||
381 | + i3GEOF.metaestat.parametros.combos("0"); | ||
382 | + i3GEOF.metaestat.aguarde($i("i3geoCartoParametrosMedidasVariavel")); | ||
383 | + }; | ||
384 | + i3GEO.php.listaParametrosMedidaVariavel(id_medida_variavel,temp); | ||
385 | + }, | ||
386 | + //cria um combo para escolher os valores de um parametro | ||
387 | + combos: function(nivel){ | ||
388 | + var dados = i3GEOF.metaestat.parametros.dados, | ||
389 | + n = dados.length, | ||
390 | + onde = $i("i3geoCartoParametrosMedidasVariavel"), | ||
391 | + idpar,idcombo,i,novoel,teste; | ||
392 | + //cria o combo para o parametro cujo id_pai for do nivel escolhido | ||
393 | + for(i=0;i<n;i++){ | ||
394 | + if(dados[i].id_pai == nivel){ | ||
395 | + idpar = "parametro_"+dados[i].id_parametro_medida; | ||
396 | + idcombo = "parametro_"+dados[i].id_parametro_medida+"_"+nivel; | ||
397 | + teste = i3GEOF.metaestat.parametros.retornaIdPai(dados[i].id_parametro_medida); | ||
398 | + if(teste != false){ | ||
399 | + idpar = "parametro_"+teste; | ||
400 | + } | ||
401 | + if(!$i(idpar)){ | ||
402 | + novoel = document.createElement("div"); | ||
403 | + novoel.id = idpar; | ||
404 | + novoel.className = "paragrafo"; | ||
405 | + onde.appendChild(novoel); | ||
406 | + onde = novoel; | ||
407 | + } | ||
408 | + onde = $i(idpar); | ||
409 | + if(!$i(idcombo)){ | ||
410 | + i3GEOF.metaestat.aguarde(onde); | ||
411 | + novoel = document.createElement("div"); | ||
412 | + novoel.id = idcombo; | ||
413 | + novoel.className = "paragrafo"; | ||
414 | + onde.appendChild(novoel); | ||
415 | + i3GEOF.metaestat.parametros.valoresCombo(dados[i].id_parametro_medida,dados[i].nome,nivel,onde,idcombo); | ||
416 | + } | ||
417 | + } | ||
418 | + } | ||
419 | + }, | ||
420 | + valoresCombo: function(id_parametro_medida,titulo,nivel,onde,idcombo){ | ||
421 | + var temp = function(dados){ | ||
422 | + var n = dados.length, | ||
423 | + ins = "", | ||
424 | + oc = "'i3GEOF.metaestat.parametros.antesCombo();i3GEOF.metaestat.parametros.combos(\""+id_parametro_medida+"\")'", | ||
425 | + filho = i3GEOF.metaestat.parametros.retornaIdFilho(id_parametro_medida), | ||
426 | + i,novoel; | ||
427 | + if(filho == false){ | ||
428 | + oc = ""; | ||
429 | + } | ||
430 | + ins = "<p class=paragrafo >"+titulo+"</p>"; | ||
431 | + ins += "<select id='combo"+idcombo+"' style='background:beige;width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange="+oc+" ><option value=''>---</option>"; | ||
432 | + for(i=0;i<n;i++){ | ||
433 | + ins += "<option value='"+dados[i]+"'>"+dados[i]+"</option>"; | ||
434 | + } | ||
435 | + ins += "</select>"; | ||
436 | + novoel = document.createElement("div"); | ||
437 | + novoel.className = "paragrafo"; | ||
438 | + novoel.innerHTML = ins; | ||
439 | + i3GEOF.metaestat.aguarde(onde); | ||
440 | + onde.appendChild(novoel); | ||
441 | + }; | ||
442 | + i3GEO.php.listaValoresParametroMedidaVariavel(id_parametro_medida,temp); | ||
443 | + }, | ||
444 | + antesCombo: function(){ | ||
445 | + if(!$i("i3geoCartoClasses_corpo")){ | ||
446 | + i3GEOF.metaestat.classes.inicia(); | ||
447 | + } | ||
448 | + }, | ||
449 | + //retorna o id do parametro que e filho de um outro parametro | ||
450 | + retornaIdFilho:function(pai){ | ||
451 | + var dados = i3GEOF.metaestat.parametros.dados, | ||
452 | + n = dados.length, | ||
453 | + i; | ||
454 | + for(i=0;i<n;i++){ | ||
455 | + if(dados[i].id_pai == pai){ | ||
456 | + return dados[i].id_parametro_medida; | ||
457 | + } | ||
458 | + } | ||
459 | + return false; | ||
460 | + }, | ||
461 | + //retorna o id do parametro que e pai de um outro parametro | ||
462 | + retornaIdPai:function(filho){ | ||
463 | + var dados = i3GEOF.metaestat.parametros.dados, | ||
464 | + n = dados.length, | ||
465 | + i; | ||
466 | + for(i=0;i<n;i++){ | ||
467 | + if(dados[i].id_parametro_medida == filho){ | ||
468 | + return dados[i].id_pai; | ||
469 | + } | ||
470 | + } | ||
471 | + return false; | ||
472 | + } | ||
473 | + }, | ||
474 | + classes:{ | ||
475 | + inicia: function(iddiv){ | ||
476 | + if(!$i("i3geoCartoComboMedidasVariavel")){ | ||
477 | + alert("erro: i3geoCartoComboMedidasVariavel???"); | ||
478 | + return; | ||
479 | + } | ||
480 | + if(!iddiv){ | ||
481 | + iddiv = "i3geoCartoClasses_corpo"; | ||
482 | + } | ||
483 | + if(i3GEOF.metaestat.INTERFACE == "flutuante"){ | ||
484 | + i3GEOF.metaestat.classes.abreJanela(); | ||
485 | + } | ||
486 | + $i(iddiv).innerHTML = i3GEOF.metaestat.classes.html(); | ||
487 | + i3GEOF.metaestat.classes.comboTipoRep(); | ||
488 | + i3GEOF.metaestat.classes.comboTipoClassificacao(); | ||
489 | + }, | ||
490 | + abreJanela: function(){ | ||
491 | + var cabecalho,minimiza,imagemxy,janela; | ||
492 | + if (!$i("i3geoCartoClasses")){ | ||
493 | + cabecalho = function(){ | ||
494 | + }; | ||
495 | + minimiza = function(){ | ||
496 | + i3GEO.janela.minimiza("i3geoCartoClasses"); | ||
497 | + }; | ||
498 | + janela = i3GEO.janela.cria( | ||
499 | + i3GEOF.metaestat.LARGURA+"px", | ||
500 | + i3GEOF.metaestat.ALTURA+"px", | ||
501 | + "", | ||
502 | + "", | ||
503 | + "", | ||
504 | + $trad(6,i3GEOF.metaestat.dicionario), | ||
505 | + "i3geoCartoClasses", | ||
506 | + false, | ||
507 | + "hd", | ||
508 | + cabecalho, | ||
509 | + minimiza | ||
510 | + ); | ||
511 | + janela = janela[0]; | ||
512 | + YAHOO.i3GEO.janela.manager.register(janela); | ||
513 | + janela.render(); | ||
514 | + } | ||
515 | + else{ | ||
516 | + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoClasses"); | ||
517 | + } | ||
518 | + janela.show(); | ||
519 | + imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); | ||
520 | + janela.moveTo(imagemxy[0]+i3GEOF.metaestat.LEFT+i3GEOF.metaestat.LARGURA+10,i3GEOF.metaestat.TOP); | ||
521 | + }, | ||
522 | + html: function(){ | ||
523 | + var ins = '<div id="i3geoCartoClassesContainer" style="margin-left:5px;">' + | ||
524 | + '<div class="paragrafo" id="i3geoCartoTipoRep" >' + | ||
525 | + '</div>' + | ||
526 | + '<div class="paragrafo" id="i3geoCartoTipoClassificacao" >' + | ||
527 | + '</div>' + | ||
528 | + '</div>'; | ||
529 | + return ins; | ||
530 | + }, | ||
531 | + comboTipoRep: function(){ | ||
532 | + var onde = $i("i3geoCartoTipoRep"), | ||
533 | + ins,i, | ||
534 | + dados = [ | ||
535 | + {"codigo":"polygon","nome":"polígonos"}, | ||
536 | + {"codigo":"point","nome":"pontos"} | ||
537 | + ], | ||
538 | + n = dados.length; | ||
539 | + ins = '<p style="text-align:left;"><input type="button" id="i3GEOcartoBotaoAdicionarCamada" onclick="i3GEOF.metaestat.principal.maisInfo()" value="'+$trad(7,i3GEOF.metaestat.dicionario)+'"class="paragrafo" style="cursor:pointer;color:blue" /></p>' + | ||
540 | + '<br><p class="paragrafo" >'+$trad(8,i3GEOF.metaestat.dicionario)+'</p>' + | ||
541 | + "<select id='i3geoCartoComboTipoRep' style='box-shadow:0 1px 5px gray;width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange=''>"; | ||
542 | + for(i=0;i<n;i++){ | ||
543 | + ins += "<option value='"+dados[i].codigo+"'>"+dados[i].nome+"</option>"; | ||
544 | + } | ||
545 | + ins += "</select>"; | ||
546 | + if(onde){ | ||
547 | + onde.innerHTML = ins; | ||
548 | + new YAHOO.widget.Button( | ||
549 | + "i3GEOcartoBotaoAdicionarCamada", | ||
550 | + {onclick:{fn: i3GEOF.metaestat.adicionaCamada}} | ||
551 | + ); | ||
552 | + $i("i3GEOcartoBotaoAdicionarCamada-button").style.width = i3GEOF.metaestat.LARGURA - 25 + "px"; | ||
553 | + } | ||
554 | + return ins; | ||
555 | + }, | ||
556 | + comboTipoClassificacao: function(){ | ||
557 | + var onde = $i("i3geoCartoTipoClassificacao"), | ||
558 | + combo = $i("i3geoCartoComboMedidasVariavel"), | ||
559 | + temp = function(dados){ | ||
560 | + var n = dados.length, | ||
561 | + ins = '<p class="paragrafo" >'+$trad(9,i3GEOF.metaestat.dicionario)+'</p>', | ||
562 | + i; | ||
563 | + ins += "<select id='i3geoCartoComboTipoClassificacao' style='width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange='i3GEOF.metaestat.classes.comboTipoClassificacaoOnchange(this)'><option value=''>---</option>"; | ||
564 | + for(i=0;i<n;i++){ | ||
565 | + ins += "<option title='"+dados[i].observacao+"' value='"+dados[i].id_classificacao+"'>"+dados[i].nome+"</option>"; | ||
566 | + } | ||
567 | + ins += "</select>"; | ||
568 | + //{"id_classificacao":"1","nome":"Pela media","id_medida_variavel":"1","observacao":""} | ||
569 | + if(onde){ | ||
570 | + onde.innerHTML = ins; | ||
571 | + } | ||
572 | + return ins; | ||
573 | + }; | ||
574 | + i3GEOF.metaestat.aguarde(onde); | ||
575 | + i3GEO.php.listaClassificacaoMedida(combo.value,temp); | ||
576 | + }, | ||
577 | + comboTipoClassificacaoOnchange: function(){ | ||
578 | + | ||
579 | + } | ||
580 | + }, | ||
581 | + analise: { | ||
582 | + inicia: function(iddiv){ | ||
583 | + if(!iddiv){ | ||
584 | + iddiv = "i3geoCartoAnalise_corpo"; | ||
585 | + } | ||
586 | + if(i3GEOF.metaestat.INTERFACE == "flutuante"){ | ||
587 | + i3GEOF.metaestat.analise.abreJanela(); | ||
588 | + } | ||
589 | + $i(iddiv).innerHTML = i3GEOF.metaestat.analise.html(); | ||
590 | + }, | ||
591 | + abreJanela: function(){ | ||
592 | + var cabecalho,minimiza,imagemxy,janela; | ||
593 | + if (!$i("i3geoCartoAnalise")){ | ||
594 | + cabecalho = function(){ | ||
595 | + }; | ||
596 | + minimiza = function(){ | ||
597 | + i3GEO.janela.minimiza("i3geoCartoAnalise"); | ||
598 | + }; | ||
599 | + janela = i3GEO.janela.cria( | ||
600 | + i3GEOF.metaestat.LARGURA+"px", | ||
601 | + i3GEOF.metaestat.ALTURA+"px", | ||
602 | + "", | ||
603 | + "", | ||
604 | + "", | ||
605 | + $trad(11,i3GEOF.metaestat.dicionario), | ||
606 | + "i3geoCartoAnalise", | ||
607 | + false, | ||
608 | + "hd", | ||
609 | + cabecalho, | ||
610 | + minimiza | ||
611 | + ); | ||
612 | + janela = janela[0]; | ||
613 | + YAHOO.i3GEO.janela.manager.register(janela); | ||
614 | + janela.render(); | ||
615 | + } | ||
616 | + else{ | ||
617 | + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoAnalise"); | ||
618 | + } | ||
619 | + janela.show(); | ||
620 | + imagemxy = i3GEO.util.pegaPosicaoObjeto($i(i3GEO.Interface.IDCORPO)); | ||
621 | + janela.moveTo(imagemxy[0]+(i3GEOF.metaestat.LEFT*2)+i3GEOF.metaestat.LARGURA+10,i3GEOF.metaestat.TOP); | ||
622 | + }, | ||
623 | + html: function(){ | ||
624 | + var ins = '<div id="i3geoCartoAnaliseContainer" style="margin-left:5px;">' + | ||
625 | + '</div>'; | ||
626 | + return ins; | ||
627 | + } | ||
628 | + } | ||
629 | +}; | ||
0 | \ No newline at end of file | 630 | \ No newline at end of file |
interface/carto_ol.htm
@@ -126,6 +126,7 @@ | @@ -126,6 +126,7 @@ | ||
126 | </div> | 126 | </div> |
127 | </div> | 127 | </div> |
128 | <script src="../classesjs/i3geonaocompacto.js"></script> | 128 | <script src="../classesjs/i3geonaocompacto.js"></script> |
129 | +<script src="../ferramentas/metaestat/index.js"></script> | ||
129 | <script src="../pacotes/openlayers/OpenLayers211.js.php"></script> | 130 | <script src="../pacotes/openlayers/OpenLayers211.js.php"></script> |
130 | 131 | ||
131 | <script> | 132 | <script> |
@@ -204,12 +205,12 @@ i3GEO.finaliza = function(){ | @@ -204,12 +205,12 @@ i3GEO.finaliza = function(){ | ||
204 | i3GEO.arvoreDeTemas.OPCOESADICIONAIS.navegacaoDir = true; | 205 | i3GEO.arvoreDeTemas.OPCOESADICIONAIS.navegacaoDir = true; |
205 | i3GEO.inicia(); | 206 | i3GEO.inicia(); |
206 | //parametros especificos dos cartogramas | 207 | //parametros especificos dos cartogramas |
207 | -i3GEO.cartograma.INTERFACE = "flutuante"; | ||
208 | -i3GEO.cartograma.TOP = 50; | ||
209 | -i3GEO.cartograma.LEFT = 100; | ||
210 | -i3GEO.cartograma.LARGURA = 260; | ||
211 | -i3GEO.cartograma.ALTURA = 300; | ||
212 | -i3GEO.cartograma.inicia(); | 208 | +i3GEOF.metaestat.INTERFACE = "flutuante"; |
209 | +i3GEOF.metaestat.TOP = 50; | ||
210 | +i3GEOF.metaestat.LEFT = 100; | ||
211 | +i3GEOF.metaestat.LARGURA = 260; | ||
212 | +i3GEOF.metaestat.ALTURA = 300; | ||
213 | +i3GEOF.metaestat.inicia(); | ||
213 | </script> | 214 | </script> |
214 | </body> | 215 | </body> |
215 | </html> | 216 | </html> |