Download as
Browse Code »

Commit b8c231da3761a573dc69a1b6b8ebf7135b1528ca

Authored by Edmar Moretti
1 parent bdbefa4f
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

--no commit message

Showing 5 changed files with 186 additions and 42 deletions   Show diff stats
admin/admin.db
View file @b8c231d
No preview for this file type
admin/sql/metaestat.sql
  Diff comments   View file @b8c231d
... ... @@ -20,7 +20,8 @@ drop table i3geoestat_variavel;
20 20  
21 21 /* create tables */
22 22  
23   --- lista controlada dos parâmetros de conexão com o banco de dados onde residem dados
  23 +-- lista controlada dos parâmetros de conexão com o banco de dados onde residem dados
  24 +-- código 0 indica que será utilizada a conexão padrão
24 25 create table i3geoestat_conexao
25 26 (
26 27 codigo_estat_conexao integer not null unique primary key autoincrement,
... ... @@ -86,15 +87,6 @@ create table i3geoestat_tipo_periodo
86 87 );
87 88  
88 89  
89   --- tabela com o nome e descrição de uma variável variável
90   -create table i3geoestat_variavel
91   -(
92   - codigo_variavel integer not null unique primary key autoincrement,
93   - nome text,
94   - descricao text
95   -);
96   -
97   -
98 90 create table i3geoestat_unidade_medida
99 91 (
100 92 codigo_unidade_medida integer not null unique primary key autoincrement,
... ... @@ -107,6 +99,15 @@ create table i3geoestat_unidade_medida
107 99 );
108 100  
109 101  
  102 +-- tabela com o nome e descrição de uma variável variável
  103 +create table i3geoestat_variavel
  104 +(
  105 + codigo_variavel integer not null unique primary key autoincrement,
  106 + nome text,
  107 + descricao text
  108 +);
  109 +
  110 +
110 111 -- descreve as colunas que contém valores de algum tipo de medida, por exemplo população residente
111 112 create table i3geoestat_medida_variavel
112 113 (
... ... @@ -128,16 +129,16 @@ create table i3geoestat_medida_variavel
128 129 filtro text,
129 130 -- titulo da medida
130 131 nomemedida text,
131   - foreign key (codigo_tipo_regiao)
132   - references i3geoestat_tipo_regiao (codigo_tipo_regiao),
133 132 foreign key (codigo_tipo_periodo)
134 133 references i3geoestat_tipo_periodo (codigo_tipo_periodo),
135   - foreign key (codigo_variavel)
136   - references i3geoestat_variavel (codigo_variavel),
137 134 foreign key (codigo_estat_conexao)
138 135 references i3geoestat_conexao (codigo_estat_conexao),
139 136 foreign key (codigo_unidade_medida)
140   - references i3geoestat_unidade_medida (codigo_unidade_medida)
  137 + references i3geoestat_unidade_medida (codigo_unidade_medida),
  138 + foreign key (codigo_tipo_regiao)
  139 + references i3geoestat_tipo_regiao (codigo_tipo_regiao),
  140 + foreign key (codigo_variavel)
  141 + references i3geoestat_variavel (codigo_variavel)
141 142 );
142 143  
143 144  
... ...
documentacao/diagramas/metaestat.erm
  Diff comments   View file @b8c231d
... ... @@ -11,7 +11,7 @@
11 11 </page_setting>
12 12 <category_index>0</category_index>
13 13 <zoom>1.0</zoom>
14   - <x>219</x>
  14 + <x>159</x>
15 15 <y>-89</y>
16 16 <default_color>
17 17 <r>255</r>
... ... @@ -110,7 +110,7 @@
110 110 </connections>
111 111 <display>false</display>
112 112 <creation_date>2012-07-17 15:03:53</creation_date>
113   - <updated_date>2012-09-25 10:02:07</updated_date>
  113 + <updated_date>2012-10-03 10:48:05</updated_date>
114 114 <model_property>
115 115 <name>Project Name</name>
116 116 <value></value>
... ... @@ -1068,7 +1068,7 @@
1068 1068 </sequence>
1069 1069 </normal_column>
1070 1070 <normal_column>
1071   - <word_id>39</word_id>
  1071 + <word_id>40</word_id>
1072 1072 <id>1</id>
1073 1073 <description></description>
1074 1074 <unique_key_name></unique_key_name>
... ... @@ -1386,7 +1386,7 @@
1386 1386 </sequence>
1387 1387 </normal_column>
1388 1388 <normal_column>
1389   - <word_id>40</word_id>
  1389 + <word_id>41</word_id>
1390 1390 <id>9</id>
1391 1391 <description></description>
1392 1392 <unique_key_name></unique_key_name>
... ... @@ -1530,7 +1530,7 @@
1530 1530 </sequence>
1531 1531 </normal_column>
1532 1532 <normal_column>
1533   - <word_id>38</word_id>
  1533 + <word_id>36</word_id>
1534 1534 <id>12</id>
1535 1535 <description></description>
1536 1536 <unique_key_name></unique_key_name>
... ... @@ -2260,7 +2260,7 @@
2260 2260 </relation>
2261 2261 <relation>
2262 2262 <id>3</id>
2263   - <source>12</source>
  2263 + <source>14</source>
2264 2264 <target>8</target>
2265 2265 <child_cardinality>1..n</child_cardinality>
2266 2266 <parent_cardinality>1</parent_cardinality>
... ... @@ -2277,7 +2277,7 @@
2277 2277 </relation>
2278 2278 <relation>
2279 2279 <id>4</id>
2280   - <source>4</source>
  2280 + <source>2</source>
2281 2281 <target>8</target>
2282 2282 <child_cardinality>1..n</child_cardinality>
2283 2283 <parent_cardinality>1</parent_cardinality>
... ... @@ -2294,7 +2294,7 @@
2294 2294 </relation>
2295 2295 <relation>
2296 2296 <id>5</id>
2297   - <source>14</source>
  2297 + <source>12</source>
2298 2298 <target>8</target>
2299 2299 <child_cardinality>1..n</child_cardinality>
2300 2300 <parent_cardinality>1</parent_cardinality>
... ... @@ -2311,7 +2311,7 @@
2311 2311 </relation>
2312 2312 <relation>
2313 2313 <id>6</id>
2314   - <source>2</source>
  2314 + <source>4</source>
2315 2315 <target>8</target>
2316 2316 <child_cardinality>1..n</child_cardinality>
2317 2317 <parent_cardinality>1</parent_cardinality>
... ... @@ -2369,7 +2369,7 @@
2369 2369 <normal_column>
2370 2370 <id>32</id>
2371 2371 <referenced_column>0</referenced_column>
2372   - <relation>6</relation>
  2372 + <relation>4</relation>
2373 2373 <description></description>
2374 2374 <unique_key_name></unique_key_name>
2375 2375 <logical_name></logical_name>
... ... @@ -2435,7 +2435,7 @@
2435 2435 <normal_column>
2436 2436 <id>34</id>
2437 2437 <referenced_column>8</referenced_column>
2438   - <relation>4</relation>
  2438 + <relation>6</relation>
2439 2439 <description></description>
2440 2440 <unique_key_name></unique_key_name>
2441 2441 <logical_name></logical_name>
... ... @@ -2468,7 +2468,7 @@
2468 2468 <normal_column>
2469 2469 <id>35</id>
2470 2470 <referenced_column>55</referenced_column>
2471   - <relation>3</relation>
  2471 + <relation>5</relation>
2472 2472 <description></description>
2473 2473 <unique_key_name></unique_key_name>
2474 2474 <logical_name></logical_name>
... ... @@ -2501,7 +2501,7 @@
2501 2501 <normal_column>
2502 2502 <id>36</id>
2503 2503 <referenced_column>71</referenced_column>
2504   - <relation>5</relation>
  2504 + <relation>3</relation>
2505 2505 <description></description>
2506 2506 <unique_key_name></unique_key_name>
2507 2507 <logical_name></logical_name>
... ... @@ -2837,7 +2837,7 @@
2837 2837 </sequence>
2838 2838 </normal_column>
2839 2839 <normal_column>
2840   - <word_id>41</word_id>
  2840 + <word_id>39</word_id>
2841 2841 <id>45</id>
2842 2842 <description></description>
2843 2843 <unique_key_name></unique_key_name>
... ... @@ -3144,7 +3144,7 @@
3144 3144 </sequence>
3145 3145 </normal_column>
3146 3146 <normal_column>
3147   - <word_id>36</word_id>
  3147 + <word_id>38</word_id>
3148 3148 <id>51</id>
3149 3149 <description></description>
3150 3150 <unique_key_name></unique_key_name>
... ... @@ -4131,7 +4131,7 @@
4131 4131 </column_data>
4132 4132 <column_data>
4133 4133 <column_id>72</column_id>
4134   - <value>dbspo</value>
  4134 + <value>geosaude</value>
4135 4135 </column_data>
4136 4136 <column_data>
4137 4137 <column_id>73</column_id>
... ... @@ -4390,7 +4390,7 @@
4390 4390 <data>
4391 4391 <column_data>
4392 4392 <column_id>55</column_id>
4393   - <value>1</value>
  4393 + <value>2</value>
4394 4394 </column_data>
4395 4395 <column_data>
4396 4396 <column_id>56</column_id>
... ... @@ -4406,11 +4406,11 @@
4406 4406 </column_data>
4407 4407 <column_data>
4408 4408 <column_id>59</column_id>
4409   - <value>public</value>
  4409 + <value>i3geo_mestaestat</value>
4410 4410 </column_data>
4411 4411 <column_data>
4412 4412 <column_id>60</column_id>
4413   - <value>tb_ibge</value>
  4413 + <value>municipios</value>
4414 4414 </column_data>
4415 4415 <column_data>
4416 4416 <column_id>61</column_id>
... ... @@ -4418,11 +4418,11 @@
4418 4418 </column_data>
4419 4419 <column_data>
4420 4420 <column_id>62</column_id>
4421   - <value></value>
  4421 + <value>2010</value>
4422 4422 </column_data>
4423 4423 <column_data>
4424 4424 <column_id>63</column_id>
4425   - <value>ibge</value>
  4425 + <value>co_municipio</value>
4426 4426 </column_data>
4427 4427 <column_data>
4428 4428 <column_id>64</column_id>
... ... @@ -4444,7 +4444,7 @@
4444 4444 </column_data>
4445 4445 <column_data>
4446 4446 <column_id>56</column_id>
4447   - <value>Estados</value>
  4447 + <value>Estado</value>
4448 4448 </column_data>
4449 4449 <column_data>
4450 4450 <column_id>57</column_id>
... ... @@ -4456,11 +4456,11 @@
4456 4456 </column_data>
4457 4457 <column_data>
4458 4458 <column_id>59</column_id>
4459   - <value>public</value>
  4459 + <value>i3geo_mestaestat</value>
4460 4460 </column_data>
4461 4461 <column_data>
4462 4462 <column_id>60</column_id>
4463   - <value>tb_ibge_estados</value>
  4463 + <value>uf</value>
4464 4464 </column_data>
4465 4465 <column_data>
4466 4466 <column_id>61</column_id>
... ... @@ -4468,11 +4468,11 @@
4468 4468 </column_data>
4469 4469 <column_data>
4470 4470 <column_id>62</column_id>
4471   - <value></value>
  4471 + <value>2010</value>
4472 4472 </column_data>
4473 4473 <column_data>
4474 4474 <column_id>63</column_id>
4475   - <value>co_ibge_uf</value>
  4475 + <value>co_uf</value>
4476 4476 </column_data>
4477 4477 <column_data>
4478 4478 <column_id>64</column_id>
... ... @@ -4487,6 +4487,56 @@
4487 4487 <value>the_geom</value>
4488 4488 </column_data>
4489 4489 </data>
  4490 + <data>
  4491 + <column_data>
  4492 + <column_id>55</column_id>
  4493 + <value>1</value>
  4494 + </column_data>
  4495 + <column_data>
  4496 + <column_id>56</column_id>
  4497 + <value>Bairro</value>
  4498 + </column_data>
  4499 + <column_data>
  4500 + <column_id>57</column_id>
  4501 + <value>Limites de bairros</value>
  4502 + </column_data>
  4503 + <column_data>
  4504 + <column_id>58</column_id>
  4505 + <value>1</value>
  4506 + </column_data>
  4507 + <column_data>
  4508 + <column_id>59</column_id>
  4509 + <value>i3geo_mestaestat</value>
  4510 + </column_data>
  4511 + <column_data>
  4512 + <column_id>60</column_id>
  4513 + <value>bairros</value>
  4514 + </column_data>
  4515 + <column_data>
  4516 + <column_id>61</column_id>
  4517 + <value>the_geom</value>
  4518 + </column_data>
  4519 + <column_data>
  4520 + <column_id>62</column_id>
  4521 + <value>2010</value>
  4522 + </column_data>
  4523 + <column_data>
  4524 + <column_id>63</column_id>
  4525 + <value>co_bairro</value>
  4526 + </column_data>
  4527 + <column_data>
  4528 + <column_id>64</column_id>
  4529 + <value>no_bairro</value>
  4530 + </column_data>
  4531 + <column_data>
  4532 + <column_id>65</column_id>
  4533 + <value>4326</value>
  4534 + </column_data>
  4535 + <column_data>
  4536 + <column_id>66</column_id>
  4537 + <value>the_geom</value>
  4538 + </column_data>
  4539 + </data>
4490 4540 </direct_test_data>
4491 4541 <repeat_test_data>
4492 4542 <test_data_num>0</test_data_num>
... ...
ferramentas/metaestat/index.js
  Diff comments   View file @b8c231d
... ... @@ -644,7 +644,8 @@ i3GEOF.metaestat = {
644 644 t0: function(){
645 645 var ins = "<p class='paragrafo' >" + $trad(2,i3GEOF.metaestat.dicionario1) +
646 646 "<br><br><p><input id=i3GEOFmetaestatEditorBotao1 type='button' value='"+$trad(3,i3GEOF.metaestat.dicionario1)+"' />" +
647   - "&nbsp<input id=i3GEOFmetaestatEditorBotao2 type='button' value='"+$trad(4,i3GEOF.metaestat.dicionario1)+"' />";
  647 + "&nbsp<input id=i3GEOFmetaestatEditorBotao2 type='button' value='"+$trad(4,i3GEOF.metaestat.dicionario1)+"' />" +
  648 + "&nbsp<input id=i3GEOFmetaestatEditorBotao3 type='button' value='Upload' />";
648 649 i3GEO.util.proximoAnterior("","i3GEOF.metaestat.editor.t1()",ins,"i3GEOF.metaestat.editor.t0","i3GEOFmetaestatEditor");
649 650 new YAHOO.widget.Button(
650 651 "i3GEOFmetaestatEditorBotao1",
... ... @@ -655,6 +656,39 @@ i3GEOF.metaestat = {
655 656 "i3GEOFmetaestatEditorBotao2",
656 657 {onclick:{fn: function(){alert("Oi");}}}
657 658 );
  659 + new YAHOO.widget.Button(
  660 + "i3GEOFmetaestatEditorBotao3",
  661 + {onclick:{fn: function(){
  662 + var cabecalho,minimiza,janela;
  663 + if (!$i("i3geoCartoUpload")){
  664 + cabecalho = function(){
  665 + };
  666 + minimiza = function(){
  667 + i3GEO.janela.minimiza("i3geoCartoUpload");
  668 + };
  669 + janela = i3GEO.janela.cria(
  670 + "500px",
  671 + "400px",
  672 + i3GEO.configura.locaplic+"/ferramentas/metaestat/upload.html",
  673 + "",
  674 + "",
  675 + "Upload",
  676 + "i3geoCartoUpload",
  677 + false,
  678 + "hd",
  679 + cabecalho,
  680 + minimiza
  681 + );
  682 + janela = janela[0];
  683 + YAHOO.i3GEO.janela.manager.register(janela);
  684 + janela.render();
  685 + }
  686 + else{
  687 + janela = YAHOO.i3GEO.janela.manager.find("i3geoCartoUpload");
  688 + }
  689 + janela.show();
  690 + }}}
  691 + );
658 692 },
659 693 /**
660 694 * Edicao da variavel
... ...
ferramentas/metaestat/upload.html 0 → 100644
  Diff comments   View file @b8c231d
... ... @@ -0,0 +1,59 @@
  1 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
  2 +<html>
  3 +<head>
  4 +<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
  5 +<title>Upload de dados</title>
  6 +<style type="text/css">
  7 +/*margin and padding on body element
  8 + can introduce errors in determining
  9 + element position and are not recommended;
  10 + we turn them off as a foundation for YUI
  11 + CSS treatments. */
  12 +body {
  13 + margin: 0;
  14 + padding: 0;
  15 +}
  16 +</style>
  17 +<script type="text/javascript" src="../../admin/js/core.js"></script>
  18 +<script type="text/javascript" src="../../classesjs/classe_php.js"></script>
  19 +<script type="text/javascript" src="index.js"></script>
  20 +<script type="text/javascript" src="../../admin/js/estat_uploaddados.js"></script>
  21 +<link rel="stylesheet" type="text/css" href="../../admin/html/admin.css">
  22 +
  23 +</head>
  24 +<body class=" yui-skin-sam ">
  25 + <div id="i3GEOadminUploaddadosConexao" style="left: -5px;"></div>
  26 + <div id="i3GEOadminUploaddadosVariaveis" style="left: -5px;"></div>
  27 + <div id="i3GEOadminUploaddadosMedidas" style="left: -5px;"></div>
  28 + <br>
  29 + <form id=i3GEOupload target="i3GEOuploadiframe"
  30 + action="../../admin/php/metaestat_uploaddados_submit.php"
  31 + onsubmit="i3GEOadmin.uploaddados.upload.submit();" method="post"
  32 + ENCTYPE="multipart/form-data">
  33 + <p class="paragrafo">
  34 + <input class=digitar type="file" size=42 name="i3GEOuploadArquivo"
  35 + style="top: 0px; left: 0px; cursor: pointer;">
  36 + </p>
  37 + <input type="hidden" name="MAX_FILE_SIZE" value="1000000"> <input
  38 + type="submit" value="Enviar">
  39 + </form>
  40 + <br>
  41 + <div id="i3GEOadminEditorColunas" style="left: -5px;"></div>
  42 + <iframe id="i3GEOuploadiframe" name="i3GEOuploadiframe" src="#"
  43 + style="width: 0; height: 0; border: 0px solid #fff;"></iframe>
  44 + <div id=logajax style="display: block"></div>
  45 + <script>
  46 + //necessario para a ferramenta login e outras
  47 + i3GEO.configura = {
  48 + locaplic : "../.."
  49 + };
  50 + i3GEOadmin.uploaddados.inicia();
  51 + /*
  52 + temp = function() {
  53 + document.getElementById("formulario").style.display = "block";
  54 + initEditor();
  55 + };
  56 + i3GEO.login.verificaOperacao("admin/html/menus",i3GEO.configura.locaplic, temp, "sessao");
  57 + */
  58 + </script>
  59 +</body>
0 60 \ No newline at end of file
... ...