From 63219c111082fe8c488dfdafad64949cb1241677 Mon Sep 17 00:00:00 2001
From: Edmar Moretti <edmar.moretti@gmail.com>
Date: Mon, 24 Sep 2012 21:01:46 +0000
Subject: [PATCH] 

---
 admin/admin.db                       | Bin 135168 -> 0 bytes
 admin/js/estat_variavel.js           | 10 +++++-----
 documentacao/diagramas/metaestat.erm | 50 +++++++++++++++++++++++++-------------------------
 ferramentas/metaestat/dicionario1.js | 18 ++++++++++++++++--
 ferramentas/metaestat/index.js       | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 5 files changed, 124 insertions(+), 37 deletions(-)

diff --git a/admin/admin.db b/admin/admin.db
index 6274334..7f582a3 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/js/estat_variavel.js b/admin/js/estat_variavel.js
index 9c55d95..c787a65 100755
--- a/admin/js/estat_variavel.js
+++ b/admin/js/estat_variavel.js
@@ -292,7 +292,7 @@ i3GEOadmin.variaveis = {
 			core_makeRequest(sUrl,callback);
 		},
 		montaDiv: function(i){
-			var temp,ins = "",
+			var temp,ins = "",limg=i3GEO.configura.locaplic+"/imagens/crialeg.jpg",
 			param = {
 					"linhas":[
 					          {titulo:"Nome:",id:"Enomemedida",size:"50",value:i.nomemedida,tipo:"text",div:""},
@@ -300,10 +300,10 @@ i3GEOadmin.variaveis = {
 					          {titulo:"Tipo de período:",id:"",size:"50",value:i.codigo_tipo_periodo,tipo:"text",div:"<div id=Ccodigo_tipo_periodo ></div>"},
 					          {titulo:"Tipo de regi&atilde;o:",id:"",size:"50",value:i.codigo_tipo_regiao,tipo:"text",div:"<div id=Ccodigo_tipo_regiao ></div>"},
 					          {titulo:"Conex&atilde;o:",id:"",size:"50",value:i.codigo_estat_conexao,tipo:"text",div:"<div id=Ccodigo_estat_conexao ></div>"},
-					          {titulo:"Esquema do banco: <img onclick='i3GEOadmin.variaveis.selEsquema(\"Eesquemadb\",\"Ecodigo_estat_conexao\")' src='../../imagens/crialeg.jpg' style='cursor:pointer;position :relative;top:2px'/>",id:"Eesquemadb",size:"50",value:i.esquemadb,tipo:"text",div:""},
-					          {titulo:"Tabela do banco: <img onclick='i3GEOadmin.variaveis.selTabela(\"Etabela\",\"Ecodigo_estat_conexao\",\"Eesquemadb\")' src='../../imagens/crialeg.jpg' style='cursor:pointer;position :relative;top:2px'/>",id:"Etabela",size:"50",value:i.tabela,tipo:"text",div:""},
-					          {titulo:"Coluna com os valores: <img onclick='i3GEOadmin.variaveis.selColuna(\"Ecolunavalor\",\"Ecodigo_estat_conexao\",\"Eesquemadb\",\"Etabela\")' src='../../imagens/crialeg.jpg' style='cursor:pointer;position :relative;top:2px'/>",id:"Ecolunavalor",size:"50",value:i.colunavalor,tipo:"text",div:""},
-					          {titulo:"Coluna com os IDs da tabela GEO: <img onclick='i3GEOadmin.variaveis.selColuna(\"Ecolunaidgeo\",\"Ecodigo_estat_conexao\",\"Eesquemadb\",\"Etabela\")' src='../../imagens/crialeg.jpg' style='cursor:pointer;position :relative;top:2px'/>",id:"Ecolunaidgeo",size:"50",value:i.colunaidgeo,tipo:"text",div:""},
+					          {titulo:"Esquema do banco: <img onclick='i3GEOadmin.variaveis.selEsquema(\"Eesquemadb\",\"Ecodigo_estat_conexao\")' src='"+limg+"' style='cursor:pointer;position :relative;top:2px'/>",id:"Eesquemadb",size:"50",value:i.esquemadb,tipo:"text",div:""},
+					          {titulo:"Tabela do banco: <img onclick='i3GEOadmin.variaveis.selTabela(\"Etabela\",\"Ecodigo_estat_conexao\",\"Eesquemadb\")' src='"+limg+"' style='cursor:pointer;position :relative;top:2px'/>",id:"Etabela",size:"50",value:i.tabela,tipo:"text",div:""},
+					          {titulo:"Coluna com os valores: <img onclick='i3GEOadmin.variaveis.selColuna(\"Ecolunavalor\",\"Ecodigo_estat_conexao\",\"Eesquemadb\",\"Etabela\")' src='"+limg+"' style='cursor:pointer;position :relative;top:2px'/>",id:"Ecolunavalor",size:"50",value:i.colunavalor,tipo:"text",div:""},
+					          {titulo:"Coluna com os IDs da tabela GEO: <img onclick='i3GEOadmin.variaveis.selColuna(\"Ecolunaidgeo\",\"Ecodigo_estat_conexao\",\"Eesquemadb\",\"Etabela\")' src='"+limg+"' style='cursor:pointer;position :relative;top:2px'/>",id:"Ecolunaidgeo",size:"50",value:i.colunaidgeo,tipo:"text",div:""},
 					          {titulo:"Filtro adicional:",id:"Efiltro",size:"50",value:i.filtro,tipo:"text",div:""}
 					          ]
 			};
diff --git a/documentacao/diagramas/metaestat.erm b/documentacao/diagramas/metaestat.erm
index f5fe9eb..62836d6 100644
--- a/documentacao/diagramas/metaestat.erm
+++ b/documentacao/diagramas/metaestat.erm
@@ -12,7 +12,7 @@
 	<category_index>0</category_index>
 	<zoom>1.0</zoom>
 	<x>-372</x>
-	<y>179</y>
+	<y>51</y>
 	<default_color>
 		<r>255</r>
 		<g>128</g>
@@ -110,7 +110,7 @@
 			</connections>
 			<display>false</display>
 			<creation_date>2012-07-17 15:03:53</creation_date>
-			<updated_date>2012-09-03 12:54:45</updated_date>
+			<updated_date>2012-09-24 00:15:20</updated_date>
 			<model_property>
 				<name>Project Name</name>
 				<value></value>
@@ -1068,7 +1068,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>37</word_id>
+					<word_id>39</word_id>
 					<id>1</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1386,7 +1386,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>41</word_id>
+					<word_id>38</word_id>
 					<id>9</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1418,7 +1418,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>16</word_id>
+					<word_id>17</word_id>
 					<id>10</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2243,7 +2243,7 @@
 			<connections>
 				<relation>
 					<id>2</id>
-					<source>4</source>
+					<source>2</source>
 					<target>8</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -2277,7 +2277,7 @@
 				</relation>
 				<relation>
 					<id>4</id>
-					<source>14</source>
+					<source>4</source>
 					<target>8</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -2294,7 +2294,7 @@
 				</relation>
 				<relation>
 					<id>5</id>
-					<source>12</source>
+					<source>14</source>
 					<target>8</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -2311,7 +2311,7 @@
 				</relation>
 				<relation>
 					<id>6</id>
-					<source>2</source>
+					<source>12</source>
 					<target>8</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -2369,7 +2369,7 @@
 				<normal_column>
 					<id>32</id>
 					<referenced_column>0</referenced_column>
-					<relation>6</relation>
+					<relation>2</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -2435,7 +2435,7 @@
 				<normal_column>
 					<id>34</id>
 					<referenced_column>8</referenced_column>
-					<relation>2</relation>
+					<relation>4</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -2468,7 +2468,7 @@
 				<normal_column>
 					<id>35</id>
 					<referenced_column>55</referenced_column>
-					<relation>5</relation>
+					<relation>6</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -2501,7 +2501,7 @@
 				<normal_column>
 					<id>36</id>
 					<referenced_column>71</referenced_column>
-					<relation>4</relation>
+					<relation>5</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -2837,7 +2837,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>39</word_id>
+					<word_id>37</word_id>
 					<id>45</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -2925,7 +2925,7 @@
 			<connections>
 				<relation>
 					<id>8</id>
-					<source>8</source>
+					<source>7</source>
 					<target>10</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -2942,7 +2942,7 @@
 				</relation>
 				<relation>
 					<id>9</id>
-					<source>7</source>
+					<source>8</source>
 					<target>10</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -2968,7 +2968,7 @@
 				<normal_column>
 					<id>47</id>
 					<referenced_column>31</referenced_column>
-					<relation>8</relation>
+					<relation>9</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -3001,7 +3001,7 @@
 				<normal_column>
 					<id>48</id>
 					<referenced_column>28</referenced_column>
-					<relation>9</relation>
+					<relation>8</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -3144,7 +3144,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>38</word_id>
+					<word_id>41</word_id>
 					<id>51</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -3176,7 +3176,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>17</word_id>
+					<word_id>16</word_id>
 					<id>52</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -4157,23 +4157,23 @@
 							</column_data>
 							<column_data>
 								<column_id>72</column_id>
-								<value>default</value>
+								<value>i3geo_metaestat</value>
 							</column_data>
 							<column_data>
 								<column_id>73</column_id>
-								<value></value>
+								<value>localhost</value>
 							</column_data>
 							<column_data>
 								<column_id>74</column_id>
-								<value></value>
+								<value>5432</value>
 							</column_data>
 							<column_data>
 								<column_id>75</column_id>
-								<value></value>
+								<value>postgres</value>
 							</column_data>
 							<column_data>
 								<column_id>76</column_id>
-								<value></value>
+								<value>postgres</value>
 							</column_data>
 						</data>
 					</direct_test_data>
diff --git a/ferramentas/metaestat/dicionario1.js b/ferramentas/metaestat/dicionario1.js
index 2b18d5f..81f01dd 100644
--- a/ferramentas/metaestat/dicionario1.js
+++ b/ferramentas/metaestat/dicionario1.js
@@ -30,7 +30,7 @@ it:""
 }],
 "5":[
 {
-pt:"Ou crie uma nova",
+pt:"ou crie uma nova",
 en:"",
 es:"",
 it:""
@@ -44,13 +44,27 @@ it:""
 }],
 "7":[
 {
-pt:"",
+pt:"Crie ou edite as classifica&ccedil;&otilde;es que podem ser utilizadas para representar os dados escolhidos. As classifica&ccedil;&otilde;es definem as cores para o mapa e os valores que cada classe abrange. Na pr&oacute;xima tela ser&atilde;o definidas as classes.",
 en:"",
 es:"",
 it:""
 }],
 "8":[
 {
+pt:"Edite",
+en:"",
+es:"",
+it:""
+}],
+"9":[
+{
+pt:"",
+en:"",
+es:"",
+it:""
+}],
+"10":[
+{
 pt:"",
 en:"",
 es:"",
diff --git a/ferramentas/metaestat/index.js b/ferramentas/metaestat/index.js
index 2a606ba..d5c62c4 100644
--- a/ferramentas/metaestat/index.js
+++ b/ferramentas/metaestat/index.js
@@ -477,6 +477,12 @@ i3GEOF.metaestat = {
 			};
 			i3GEOadmin.variaveis.editar("variavel","");
 		},
+		editaVariavel: function(){
+			//TODO
+		},
+		criaClassificacao: function(){
+//TODO
+		},
 		criaMedidaVariavel: function(){
 			i3GEOadmin.variaveis.aposGravar = function(){
 				core_carregando("desativa");
@@ -484,10 +490,27 @@ i3GEOF.metaestat = {
 				i3GEOF.metaestat.editor.removeEl("i3GEOF.metaestat.editor.t2");
 				// Enome e o id do input onde o usuario escolheu o nome da nova variavel
 				i3GEOF.metaestat.editor.t2(true,$i("Enomemedida").value);
+				//TODO adicionar os parametros de tempo que ja existem na tabela
 			};
 			i3GEOadmin.variaveis.editar("medidaVariavel","");
 			//passa o codigo da variavel
 			$i("Ecodigo_variavel").value = $i("i3geoCartoComboVariavelEditor").value;
+			//define os valores que sao padrao
+			//a conexao e com o default
+			$i("Ecodigo_estat_conexao").value = 0;
+			//o esquema e o public
+			$i("Eesquemadb").value = "public";
+			//a tabela onde ficarao os dados
+			$i("Etabela").value = "indicadores_bairro";
+			//coluna com os valores
+			$i("Ecolunavalor").value = "valor_num";
+			//id que liga com o geo
+			$i("Ecolunaidgeo").value = "codigoregiao";
+			//impede a alteracao do filtro
+			$i("Efiltro").disabled = "disabled";
+		},
+		editaMedidaVariavel:function(){
+//TODO
 		},
 		removeEl:function(id){
 			var no = $i(id);
@@ -523,6 +546,7 @@ i3GEOF.metaestat = {
 			);
 		},
 		t1: function(remove,textoSelecionado){
+			//TODO botao para editar uma variavel ja existente
 			if(remove == true){
 				//remove o conteudo anteriormente construido
 				i3GEOF.metaestat.editor.removeEl("i3GEOF.metaestat.editor.t1");
@@ -530,13 +554,19 @@ i3GEOF.metaestat = {
 			var temp = function(dados){
 				var ins = "<p class='paragrafo' >" + $trad(1,i3GEOF.metaestat.dicionario) + "<br><br>" +
 					"<span>" + i3GEOF.metaestat.principal.comboVariaveis(dados,"i3geoCartoComboVariavelEditor","") + "</span>" +
-					"<br><br><p><input id=i3GEOFmetaestatEditorBotao3 type='button' value='"+$trad(5,i3GEOF.metaestat.dicionario1)+"' /><br>";
+					"<br><br><p><input id=i3GEOFmetaestatEditorBotao3 type='button' value='"+$trad(8,i3GEOF.metaestat.dicionario1)+"' />" +
+					"&nbsp;<input id=i3GEOFmetaestatEditorBotao3a type='button' value='"+$trad(5,i3GEOF.metaestat.dicionario1)+"' /><br>";
 				i3GEO.util.proximoAnterior("i3GEOF.metaestat.editor.t0()","i3GEOF.metaestat.editor.t2()",ins,"i3GEOF.metaestat.editor.t1","i3GEOFmetaestatEditor",true);
 				new YAHOO.widget.Button(
 					"i3GEOFmetaestatEditorBotao3",
 					{onclick:{fn: i3GEOF.metaestat.editor.criaVariavel}}
 				);
 				$i("i3GEOFmetaestatEditorBotao3-button").style.width = (i3GEOF.metaestat.LARGURA / 2) + "px";
+				new YAHOO.widget.Button(
+					"i3GEOFmetaestatEditorBotao3a",
+					{onclick:{fn: i3GEOF.metaestat.editor.editaVariavel}}
+				);
+				$i("i3GEOFmetaestatEditorBotao3a-button").style.width = (i3GEOF.metaestat.LARGURA / 2) + "px";
 				if(textoSelecionado){
 					i3GEOF.metaestat.editor.selComboPorTexto("i3geoCartoComboVariavelEditor",textoSelecionado);
 				}
@@ -544,6 +574,7 @@ i3GEOF.metaestat = {
 			i3GEO.php.listaVariavel(temp);
 		},
 		t2: function(remove,textoSelecionado){
+			//TODO botao para editar uma medida de variavel ja existente
 			if(remove == true){
 				//remove o conteudo anteriormente construido
 				i3GEOF.metaestat.editor.removeEl("i3GEOF.metaestat.editor.t2");
@@ -556,17 +587,22 @@ i3GEOF.metaestat = {
 				var temp = function(dados){
 					var ins = "<p class='paragrafo' >" + $trad(2,i3GEOF.metaestat.dicionario) + "<br><br>" +
 						"<span>" + i3GEOF.metaestat.principal.comboMedidasVariavel(dados,"i3geoCartoComboMedidaVariavelEditor","") + "</span>" +
-						"<br><br><p><input id=i3GEOFmetaestatEditorBotao4 type='button' value='"+$trad(5,i3GEOF.metaestat.dicionario1)+"' /><br>";
+						"<br><br><p><input id=i3GEOFmetaestatEditorBotao4 type='button' value='"+$trad(8,i3GEOF.metaestat.dicionario1)+"' />" +
+						"&nbsp <input id=i3GEOFmetaestatEditorBotao4a type='button' value='"+$trad(5,i3GEOF.metaestat.dicionario1)+"' /><br>";
 					i3GEO.util.proximoAnterior("i3GEOF.metaestat.editor.t1()","i3GEOF.metaestat.editor.t3()",ins,"i3GEOF.metaestat.editor.t2","i3GEOFmetaestatEditor",true);
 					new YAHOO.widget.Button(
-						"i3GEOFmetaestatEditorBotao4",
+						"i3GEOFmetaestatEditorBotao4a",
+						{onclick:{fn: i3GEOF.metaestat.editor.editaMedidaVariavel}}
+					);
+					$i("i3GEOFmetaestatEditorBotao4a-button").style.width = (i3GEOF.metaestat.LARGURA / 2) + "px";
+					new YAHOO.widget.Button(
+						"i3GEOFmetaestatEditorBotao4a",
 						{onclick:{fn: i3GEOF.metaestat.editor.criaMedidaVariavel}}
 					);
-					$i("i3GEOFmetaestatEditorBotao4-button").style.width = (i3GEOF.metaestat.LARGURA / 2) + "px";
+					$i("i3GEOFmetaestatEditorBotao4a-button").style.width = (i3GEOF.metaestat.LARGURA / 2) + "px";
 					if(textoSelecionado){
 						i3GEOF.metaestat.editor.selComboPorTexto("i3geoCartoComboMedidaVariavelEditor",textoSelecionado);
 					}
-
 				},
 				codigo_variavel = $i("i3geoCartoComboVariavelEditor").value;
 				if(codigo_variavel == ""){
@@ -576,6 +612,31 @@ i3GEOF.metaestat = {
 				}
 				i3GEO.php.listaMedidaVariavel(codigo_variavel,temp);
 			}
+		},
+		t3: function(remove,textoSelecionado){
+			//TODO escolha dos parametros de classificacao
+			if(remove == true){
+				//remove o conteudo anteriormente construido
+				i3GEOF.metaestat.editor.removeEl("i3GEOF.metaestat.editor.t3");
+			}
+			if($i("i3geoCartoComboMedidaVariavelEditor").value === ""){
+				alert($trad(2,i3GEOF.metaestat.dicionario));
+				i3GEOF.metaestat.editor.t2(false);
+			}
+			else{
+				var temp = function(dados){
+					var ins = "<p class='paragrafo' >" + $trad(7,i3GEOF.metaestat.dicionario1) + "<br><br>" +
+						"<span>" + i3GEOF.metaestat.principal.comboClassificacoesMedidaVariavel(dados,"i3geoCartoComboClassificacoesMedidaVariavelEditor","") + "</span>" +
+						"<br><br><p><input id=i3GEOFmetaestatEditorBotao5 type='button' value='"+$trad(5,i3GEOF.metaestat.dicionario1)+"' /><br>";
+					i3GEO.util.proximoAnterior("i3GEOF.metaestat.editor.t2()","i3GEOF.metaestat.editor.t4()",ins,"i3GEOF.metaestat.editor.t3","i3GEOFmetaestatEditor",true);
+					new YAHOO.widget.Button(
+						"i3GEOFmetaestatEditorBotao5",
+						{onclick:{fn: i3GEOF.metaestat.editor.criaClassificacao}}
+					);
+					$i("i3GEOFmetaestatEditorBotao5-button").style.width = (i3GEOF.metaestat.LARGURA / 2) + "px";
+				};
+				i3GEO.php.listaClassificacaoMedida($i("i3geoCartoComboMedidaVariavelEditor").value,temp);
+			}
 		}
 	},
 	parametros: {
@@ -868,6 +929,18 @@ i3GEOF.metaestat = {
 		},
 		comboMedidaVariavelOnchange: function(combo){
 			i3GEOF.metaestat.editor.removeEl("i3GEOF.metaestat.editor.t3");
+		},
+		comboClassificacoesMedidaVariavel: function(dados,idcombo){
+			var ins,i,n = dados.length;
+			ins = "<select id='"+idcombo+"' style='box-shadow:0 1px 5px gray;width:"+(i3GEOF.metaestat.LARGURA - 20)+"px' onchange='i3GEOF.metaestat.principal.comboClassificacoesMedidaVariavelOnchange()'><option value=''>---</option>";
+			for(i=0;i<n;i++){
+				ins += "<option title='"+dados[i].observacao+"' value='"+dados[i].id_classificacao+"'>"+dados[i].nome+"</option>";
+			}
+			ins += "</select>";
+			return ins;
+		},
+		comboClassificacoesMedidaVariavelOnchange: function(){
+
 		}
 	}
 };
\ No newline at end of file
--
libgit2 0.21.2