Download as
Browse Code »

Commit 3ecbded32a7e555e6788b0285a830987df2446a4

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

--no commit message

Showing 6 changed files with 440 additions and 157 deletions   Show diff stats
admin/admin.db
View file @3ecbded
No preview for this file type
admin/js/editormapfile.js
  Diff comments   View file @3ecbded
... ... @@ -270,7 +270,7 @@ function montaNosRaiz(redesenha)
270 270 if($mapfiles[i].imagem != "" && $i("mostraMini").checked == true){
271 271 conteudo += "</b><br><img src='../../temas/miniaturas/"+$mapfiles[i].imagem+"'/>";
272 272 }
273   - var d = {html:conteudo,id:$mapfiles[i].codigo,codigoMap:$mapfiles[i].codigo};
  273 + var d = {html:conteudo,tipo:"mapfile",id_tema:$mapfiles[i].id_tema,id:$mapfiles[i].codigo,codigoMap:$mapfiles[i].codigo};
274 274 var tempNode = new YAHOO.widget.HTMLNode(d, root, false,iconePlus);
275 275 nos.push(tempNode);
276 276 }
... ... @@ -292,6 +292,25 @@ Monta as op&amp;ccedil;&amp;otilde;es de edi&amp;ccedil;&amp;atilde;o b&amp;aacute;sicas de um LAYER
292 292 function montaRaizTema(no,dados)
293 293 {
294 294 var tempNodeR = "";
  295 + //no que permite listar os grupos de usuarios registrados para o mapfile
  296 + if(!tree.getNodeByProperty("etiquetaGrupousrTema",no.data.codigoMap))
  297 + {
  298 + var d = {tipo:"etiqueta",etiquetaGrupousrTema:no.data.id_tema,html:"<i>Grupos de usu&aacute;rios que podem utilizar</i>"};
  299 + tempNodeR = new YAHOO.widget.HTMLNode(d, no, true,true);
  300 + tempNodeR.isLeaf = false;
  301 + var conteudo = "<span style=\"cursor:pointer;\" onclick=\"editorGrupousr('"+no.data.id_tema+"','"+no.data.codigoMap+"')\" ><img style='position:relative;top:2px' src=\"../imagens/05.png\" /><i>Adicionar um novo</i></span>";
  302 + var d = {html:conteudo};
  303 + var tempNode = new YAHOO.widget.HTMLNode(d, tempNodeR, false,true);
  304 + tempNode.isLeaf = true;
  305 + }
  306 + //adiciona a lista de grupos de usuarios no no
  307 + for (var i=0, j=dados.gruposusr.length; i<j; i++)
  308 + {
  309 + tempNode = new YAHOO.widget.HTMLNode(montaNoGruposUsrTema(dados.gruposusr[i]), tempNodeR, false,true);
  310 + //tempNode.setDynamicLoad(loadLayerData, 0);
  311 + tempNode.isLeaf = true;
  312 + }
  313 + //no que permite listar os layers de um mapfile
295 314 if(!tree.getNodeByProperty("etiquetaLayers",no.data.codigoMap))
296 315 {
297 316 var d = {tipo:"etiqueta",etiquetaLayers:no.data.codigoMap,html:"<i>Layers</i>"};
... ... @@ -303,6 +322,7 @@ function montaRaizTema(no,dados)
303 322 var tempNode = new YAHOO.widget.HTMLNode(d, tempNodeR, false,true);
304 323 tempNode.isLeaf = true;
305 324 }
  325 + //adiciona a lista de layers no no
306 326 for (var i=0, j=dados.layers.length; i<j; i++)
307 327 {
308 328 tempNode = new YAHOO.widget.HTMLNode(montaNoLayer(no.data.codigoMap,dados.layers[i]), tempNodeR, false,true);
... ... @@ -335,7 +355,11 @@ function loadLayerData(node, fnLoadComplete)
335 355 };
336 356 YAHOO.util.Connect.asyncRequest('GET', sUrl, callback);
337 357 }
338   -
  358 +function montaNoGruposUsrTema(dados){
  359 + var conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"excluirGrupoUsrTema('"+dados.id_tema+"','"+dados.id_grupo+"','"+dados.codigo_tema+"')\" title=excluir width='10px' heigth='10px' src=\"../imagens/01.png\" />&nbsp;<span>"+dados.nome+"</span>";
  360 + var d = {html:conteudo,id:"usr_"+dados.id_tema+"_"+dados.id_grupo};
  361 + return d;
  362 +}
339 363 function montaNoLayer(codigo,indice){
340 364 var conteudo = "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"sobeDesce('sobe','layer','"+codigo+"','"+indice+"')\" title=sobe src=\"../imagens/34.png\" />";
341 365 conteudo += "&nbsp;<img style=\"position:relative;cursor:pointer;top:0px\" onclick=\"sobeDesce('desce','layer','"+codigo+"','"+indice+"')\" title=desce src=\"../imagens/33.png\" />";
... ... @@ -973,6 +997,38 @@ function excluirLayer(codigoMap,codigoLayer)
973 997 var sUrl = "../php/editormapfile.php?funcao=excluirLayer&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer;
974 998 core_excluiNoTree(sUrl,no,mensagem,codigoLayer);
975 999 }
  1000 +function excluirGrupoUsrTema(id_tema,id_grupo,codigo_mapa){
  1001 + var handleYes = function()
  1002 + {
  1003 + this.hide();
  1004 + core_carregando("ativa");
  1005 + var mensagem = " excluindo ";
  1006 + core_carregando(mensagem);
  1007 + var sUrl = "../php/editormapfile.php?funcao=excluirGrupoUsrTema&id_tema="+id_tema+"&id_grupo="+id_grupo;
  1008 + var callback =
  1009 + {
  1010 + success:function(o)
  1011 + {
  1012 + try
  1013 + {
  1014 + core_carregando("desativa");
  1015 + var no = tree.getNodeByProperty("id",codigo_mapa);
  1016 + tree.removeChildren(no) ;
  1017 + no.expand();
  1018 + }
  1019 + catch(e){core_handleFailure(e,o.responseText);}
  1020 + },
  1021 + failure:core_handleFailure,
  1022 + argument: { foo:"foo", bar:"bar" }
  1023 + };
  1024 + core_makeRequest(sUrl,callback);
  1025 + };
  1026 + var handleNo = function()
  1027 + {this.hide();};
  1028 + var mensagem = "Exclui restri&ccedil;&atilde;o?";
  1029 + var largura = "300";
  1030 + core_dialogoContinua(handleYes,handleNo,mensagem,largura);
  1031 +}
976 1032 /*
977 1033 Function: excluirClasse
978 1034  
... ... @@ -1135,6 +1191,13 @@ function editorGeral(codigoMap,codigoLayer)
1135 1191 var sUrl = "../php/editormapfile.php?funcao=pegaGeral&codigoMap="+codigoMap+"&codigoLayer="+codigoLayer;
1136 1192 core_pegaDados("Obtendo dados...",sUrl,"montaEditorGeral");
1137 1193 }
  1194 +function editorGrupousr(id_tema,codigo_mapa)
  1195 +{
  1196 + core_montaEditor("","350px","200px","","Grupo usuario");
  1197 + $i("editor_bd").innerHTML = "<input type=hidden value='"+codigo_mapa+"' id='Ecodigo_mapa_usr'/><input type=hidden value='"+id_tema+"' id='Eid_tema_usr'/>";
  1198 + var sUrl = "../php/gruposusuarios.php?funcao=pegaGrupos";
  1199 + core_pegaDados("Obtendo dados...",sUrl,"montaEditorGrupousr");
  1200 +}
1138 1201 /*
1139 1202 Function: editorClasseGeral
1140 1203  
... ... @@ -1279,7 +1342,16 @@ function montaEditorComport(dados)
1279 1342 {salvarDadosEditor('comport',dados.codigoMap,dados.codigoLayer,false);};
1280 1343 new YAHOO.widget.Button("salvarEditor",{ onclick: { fn: temp }});
1281 1344 }
1282   -
  1345 +function montaEditorGrupousr(dados){
  1346 + var temp = "<input type=button title='Salvar' value='Salvar' id=salvarEditor />";
  1347 + temp += "<p>Escolha o grupo de usu&aacute;rios:</p><select id='Eid_grupousr' >";
  1348 + temp += core_comboObjeto(dados,"id_grupo","nome");
  1349 + temp += "</select>";
  1350 + $i("editor_bd").innerHTML += temp;
  1351 + var tempf = function()
  1352 + {salvarDadosEditor('grupousr');};
  1353 + new YAHOO.widget.Button("salvarEditor",{ onclick: { fn: tempf }});
  1354 +}
1283 1355 function montaEditorTitulo(dados)
1284 1356 {
1285 1357 var param = {
... ... @@ -1830,6 +1902,11 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo,
1830 1902 {
1831 1903 var campos = [], par = "", prog = "", temp, re;
1832 1904 if(arguments.length < 6){testar = false;}
  1905 + if(tipo == "grupousr"){
  1906 + campos = [];
  1907 + par = "&id_tema="+$i("Eid_tema_usr").value+"&id_grupo="+$i("Eid_grupousr").value;
  1908 + prog = "../php/editormapfile.php?funcao=adicionaGrupoUsrTema";
  1909 + }
1833 1910 if(tipo == "comport")
1834 1911 {
1835 1912 campos = new Array("aplicaextensao","permitecomentario","temporizador","classe","legendaimg","escondido","identifica","transitioneffect","status","offsite","opacity","maxscale","minscale","labelitem","labelmaxscale","labelminscale","symbolscale","tolerance","toleranceunits","sizeunits");
... ... @@ -1957,6 +2034,12 @@ function salvarDadosEditor(tipo,codigoMap,codigoLayer,indiceClasse,indiceEstilo,
1957 2034 {montaEditorClasseLabel(YAHOO.lang.JSON.parse(o.responseText));}
1958 2035 if(tipo=="estilo")
1959 2036 {montaEditorEstilo(YAHOO.lang.JSON.parse(o.responseText));}
  2037 +
  2038 + if(tipo =="grupousr"){
  2039 + var no = tree.getNodeByProperty("id",$i("Ecodigo_mapa_usr").value);
  2040 + tree.removeChildren(no) ;
  2041 + no.expand();
  2042 + }
1960 2043 }
1961 2044 else{
1962 2045 window.open("../../testamapfile.php?map="+YAHOO.lang.JSON.parse(o.responseText).url);
... ...
admin/php/editormapfile.php
  Diff comments   View file @3ecbded
... ... @@ -1042,6 +1042,14 @@ switch (strtoupper($funcao))
1042 1042 retornaJSON($res);
1043 1043 exit;
1044 1044 break;
  1045 + case "ADICIONAGRUPOUSRTEMA":
  1046 + retornaJSON(adicionaGrupoUsrTema());
  1047 + exit;
  1048 + break;
  1049 + case "EXCLUIRGRUPOUSRTEMA":
  1050 + retornaJSON(excluirGrupoUsrTema());
  1051 + exit;
  1052 + break;
1045 1053 }
1046 1054 function clonarMapfile()
1047 1055 {
... ... @@ -1267,14 +1275,53 @@ function pegaItensLayer()
1267 1275 $dados["itens"] = $itens;
1268 1276 return $dados;
1269 1277 }
  1278 +function adicionaGrupoUsrTema(){
  1279 + global $id_tema,$id_grupo,$locaplic,$esquemaadmin;
  1280 + include($locaplic."/admin/php/conexao.php");
  1281 + $sql = "select * from ".$esquemaadmin."i3geousr_grupotema where id_tema = $id_tema and id_grupo = $id_grupo";
  1282 + $q = $dbh->query($sql,PDO::FETCH_ASSOC);
  1283 + if($q){
  1284 + $teste = $q->fetchAll();
  1285 + if(count($teste) == 0){
  1286 + $dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_grupotema (id_tema,id_grupo) VALUES ($id_tema,$id_grupo)");
  1287 + }
  1288 + }
  1289 + return "ok";
  1290 +}
  1291 +function excluirGrupoUsrTema(){
  1292 + global $id_tema,$id_grupo,$locaplic,$esquemaadmin;
  1293 + include($locaplic."/admin/php/conexao.php");
  1294 + $q = $dbhw->query("delete from ".$esquemaadmin."i3geousr_grupotema where id_tema = $id_tema and id_grupo = $id_grupo ");
  1295 + return "ok";
  1296 +}
1270 1297 function pegaLayers()
1271 1298 {
1272   - global $codigoMap,$locaplic;
  1299 + global $codigoMap,$locaplic,$esquemaadmin;
1273 1300 $dados = array();
1274 1301 $mapfile = $locaplic."/temas/".$codigoMap.".map";
1275 1302 $mapa = ms_newMapObj($mapfile);
1276 1303 $layers = $mapa->getalllayernames();
1277 1304 $dados["layers"] = $layers;
  1305 + //lista de grupo de usuarios
  1306 + $gruposusr = array();
  1307 + include($locaplic."/admin/php/conexao.php");
  1308 + $sql = "
  1309 + select ".$esquemaadmin."i3geoadmin_temas.codigo_tema, ".$esquemaadmin."i3geousr_grupos.id_grupo,
  1310 + ".$esquemaadmin."i3geousr_grupos.nome, ".$esquemaadmin."i3geousr_grupos.descricao,
  1311 + ".$esquemaadmin."i3geousr_grupotema.id_tema
  1312 + from
  1313 + ".$esquemaadmin."i3geoadmin_temas
  1314 + join ".$esquemaadmin."i3geousr_grupotema
  1315 + on ".$esquemaadmin."i3geousr_grupotema.id_grupo = ".$esquemaadmin."i3geousr_grupos.id_grupo
  1316 + join ".$esquemaadmin."i3geousr_grupos
  1317 + on ".$esquemaadmin."i3geoadmin_temas.id_tema = ".$esquemaadmin."i3geousr_grupotema.id_tema
  1318 + where codigo_tema = '".$codigoMap."'
  1319 + ";
  1320 + $q = $dbh->query($sql,PDO::FETCH_ASSOC);
  1321 + if($q){
  1322 + $gruposusr = $q->fetchAll();
  1323 + }
  1324 + $dados["gruposusr"] = $gruposusr;
1278 1325 return $dados;
1279 1326 }
1280 1327 function listaClasses()
... ...
admin/php/menutemas.php
  Diff comments   View file @3ecbded
... ... @@ -1221,49 +1221,63 @@ function listaMapsTemas()
1221 1221 }
1222 1222 sort($arquivos);
1223 1223 //
1224   - //pega o nome de cada tema
  1224 + //pega o nome de cada tema filtrando a listagem se for o caso
1225 1225 //
1226 1226 $sql = "select * from ".$esquemaadmin."i3geoadmin_temas ";
1227   - if(isset($filtro) && $filtro != "")
1228   - {
  1227 + if(isset($filtro) && $filtro != ""){
1229 1228 $filtro = explode(",",$filtro);
1230 1229 $filtro = $filtro[0]." ".$filtro[1]." '".$filtro[2]."' or ".$filtro[0]." ".$filtro[1]." '".strtoupper($filtro[2])."'";
1231 1230 $sql .= "where $filtro";
1232 1231 }
1233   -
1234 1232 $dbh = "";
1235 1233 include($locaplic."/admin/php/conexao.php");
1236 1234 $q = $dbh->query($sql,PDO::FETCH_ASSOC);
1237 1235 $regs = $q->fetchAll();
1238   - //echo $sql;exit;
  1236 + //pega os grupos de usuarios que podem acessar o tema
  1237 + $grpids = array();
  1238 + $sql = "select nome,descricao,a.id_grupo,id_tema from ".$esquemaadmin."i3geousr_grupotema as a,".$esquemaadmin."i3geousr_grupos as b where a.id_grupo = b.id_grupo";
  1239 + $q = $dbh->query($sql,PDO::FETCH_ASSOC);
  1240 + if($q){
  1241 + $gs = $q->fetchAll();
  1242 + //agrupa o array
  1243 + foreach($gps as $g){
  1244 + array_push($grpids[$g["id_tema"]],array("id_grupo"=>$g["id_grupo"],"nome"=>$g["nome"],"descricao"=>$g["descricao"]));
  1245 + }
  1246 + }
1239 1247 $nomes = array();
  1248 + $ids = array();
1240 1249 foreach($regs as $reg){
1241 1250 $nomes[$reg["codigo_tema"]] = $reg["nome_tema"];
  1251 + $ids[$reg["codigo_tema"]] = $reg["id_tema"];
1242 1252 //$outros[$reg["codigo_tema"]] = array("kmz"=>$reg["kmz_tema"],"kml"=>$reg["kml_tema"],"ogc"=>$reg["ogc_tema"],"download"=>$reg["download_tema"],"link"=>$reg["link_tema"]);
1243 1253 }
1244 1254 $lista = array();
1245   - foreach($arquivos as $arq)
1246   - {
  1255 + foreach($arquivos as $arq){
1247 1256 $extensao = $arq["extensao"];
1248 1257 $arq = $arq["nome"];
1249   - $n = explode(".",$arq);
1250   - $n = $nomes[$n[0]];
1251   - if(!$n)
1252   - {
  1258 + $nT = explode(".",$arq);
  1259 + $n = $nomes[$nT[0]];
  1260 + if(!$n){
1253 1261 $n = "";
1254 1262 }
  1263 + $id = $ids[$nT[0]];
  1264 + if(!$id){
  1265 + $id = "";
  1266 + }
  1267 + //pega os grupos de usuarios
  1268 + $grupousr = $grpids[$id];
  1269 + if(!$grupousr){
  1270 + $grupousr = "";
  1271 + }
1255 1272 $imagem = "";
1256   - if(file_exists($locaplic."/temas/miniaturas/".$arq.".map.mini.png"))
1257   - {
  1273 + if(file_exists($locaplic."/temas/miniaturas/".$arq.".map.mini.png")){
1258 1274 $imagem = $arq.".map.mini.png";
1259 1275 }
1260   - if(isset($filtro) && $filtro != "" && $n != "")
1261   - {
1262   - $lista[] = array("nome"=>$n,"codigo"=>$arq,"imagem"=>$imagem,"extensao"=>$extensao);
  1276 + if(isset($filtro) && $filtro != "" && $n != ""){
  1277 + $lista[] = array("grupousr"=>$grupousr,"id_tema"=>$id,"nome"=>$n,"codigo"=>$arq,"imagem"=>$imagem,"extensao"=>$extensao);
1263 1278 }
1264   - if(!isset($filtro) || $filtro == "")
1265   - {
1266   - $lista[] = array("nome"=>$n,"codigo"=>$arq,"imagem"=>$imagem,"extensao"=>$extensao);
  1279 + if(!isset($filtro) || $filtro == ""){
  1280 + $lista[] = array("grupousr"=>$grupousr,"id_tema"=>$id,"nome"=>$n,"codigo"=>$arq,"imagem"=>$imagem,"extensao"=>$extensao);
1267 1281 }
1268 1282 }
1269 1283 return $lista;
... ...
admin/sql/cadastrodeusuarios.sql
  Diff comments   View file @3ecbded
1 1  
2 2 /* drop tables */
3 3  
  4 +drop table i3geousr_grupotema;
4 5 drop table i3geousr_grupousuario;
5 6 drop table i3geousr_grupos;
6 7 drop table i3geousr_operacoespapeis;
... ... @@ -10,7 +11,7 @@ drop table i3geousr_papeis;
10 11 drop table i3geousr_usuarios;
11 12  
12 13  
13   -
  14 +
14 15  
15 16 /* create tables */
16 17  
... ... @@ -26,6 +27,18 @@ create table i3geousr_grupos
26 27 );
27 28  
28 29  
  30 +-- define os grupos que podem utilizar os temas (mapfiles)
  31 +create table i3geousr_grupotema
  32 +(
  33 + -- identificador único do grupo
  34 + id_grupo integer not null,
  35 + -- código do tema na tabela i3geoadmin_temas
  36 + id_tema integer not null,
  37 + foreign key (id_grupo)
  38 + references i3geousr_grupos (id_grupo)
  39 +);
  40 +
  41 +
29 42 -- cadastro de usuários
30 43 create table i3geousr_usuarios
31 44 (
... ... @@ -96,4 +109,4 @@ create table i3geousr_papelusuario
96 109 );
97 110  
98 111  
99   -
  112 +
... ...
documentacao/diagramas/cadastrodeusuarios.erm
  Diff comments   View file @3ecbded
... ... @@ -11,7 +11,7 @@
11 11 </page_setting>
12 12 <category_index>0</category_index>
13 13 <zoom>1.0</zoom>
14   - <x>7</x>
  14 + <x>193</x>
15 15 <y>0</y>
16 16 <default_color>
17 17 <r>230</r>
... ... @@ -41,7 +41,7 @@
41 41 <suspend_validator>false</suspend_validator>
42 42 <export_setting>
43 43 <category_name_to_export>All</category_name_to_export>
44   - <ddl_output>/var/www/i3geo/admin/sql/cadastrodeusuarios.sql</ddl_output>
  44 + <ddl_output>c:\ms4w\apache\htdocs\i3geo\admin\sql\cadastrodeusuarios.sql</ddl_output>
45 45 <excel_output></excel_output>
46 46 <excel_template></excel_template>
47 47 <image_output></image_output>
... ... @@ -97,7 +97,7 @@
97 97 <id></id>
98 98 <height>-1</height>
99 99 <width>-1</width>
100   - <font_name>Ubuntu</font_name>
  100 + <font_name>Segoe UI</font_name>
101 101 <font_size>9</font_size>
102 102 <x>50</x>
103 103 <y>50</y>
... ... @@ -110,7 +110,7 @@
110 110 </connections>
111 111 <display>false</display>
112 112 <creation_date>2012-07-19 01:51:14</creation_date>
113   - <updated_date>2012-07-30 22:24:51</updated_date>
  113 + <updated_date>2012-09-09 13:19:23</updated_date>
114 114 <model_property>
115 115 <name>Project Name</name>
116 116 <value></value>
... ... @@ -281,13 +281,26 @@
281 281 <array_dimension>null</array_dimension>
282 282 <unsigned>false</unsigned>
283 283 <args></args>
  284 + <description>código do tema na tabela i3geoadmin_temas</description>
  285 + <logical_name>id_tema</logical_name>
  286 + <physical_name>id_tema</physical_name>
  287 + <type>integer</type>
  288 + </word>
  289 + <word>
  290 + <id>11</id>
  291 + <length>null</length>
  292 + <decimal>null</decimal>
  293 + <array>false</array>
  294 + <array_dimension>null</array_dimension>
  295 + <unsigned>false</unsigned>
  296 + <args></args>
284 297 <description></description>
285 298 <logical_name>id_usuario</logical_name>
286 299 <physical_name>id_usuario</physical_name>
287 300 <type>integer</type>
288 301 </word>
289 302 <word>
290   - <id>11</id>
  303 + <id>12</id>
291 304 <length>null</length>
292 305 <decimal>null</decimal>
293 306 <array>false</array>
... ... @@ -300,7 +313,7 @@
300 313 <type>text</type>
301 314 </word>
302 315 <word>
303   - <id>12</id>
  316 + <id>13</id>
304 317 <length>null</length>
305 318 <decimal>null</decimal>
306 319 <array>false</array>
... ... @@ -313,7 +326,7 @@
313 326 <type>text</type>
314 327 </word>
315 328 <word>
316   - <id>13</id>
  329 + <id>14</id>
317 330 <length>null</length>
318 331 <decimal>null</decimal>
319 332 <array>false</array>
... ... @@ -326,7 +339,7 @@
326 339 <type>text</type>
327 340 </word>
328 341 <word>
329   - <id>14</id>
  342 + <id>15</id>
330 343 <length>null</length>
331 344 <decimal>null</decimal>
332 345 <array>false</array>
... ... @@ -339,7 +352,7 @@
339 352 <type>text</type>
340 353 </word>
341 354 <word>
342   - <id>15</id>
  355 + <id>16</id>
343 356 <length>null</length>
344 357 <decimal>null</decimal>
345 358 <array>false</array>
... ... @@ -395,7 +408,7 @@
395 408 <option></option>
396 409 <columns>
397 410 <normal_column>
398   - <word_id>10</word_id>
  411 + <word_id>11</word_id>
399 412 <id>0</id>
400 413 <description></description>
401 414 <unique_key_name></unique_key_name>
... ... @@ -523,7 +536,7 @@
523 536 </sequence>
524 537 </normal_column>
525 538 <normal_column>
526   - <word_id>11</word_id>
  539 + <word_id>12</word_id>
527 540 <id>4</id>
528 541 <description></description>
529 542 <unique_key_name></unique_key_name>
... ... @@ -555,7 +568,7 @@
555 568 </sequence>
556 569 </normal_column>
557 570 <normal_column>
558   - <word_id>14</word_id>
  571 + <word_id>15</word_id>
559 572 <id>5</id>
560 573 <description></description>
561 574 <unique_key_name></unique_key_name>
... ... @@ -587,7 +600,7 @@
587 600 </sequence>
588 601 </normal_column>
589 602 <normal_column>
590   - <word_id>15</word_id>
  603 + <word_id>16</word_id>
591 604 <id>6</id>
592 605 <description></description>
593 606 <unique_key_name></unique_key_name>
... ... @@ -816,7 +829,7 @@
816 829 <columns>
817 830 <normal_column>
818 831 <id>9</id>
819   - <referenced_column>17</referenced_column>
  832 + <referenced_column>16</referenced_column>
820 833 <relation>2</relation>
821 834 <description></description>
822 835 <unique_key_name></unique_key_name>
... ... @@ -944,7 +957,7 @@
944 957 </sequence>
945 958 </normal_column>
946 959 <normal_column>
947   - <word_id>12</word_id>
  960 + <word_id>13</word_id>
948 961 <id>12</id>
949 962 <description></description>
950 963 <unique_key_name></unique_key_name>
... ... @@ -1018,29 +1031,160 @@
1018 1031 </table>
1019 1032 <table>
1020 1033 <id>5</id>
1021   - <height>107</height>
1022   - <width>203</width>
  1034 + <height>86</height>
  1035 + <width>220</width>
1023 1036 <font_name>Ubuntu</font_name>
1024 1037 <font_size>9</font_size>
1025   - <x>502</x>
1026   - <y>308</y>
  1038 + <x>532</x>
  1039 + <y>321</y>
1027 1040 <color>
1028 1041 <r>230</r>
1029 1042 <g>230</g>
1030 1043 <b>250</b>
1031 1044 </color>
1032 1045 <connections>
  1046 + <relation>
  1047 + <id>4</id>
  1048 + <source>1</source>
  1049 + <target>5</target>
  1050 + <child_cardinality>1..n</child_cardinality>
  1051 + <parent_cardinality>1</parent_cardinality>
  1052 + <reference_for_pk>true</reference_for_pk>
  1053 + <name></name>
  1054 + <on_delete_action>RESTRICT</on_delete_action>
  1055 + <on_update_action>RESTRICT</on_update_action>
  1056 + <source_xp>-1</source_xp>
  1057 + <source_yp>-1</source_yp>
  1058 + <target_xp>-1</target_xp>
  1059 + <target_yp>-1</target_yp>
  1060 + <referenced_column>null</referenced_column>
  1061 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1062 + </relation>
  1063 + <relation>
  1064 + <id>5</id>
  1065 + <source>7</source>
  1066 + <target>5</target>
  1067 + <child_cardinality>1..n</child_cardinality>
  1068 + <parent_cardinality>1</parent_cardinality>
  1069 + <reference_for_pk>true</reference_for_pk>
  1070 + <name></name>
  1071 + <on_delete_action>RESTRICT</on_delete_action>
  1072 + <on_update_action>RESTRICT</on_update_action>
  1073 + <source_xp>-1</source_xp>
  1074 + <source_yp>-1</source_yp>
  1075 + <target_xp>-1</target_xp>
  1076 + <target_yp>-1</target_yp>
  1077 + <referenced_column>null</referenced_column>
  1078 + <referenced_complex_unique_key>null</referenced_complex_unique_key>
  1079 + </relation>
1033 1080 </connections>
1034   - <physical_name>i3geousr_grupos</physical_name>
1035   - <logical_name>i3geousr_grupos</logical_name>
1036   - <description>Grupos de usuários</description>
  1081 + <physical_name>i3geousr_grupousuario</physical_name>
  1082 + <logical_name>i3geousr_grupousuario</logical_name>
  1083 + <description></description>
1037 1084 <constraint></constraint>
1038 1085 <primary_key_name></primary_key_name>
1039 1086 <option></option>
1040 1087 <columns>
1041 1088 <normal_column>
1042   - <word_id>7</word_id>
1043 1089 <id>14</id>
  1090 + <referenced_column>0</referenced_column>
  1091 + <relation>4</relation>
  1092 + <description></description>
  1093 + <unique_key_name></unique_key_name>
  1094 + <logical_name></logical_name>
  1095 + <physical_name></physical_name>
  1096 + <type>integer</type>
  1097 + <constraint></constraint>
  1098 + <default_value></default_value>
  1099 + <auto_increment>false</auto_increment>
  1100 + <foreign_key>true</foreign_key>
  1101 + <not_null>true</not_null>
  1102 + <primary_key>false</primary_key>
  1103 + <unique_key>false</unique_key>
  1104 + <character_set></character_set>
  1105 + <collation></collation>
  1106 + <sequence>
  1107 + <name></name>
  1108 + <schema></schema>
  1109 + <increment></increment>
  1110 + <min_value></min_value>
  1111 + <max_value></max_value>
  1112 + <start></start>
  1113 + <cache></cache>
  1114 + <cycle>false</cycle>
  1115 + <order>false</order>
  1116 + <description></description>
  1117 + <data_type></data_type>
  1118 + <decimal_size>0</decimal_size>
  1119 + </sequence>
  1120 + </normal_column>
  1121 + <normal_column>
  1122 + <id>15</id>
  1123 + <referenced_column>19</referenced_column>
  1124 + <relation>5</relation>
  1125 + <description></description>
  1126 + <unique_key_name></unique_key_name>
  1127 + <logical_name></logical_name>
  1128 + <physical_name></physical_name>
  1129 + <type>integer</type>
  1130 + <constraint></constraint>
  1131 + <default_value></default_value>
  1132 + <auto_increment>false</auto_increment>
  1133 + <foreign_key>true</foreign_key>
  1134 + <not_null>true</not_null>
  1135 + <primary_key>false</primary_key>
  1136 + <unique_key>false</unique_key>
  1137 + <character_set></character_set>
  1138 + <collation></collation>
  1139 + <sequence>
  1140 + <name></name>
  1141 + <schema></schema>
  1142 + <increment></increment>
  1143 + <min_value></min_value>
  1144 + <max_value></max_value>
  1145 + <start></start>
  1146 + <cache></cache>
  1147 + <cycle>false</cycle>
  1148 + <order>false</order>
  1149 + <description></description>
  1150 + <data_type></data_type>
  1151 + <decimal_size>0</decimal_size>
  1152 + </sequence>
  1153 + </normal_column>
  1154 + </columns>
  1155 + <indexes>
  1156 + </indexes>
  1157 + <complex_unique_key_list>
  1158 + </complex_unique_key_list>
  1159 + <table_properties>
  1160 + <schema></schema>
  1161 + </table_properties>
  1162 + </table>
  1163 + <table>
  1164 + <id>6</id>
  1165 + <height>107</height>
  1166 + <width>235</width>
  1167 + <font_name>Ubuntu</font_name>
  1168 + <font_size>9</font_size>
  1169 + <x>851</x>
  1170 + <y>251</y>
  1171 + <color>
  1172 + <r>128</r>
  1173 + <g>128</g>
  1174 + <b>192</b>
  1175 + </color>
  1176 + <connections>
  1177 + </connections>
  1178 + <physical_name>i3geousr_operacoes</physical_name>
  1179 + <logical_name>i3geousr_operacoes</logical_name>
  1180 + <description>Cadastro de operações do sistema</description>
  1181 + <constraint></constraint>
  1182 + <primary_key_name></primary_key_name>
  1183 + <option></option>
  1184 + <columns>
  1185 + <normal_column>
  1186 + <word_id>8</word_id>
  1187 + <id>16</id>
1044 1188 <description></description>
1045 1189 <unique_key_name></unique_key_name>
1046 1190 <logical_name></logical_name>
... ... @@ -1071,8 +1215,8 @@
1071 1215 </sequence>
1072 1216 </normal_column>
1073 1217 <normal_column>
1074   - <word_id>13</word_id>
1075   - <id>15</id>
  1218 + <word_id>1</word_id>
  1219 + <id>17</id>
1076 1220 <description></description>
1077 1221 <unique_key_name></unique_key_name>
1078 1222 <logical_name></logical_name>
... ... @@ -1103,8 +1247,8 @@
1103 1247 </sequence>
1104 1248 </normal_column>
1105 1249 <normal_column>
1106   - <word_id>5</word_id>
1107   - <id>16</id>
  1250 + <word_id>4</word_id>
  1251 + <id>18</id>
1108 1252 <description></description>
1109 1253 <unique_key_name></unique_key_name>
1110 1254 <logical_name></logical_name>
... ... @@ -1144,30 +1288,30 @@
1144 1288 </table_properties>
1145 1289 </table>
1146 1290 <table>
1147   - <id>6</id>
  1291 + <id>7</id>
1148 1292 <height>107</height>
1149   - <width>226</width>
  1293 + <width>213</width>
1150 1294 <font_name>Ubuntu</font_name>
1151 1295 <font_size>9</font_size>
1152   - <x>782</x>
1153   - <y>176</y>
  1296 + <x>524</x>
  1297 + <y>48</y>
1154 1298 <color>
1155   - <r>128</r>
1156   - <g>128</g>
1157   - <b>192</b>
  1299 + <r>230</r>
  1300 + <g>230</g>
  1301 + <b>250</b>
1158 1302 </color>
1159 1303 <connections>
1160 1304 </connections>
1161   - <physical_name>i3geousr_operacoes</physical_name>
1162   - <logical_name>i3geousr_operacoes</logical_name>
1163   - <description>Cadastro de operações do sistema</description>
  1305 + <physical_name>i3geousr_grupos</physical_name>
  1306 + <logical_name>i3geousr_grupos</logical_name>
  1307 + <description>Grupos de usuários</description>
1164 1308 <constraint></constraint>
1165 1309 <primary_key_name></primary_key_name>
1166 1310 <option></option>
1167 1311 <columns>
1168 1312 <normal_column>
1169   - <word_id>8</word_id>
1170   - <id>17</id>
  1313 + <word_id>7</word_id>
  1314 + <id>19</id>
1171 1315 <description></description>
1172 1316 <unique_key_name></unique_key_name>
1173 1317 <logical_name></logical_name>
... ... @@ -1198,8 +1342,8 @@
1198 1342 </sequence>
1199 1343 </normal_column>
1200 1344 <normal_column>
1201   - <word_id>1</word_id>
1202   - <id>18</id>
  1345 + <word_id>14</word_id>
  1346 + <id>20</id>
1203 1347 <description></description>
1204 1348 <unique_key_name></unique_key_name>
1205 1349 <logical_name></logical_name>
... ... @@ -1230,8 +1374,8 @@
1230 1374 </sequence>
1231 1375 </normal_column>
1232 1376 <normal_column>
1233   - <word_id>4</word_id>
1234   - <id>19</id>
  1377 + <word_id>5</word_id>
  1378 + <id>21</id>
1235 1379 <description></description>
1236 1380 <unique_key_name></unique_key_name>
1237 1381 <logical_name></logical_name>
... ... @@ -1271,13 +1415,13 @@
1271 1415 </table_properties>
1272 1416 </table>
1273 1417 <table>
1274   - <id>7</id>
  1418 + <id>8</id>
1275 1419 <height>86</height>
1276   - <width>213</width>
1277   - <font_name>Ubuntu</font_name>
  1420 + <width>197</width>
  1421 + <font_name>Segoe UI</font_name>
1278 1422 <font_size>9</font_size>
1279   - <x>508</x>
1280   - <y>103</y>
  1423 + <x>838</x>
  1424 + <y>72</y>
1281 1425 <color>
1282 1426 <r>230</r>
1283 1427 <g>230</g>
... ... @@ -1285,26 +1429,9 @@
1285 1429 </color>
1286 1430 <connections>
1287 1431 <relation>
1288   - <id>4</id>
1289   - <source>1</source>
1290   - <target>7</target>
1291   - <child_cardinality>1..n</child_cardinality>
1292   - <parent_cardinality>1</parent_cardinality>
1293   - <reference_for_pk>true</reference_for_pk>
1294   - <name></name>
1295   - <on_delete_action>RESTRICT</on_delete_action>
1296   - <on_update_action>RESTRICT</on_update_action>
1297   - <source_xp>-1</source_xp>
1298   - <source_yp>-1</source_yp>
1299   - <target_xp>-1</target_xp>
1300   - <target_yp>-1</target_yp>
1301   - <referenced_column>null</referenced_column>
1302   - <referenced_complex_unique_key>null</referenced_complex_unique_key>
1303   - </relation>
1304   - <relation>
1305   - <id>5</id>
1306   - <source>5</source>
1307   - <target>7</target>
  1432 + <id>6</id>
  1433 + <source>7</source>
  1434 + <target>8</target>
1308 1435 <child_cardinality>1..n</child_cardinality>
1309 1436 <parent_cardinality>1</parent_cardinality>
1310 1437 <reference_for_pk>true</reference_for_pk>
... ... @@ -1319,17 +1446,17 @@
1319 1446 <referenced_complex_unique_key>null</referenced_complex_unique_key>
1320 1447 </relation>
1321 1448 </connections>
1322   - <physical_name>i3geousr_grupousuario</physical_name>
1323   - <logical_name>i3geousr_grupousuario</logical_name>
1324   - <description></description>
  1449 + <physical_name>i3geousr_grupotema</physical_name>
  1450 + <logical_name>i3geousr_grupotema</logical_name>
  1451 + <description>Define os grupos que podem utilizar os temas (mapfiles)</description>
1325 1452 <constraint></constraint>
1326 1453 <primary_key_name></primary_key_name>
1327 1454 <option></option>
1328 1455 <columns>
1329 1456 <normal_column>
1330   - <id>20</id>
1331   - <referenced_column>0</referenced_column>
1332   - <relation>4</relation>
  1457 + <id>22</id>
  1458 + <referenced_column>19</referenced_column>
  1459 + <relation>6</relation>
1333 1460 <description></description>
1334 1461 <unique_key_name></unique_key_name>
1335 1462 <logical_name></logical_name>
... ... @@ -1360,9 +1487,8 @@
1360 1487 </sequence>
1361 1488 </normal_column>
1362 1489 <normal_column>
1363   - <id>21</id>
1364   - <referenced_column>14</referenced_column>
1365   - <relation>5</relation>
  1490 + <word_id>10</word_id>
  1491 + <id>23</id>
1366 1492 <description></description>
1367 1493 <unique_key_name></unique_key_name>
1368 1494 <logical_name></logical_name>
... ... @@ -1371,7 +1497,7 @@
1371 1497 <constraint></constraint>
1372 1498 <default_value></default_value>
1373 1499 <auto_increment>false</auto_increment>
1374   - <foreign_key>true</foreign_key>
  1500 + <foreign_key>false</foreign_key>
1375 1501 <not_null>true</not_null>
1376 1502 <primary_key>false</primary_key>
1377 1503 <unique_key>false</unique_key>
... ... @@ -1648,239 +1774,239 @@
1648 1774 <direct_test_data>
1649 1775 <data>
1650 1776 <column_data>
1651   - <column_id>17</column_id>
  1777 + <column_id>16</column_id>
1652 1778 <value>1</value>
1653 1779 </column_data>
1654 1780 <column_data>
1655   - <column_id>18</column_id>
  1781 + <column_id>17</column_id>
1656 1782 <value>admin/html/editormapfile</value>
1657 1783 </column_data>
1658 1784 <column_data>
1659   - <column_id>19</column_id>
  1785 + <column_id>18</column_id>
1660 1786 <value>editor de mapfiles do sistema de administracao</value>
1661 1787 </column_data>
1662 1788 </data>
1663 1789 <data>
1664 1790 <column_data>
1665   - <column_id>17</column_id>
  1791 + <column_id>16</column_id>
1666 1792 <value>2</value>
1667 1793 </column_data>
1668 1794 <column_data>
1669   - <column_id>18</column_id>
  1795 + <column_id>17</column_id>
1670 1796 <value>admin/html/operacoes</value>
1671 1797 </column_data>
1672 1798 <column_data>
1673   - <column_id>19</column_id>
  1799 + <column_id>18</column_id>
1674 1800 <value>abre o editor de operacoes</value>
1675 1801 </column_data>
1676 1802 </data>
1677 1803 <data>
1678 1804 <column_data>
1679   - <column_id>17</column_id>
  1805 + <column_id>16</column_id>
1680 1806 <value>3</value>
1681 1807 </column_data>
1682 1808 <column_data>
1683   - <column_id>18</column_id>
  1809 + <column_id>17</column_id>
1684 1810 <value>teste/</value>
1685 1811 </column_data>
1686 1812 <column_data>
1687   - <column_id>19</column_id>
  1813 + <column_id>18</column_id>
1688 1814 <value>teste</value>
1689 1815 </column_data>
1690 1816 </data>
1691 1817 <data>
1692 1818 <column_data>
1693   - <column_id>17</column_id>
  1819 + <column_id>16</column_id>
1694 1820 <value>4</value>
1695 1821 </column_data>
1696 1822 <column_data>
1697   - <column_id>18</column_id>
  1823 + <column_id>17</column_id>
1698 1824 <value>admin/html/arvore</value>
1699 1825 </column_data>
1700 1826 <column_data>
1701   - <column_id>19</column_id>
  1827 + <column_id>18</column_id>
1702 1828 <value>edicao da arvore do catalogo de temas</value>
1703 1829 </column_data>
1704 1830 </data>
1705 1831 <data>
1706 1832 <column_data>
1707   - <column_id>17</column_id>
  1833 + <column_id>16</column_id>
1708 1834 <value>5</value>
1709 1835 </column_data>
1710 1836 <column_data>
1711   - <column_id>18</column_id>
  1837 + <column_id>17</column_id>
1712 1838 <value>admin/html/menus</value>
1713 1839 </column_data>
1714 1840 <column_data>
1715   - <column_id>19</column_id>
  1841 + <column_id>18</column_id>
1716 1842 <value>edicao da lista de menus</value>
1717 1843 </column_data>
1718 1844 </data>
1719 1845 <data>
1720 1846 <column_data>
1721   - <column_id>17</column_id>
  1847 + <column_id>16</column_id>
1722 1848 <value>6</value>
1723 1849 </column_data>
1724 1850 <column_data>
1725   - <column_id>18</column_id>
  1851 + <column_id>17</column_id>
1726 1852 <value>admin/html/ogcws</value>
1727 1853 </column_data>
1728 1854 <column_data>
1729   - <column_id>19</column_id>
  1855 + <column_id>18</column_id>
1730 1856 <value>edicao das preferencias do servico WMS</value>
1731 1857 </column_data>
1732 1858 </data>
1733 1859 <data>
1734 1860 <column_data>
1735   - <column_id>17</column_id>
  1861 + <column_id>16</column_id>
1736 1862 <value>7</value>
1737 1863 </column_data>
1738 1864 <column_data>
1739   - <column_id>18</column_id>
  1865 + <column_id>17</column_id>
1740 1866 <value>admin/html/atlas</value>
1741 1867 </column_data>
1742 1868 <column_data>
1743   - <column_id>19</column_id>
  1869 + <column_id>18</column_id>
1744 1870 <value>edicao de atlas</value>
1745 1871 </column_data>
1746 1872 </data>
1747 1873 <data>
1748 1874 <column_data>
1749   - <column_id>17</column_id>
  1875 + <column_id>16</column_id>
1750 1876 <value>8</value>
1751 1877 </column_data>
1752 1878 <column_data>
1753   - <column_id>18</column_id>
  1879 + <column_id>17</column_id>
1754 1880 <value>admin/html/identifica</value>
1755 1881 </column_data>
1756 1882 <column_data>
1757   - <column_id>19</column_id>
  1883 + <column_id>18</column_id>
1758 1884 <value>lista de sistemas incluidos na ferramenta de identificacao</value>
1759 1885 </column_data>
1760 1886 </data>
1761 1887 <data>
1762 1888 <column_data>
1763   - <column_id>17</column_id>
  1889 + <column_id>16</column_id>
1764 1890 <value>9</value>
1765 1891 </column_data>
1766 1892 <column_data>
1767   - <column_id>18</column_id>
  1893 + <column_id>17</column_id>
1768 1894 <value>admin/html/incluimap</value>
1769 1895 </column_data>
1770 1896 <column_data>
1771   - <column_id>19</column_id>
  1897 + <column_id>18</column_id>
1772 1898 <value>adapta mapfiles antigos para versoes novas do Mapserver</value>
1773 1899 </column_data>
1774 1900 </data>
1775 1901 <data>
1776 1902 <column_data>
1777   - <column_id>17</column_id>
  1903 + <column_id>16</column_id>
1778 1904 <value>10</value>
1779 1905 </column_data>
1780 1906 <column_data>
1781   - <column_id>18</column_id>
  1907 + <column_id>17</column_id>
1782 1908 <value>admin/html/mapas</value>
1783 1909 </column_data>
1784 1910 <column_data>
1785   - <column_id>19</column_id>
  1911 + <column_id>18</column_id>
1786 1912 <value>lista de links para mapas</value>
1787 1913 </column_data>
1788 1914 </data>
1789 1915 <data>
1790 1916 <column_data>
1791   - <column_id>17</column_id>
  1917 + <column_id>16</column_id>
1792 1918 <value>11</value>
1793 1919 </column_data>
1794 1920 <column_data>
1795   - <column_id>18</column_id>
  1921 + <column_id>17</column_id>
1796 1922 <value>admin/html/perfis</value>
1797 1923 </column_data>
1798 1924 <column_data>
1799   - <column_id>19</column_id>
  1925 + <column_id>18</column_id>
1800 1926 <value>lista controlada de perfis</value>
1801 1927 </column_data>
1802 1928 </data>
1803 1929 <data>
1804 1930 <column_data>
1805   - <column_id>17</column_id>
  1931 + <column_id>16</column_id>
1806 1932 <value>12</value>
1807 1933 </column_data>
1808 1934 <column_data>
1809   - <column_id>18</column_id>
  1935 + <column_id>17</column_id>
1810 1936 <value>admin/html/sistemas</value>
1811 1937 </column_data>
1812 1938 <column_data>
1813   - <column_id>19</column_id>
  1939 + <column_id>18</column_id>
1814 1940 <value>lista de sistemas complementares adicionados ao catalogo de camadas</value>
1815 1941 </column_data>
1816 1942 </data>
1817 1943 <data>
1818 1944 <column_data>
1819   - <column_id>17</column_id>
  1945 + <column_id>16</column_id>
1820 1946 <value>13</value>
1821 1947 </column_data>
1822 1948 <column_data>
1823   - <column_id>18</column_id>
  1949 + <column_id>17</column_id>
1824 1950 <value>admin/html/subirshapefile</value>
1825 1951 </column_data>
1826 1952 <column_data>
1827   - <column_id>19</column_id>
  1953 + <column_id>18</column_id>
1828 1954 <value>upload de shapefile para uma pasta específica no servidor</value>
1829 1955 </column_data>
1830 1956 </data>
1831 1957 <data>
1832 1958 <column_data>
1833   - <column_id>17</column_id>
  1959 + <column_id>16</column_id>
1834 1960 <value>14</value>
1835 1961 </column_data>
1836 1962 <column_data>
1837   - <column_id>18</column_id>
  1963 + <column_id>17</column_id>
1838 1964 <value>admin/html/tags</value>
1839 1965 </column_data>
1840 1966 <column_data>
1841   - <column_id>19</column_id>
  1967 + <column_id>18</column_id>
1842 1968 <value>lista controlada de tags</value>
1843 1969 </column_data>
1844 1970 </data>
1845 1971 <data>
1846 1972 <column_data>
1847   - <column_id>17</column_id>
  1973 + <column_id>16</column_id>
1848 1974 <value>15</value>
1849 1975 </column_data>
1850 1976 <column_data>
1851   - <column_id>18</column_id>
  1977 + <column_id>17</column_id>
1852 1978 <value>admin/html/webservices</value>
1853 1979 </column_data>
1854 1980 <column_data>
1855   - <column_id>19</column_id>
  1981 + <column_id>18</column_id>
1856 1982 <value>cadastro de links para webservices</value>
1857 1983 </column_data>
1858 1984 </data>
1859 1985 <data>
1860 1986 <column_data>
1861   - <column_id>17</column_id>
  1987 + <column_id>16</column_id>
1862 1988 <value>16</value>
1863 1989 </column_data>
1864 1990 <column_data>
1865   - <column_id>18</column_id>
  1991 + <column_id>17</column_id>
1866 1992 <value>admin/php/editortexto</value>
1867 1993 </column_data>
1868 1994 <column_data>
1869   - <column_id>19</column_id>
  1995 + <column_id>18</column_id>
1870 1996 <value>editor de textos para edicao de mapfiles</value>
1871 1997 </column_data>
1872 1998 </data>
1873 1999 <data>
1874 2000 <column_data>
1875   - <column_id>17</column_id>
  2001 + <column_id>16</column_id>
1876 2002 <value>17</value>
1877 2003 </column_data>
1878 2004 <column_data>
1879   - <column_id>18</column_id>
  2005 + <column_id>17</column_id>
1880 2006 <value>admin/html/usuarios</value>
1881 2007 </column_data>
1882 2008 <column_data>
1883   - <column_id>19</column_id>
  2009 + <column_id>18</column_id>
1884 2010 <value>cadastro de usuarios</value>
1885 2011 </column_data>
1886 2012 </data>
... ... @@ -1889,7 +2015,7 @@
1889 2015 <test_data_num>0</test_data_num>
1890 2016 <data_def_list>
1891 2017 <data_def>
1892   - <column_id>17</column_id>
  2018 + <column_id>16</column_id>
1893 2019 <type>Format</type>
1894 2020 <repeat_num>1</repeat_num>
1895 2021 <template>%</template>
... ... @@ -1904,7 +2030,7 @@
1904 2030 </modified_values>
1905 2031 </data_def>
1906 2032 <data_def>
1907   - <column_id>18</column_id>
  2033 + <column_id>17</column_id>
1908 2034 <type>Format</type>
1909 2035 <repeat_num>1</repeat_num>
1910 2036 <template>codigo%</template>
... ... @@ -1919,7 +2045,7 @@
1919 2045 </modified_values>
1920 2046 </data_def>
1921 2047 <data_def>
1922   - <column_id>19</column_id>
  2048 + <column_id>18</column_id>
1923 2049 <type>Format</type>
1924 2050 <repeat_num>1</repeat_num>
1925 2051 <template>descricao%</template>
... ...