Skip to content

Commit a9abb02

Browse files
iurisilvioiurisilvio
committed
Merge pull request #47 from CodingForChange/complemento
Complemento
2 parents 5925049 + ccab7ec commit a9abb02

File tree

5 files changed

+448
-2
lines changed

5 files changed

+448
-2
lines changed

‎CepTracker.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@ def track(self, cep):
5050
cidade, estado = value.split('/', 1)
5151
data['cidade'] = cidade.strip()
5252
data['estado'] = estado.split('-')[0].strip()
53-
53+
elif 'logradouro' in label and ' - ' in value:
54+
logradouro, complemento = value.split(' - ', 1)
55+
data['logradouro'] = logradouro.strip()
56+
data['complemento'] = complemento.strip(' -')
5457
else:
5558
data[label] = value
5659

‎database.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ class MongoDb(object):
66
'logradouro',
77
'bairro',
88
'cidade',
9-
'estado'
9+
'estado',
10+
'complemento'
1011
]
1112

1213
def __init__(self, address='localhost'):

‎test/assets/69908768.html‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
2+
3+
4+
5+
6+
7+
<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
8+
9+
<html lang="en">
10+
<head>
11+
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
12+
<!-- Meta usado no site da globo: <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -->
13+
14+
<script type="text/javascript" src="scripts/jquery-1.4.2.min.js"></script>
15+
16+
<script language="JavaScript" src="scripts/template.js" type="text/javascript"></script>
17+
<script language="JavaScript" src="scripts/aplicacao.js" type="text/javascript"></script>
18+
19+
20+
<link rel="stylesheet" type="text/css" href="css/template.css">
21+
<link rel="stylesheet" type="text/css" href="css/aplicacao.css">
22+
<title>Correios Mobile</title>
23+
<link rel="icon" href="images/template/icon.png" type="image/png"/>
24+
</head>
25+
<body>
26+
<div id="divTelaAguarde">
27+
<center>
28+
<span class="style1"><br><br><br><br><br><br><br><br><br><img src="images/template/62x62.gif" /><br></span>
29+
<span class="item">&nbsp;&nbsp;Aguarde...</span>
30+
</center>
31+
</div>
32+
33+
<div class="container">
34+
<div class="fundo">
35+
<div>
36+
<a href="index.do" class="logo"></a>
37+
</div>
38+
39+
40+
41+
42+
<script>
43+
function anterior()
44+
{
45+
_mostraTelaAguarde();
46+
$('#metodo').val('anterior');
47+
$('#frmCep').submit();
48+
}
49+
50+
function proximo()
51+
{
52+
_mostraTelaAguarde();
53+
$('#metodo').val('proximo');
54+
$('#frmCep').submit();
55+
}
56+
</script>
57+
<div class="conteudo">
58+
<div class="secao">Busca CEP - Endereço</div><br/>
59+
60+
<form name="buscaCepForm" method="post" action="/movel/buscaCepConfirma.do" id="frmCep">
61+
62+
Logradouro <b>1 - 1</b> de <b>1</b>
63+
64+
65+
66+
67+
<div class="caixacampobranco">
68+
69+
70+
71+
72+
<span class="resposta">Logradouro: </span>
73+
<span class="respostadestaque">
74+
Rodovia BR-364 (Rio Branco-Porto Velho) - até 5014 - lado par
75+
76+
</span><br/>
77+
<span class="resposta">Bairro: </span><span class="respostadestaque">Loteamento Santa Helena</span><br/>
78+
<span class="resposta">Localidade / UF: </span>
79+
<span class="respostadestaque">
80+
Rio Branco
81+
82+
/AC
83+
84+
</span><br/>
85+
<span class="resposta">CEP: </span><span class="respostadestaque">69908768</span><br/>
86+
87+
88+
89+
90+
91+
92+
93+
94+
95+
<div style="text-align: right;" class="mopcoes orientacao"><span>Opções <img style="position: relative right:0px;" src="images/template/mais.png"/></span></div>
96+
97+
</div>
98+
<div class="divopcoes">
99+
100+
<!-- Para usuários originários do Busca CEP -->
101+
<div> Simule um envio utilizando <br/> o CEP <strong>69908768</strong> como:</div>
102+
<ul>
103+
<li>
104+
<a onclick="retornarParaPrecos('69908768','1');">CEP Origem <img src="images/template/cep_r.png"/></a>
105+
</li>
106+
<li>
107+
<a onclick="retornarParaPrecos('69908768','2');"><img src="images/template/cep_d.png"/>CEP Destino</a>
108+
</li>
109+
</ul>
110+
111+
112+
113+
</div>
114+
115+
116+
117+
<div class="botoes">
118+
<div class="iconeesq">
119+
120+
<a href="buscaCep.do"><img src="images/template/seta-esquerda.gif"><span class="nav">&nbsp;Nova Consulta</span></a>
121+
122+
123+
</div>
124+
125+
126+
<br class="clr">
127+
<input type="hidden" name="metodo" value="buscarCep" id="metodo">
128+
<input type="hidden" name="numPagina" value="1">
129+
<input type="hidden" name="regTotal" value="1">
130+
<input type="hidden" name="cepEntrada" value="69908768" id="cepEntrada">
131+
<input type="hidden" name="tipoCep" value="" id="tipoCep">
132+
<input type="hidden" name="cepTemp" value="" id="cepTemp">
133+
</div>
134+
135+
</form>
136+
137+
</div>
138+
<script>
139+
140+
$('document').ready(function(){
141+
$('div div.mopcoes span').click(function(){
142+
$(this).parents().next('div.divopcoes').slideToggle(500);
143+
});
144+
});
145+
146+
function retornarParaPrecos(pCepSelecionado, pTipoCep)
147+
{
148+
var tipoCep=null;
149+
150+
if(pTipoCep==null)
151+
{
152+
tipoCep=$('#tipoCep').val();
153+
}
154+
else
155+
{
156+
tipoCep=pTipoCep;
157+
}
158+
var cepOrigem;
159+
var cepDestino;
160+
if(tipoCep!=null)
161+
{
162+
switch(tipoCep)
163+
{
164+
case "1":
165+
cepOrigem=pCepSelecionado;
166+
cepDestino=$('#cepTemp').val();
167+
break;
168+
169+
case "2":
170+
cepOrigem=$('#cepTemp').val();
171+
cepDestino=pCepSelecionado;
172+
break;
173+
}
174+
175+
$('#cepOrigem').val(cepOrigem);
176+
$('#cepDestino').val(cepDestino);
177+
178+
$('#calcularPrecos').submit();
179+
}
180+
}
181+
182+
183+
</script>
184+
185+
<form name="precoForm" method="post" action="/movel/precos.do" id="calcularPrecos">
186+
<input type="hidden" name="cepOrigem" value="" id="cepOrigem">
187+
<input type="hidden" name="cepDestino" value="" id="cepDestino">
188+
</form>
189+
<form name="buscaCepForm" method="post" action="/movel/buscaCep.do" id="buscaCepInicio">
190+
<input type="hidden" name="cepEntrada" value="69908768" class="comptotal">
191+
<input type="hidden" name="tipoCep" value="" id="tipoCep">
192+
<input type="hidden" name="cepTemp" value="" id="cepTemp">
193+
</form>
194+
195+
196+
<br/>
197+
</div>
198+
<div class="rodape">
199+
&nbsp;
200+
<a href="/movel/faleCorreios.do">
201+
<img src="images/template/fcc.gif" align="absmiddle">
202+
<span class="orientacao">&nbsp;Fale com os Correios</span>
203+
</a> |
204+
<a href="http://www.correios.com.br/">
205+
<span class="orientacao">&nbsp;Versão clássica</span>
206+
</a><br>
207+
208+
<div class="textorodape">&copy; Copyright 2012 Correios - Todos os direitos reservados</div>
209+
</div>
210+
</div>
211+
</body>
212+
</html>

0 commit comments

Comments
 (0)