Download as
Browse Code »

Commit 033081027da80a7250fbf511309dcafb5c2461a0

Authored by Macieski
1 parent a00071bd
Exists in master

url da base de dados

Showing 5 changed files with 48 additions and 13 deletions   Show diff stats
wscacicneo/model/orgao.py
  Diff comments   View file @0330810
@@ -104,6 +104,17 @@ class OrgaoBase(WSCacicNeo): @@ -104,6 +104,17 @@ class OrgaoBase(WSCacicNeo):
104 required=True 104 required=True
105 )) 105 ))
106 106
  107 + url = Field(**dict(
  108 + name='url',
  109 + alias='url',
  110 + description='Url da base de dados',
  111 + datatype='Text',
  112 + indices=['Textual'],
  113 + multivalued=False,
  114 + required=True
  115 + ))
  116 +
  117 +
107 base_metadata = BaseMetadata( 118 base_metadata = BaseMetadata(
108 name='orgaos', 119 name='orgaos',
109 ) 120 )
@@ -116,6 +127,7 @@ class OrgaoBase(WSCacicNeo): @@ -116,6 +127,7 @@ class OrgaoBase(WSCacicNeo):
116 content_list.append(email) 127 content_list.append(email)
117 content_list.append(endereco) 128 content_list.append(endereco)
118 content_list.append(coleta) 129 content_list.append(coleta)
  130 + content_list.append(url)
119 131
120 lbbase = Base( 132 lbbase = Base(
121 metadata=base_metadata, 133 metadata=base_metadata,
wscacicneo/templates/editarorgao.pt
  Diff comments   View file @0330810
@@ -41,6 +41,12 @@ @@ -41,6 +41,12 @@
41 </div> 41 </div>
42 </div> 42 </div>
43 <div class="form-group"> 43 <div class="form-group">
  44 + <label class="col-lg-2 control-label">E-mail</label>
  45 + <div class="col-lg-5">
  46 + <input type="text" id="url" value="${url}" class="form-control" placeholder="URL">
  47 + </div>
  48 + </div>
  49 + <div class="form-group">
44 <label class="col-lg-2 control-label">Tempo da Coleta</label> 50 <label class="col-lg-2 control-label">Tempo da Coleta</label>
45 <div class="col-lg-2"> 51 <div class="col-lg-2">
46 <select id="coleta" value="${coleta}" class="form-control"> 52 <select id="coleta" value="${coleta}" class="form-control">
@@ -55,7 +61,7 @@ @@ -55,7 +61,7 @@
55 <div class="form-group"> 61 <div class="form-group">
56 <div class="col-lg-offset-2 col-lg-6"> 62 <div class="col-lg-offset-2 col-lg-6">
57 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button> 63 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
58 - <input style="display:none;" id="url" value="${request.matchdict['sigla']}"> 64 + <input style="display:none;" id="id" value="${request.matchdict['sigla']}">
59 <button type="button" id="limpar" class="btn btn-sm">Limpar</button> 65 <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
60 </div> 66 </div>
61 </div> 67 </div>
@@ -81,17 +87,19 @@ @@ -81,17 +87,19 @@
81 sigla = $('#sigla').val() 87 sigla = $('#sigla').val()
82 coleta = $('#coleta').val() 88 coleta = $('#coleta').val()
83 end = $('#end').val() 89 end = $('#end').val()
  90 + id = $('#id').val()
84 url = $('#url').val() 91 url = $('#url').val()
85 92
86 var data = { 93 var data = {
87 - 'url': url, 94 + 'id': id,
88 'nome': nome, 95 'nome': nome,
89 'email': email, 96 'email': email,
90 'telefone': telefone, 97 'telefone': telefone,
91 'gestor': gestor, 98 'gestor': gestor,
92 'sigla': sigla, 99 'sigla': sigla,
93 'coleta': coleta, 100 'coleta': coleta,
94 - 'end': end 101 + 'end': end,
  102 + 'url': url
95 } 103 }
96 $.ajax({ 104 $.ajax({
97 type: "PUT", 105 type: "PUT",
wscacicneo/templates/orgao.pt
  Diff comments   View file @0330810
@@ -41,6 +41,13 @@ @@ -41,6 +41,13 @@
41 </div> 41 </div>
42 </div> 42 </div>
43 <div class="form-group"> 43 <div class="form-group">
  44 + <label class="col-lg-2 control-label">URL da Base de Dados</label>
  45 + <div class="col-lg-5">
  46 + <input type="text" id="url" class="form-control" placeholder="URL">
  47 + </div>
  48 + </div>
  49 +
  50 + <div class="form-group">
44 <label class="col-lg-2 control-label">Tempo da Coleta</label> 51 <label class="col-lg-2 control-label">Tempo da Coleta</label>
45 <div class="col-lg-2"> 52 <div class="col-lg-2">
46 <select id="coleta" class="form-control"> 53 <select id="coleta" class="form-control">
@@ -72,6 +79,7 @@ @@ -72,6 +79,7 @@
72 'sigla' : $('#sigla').val(), 79 'sigla' : $('#sigla').val(),
73 'coleta' : $('#coleta').val(), 80 'coleta' : $('#coleta').val(),
74 'end' : $('#end').val(), 81 'end' : $('#end').val(),
  82 + 'url' : $('#url').val(),
75 } 83 }
76 $.ajax({ 84 $.ajax({
77 type: "POST", 85 type: "POST",
wscacicneo/test/test_orgao_base.py
  Diff comments   View file @0330810
@@ -68,11 +68,11 @@ class TestOrgaoBase(unittest.TestCase): @@ -68,11 +68,11 @@ class TestOrgaoBase(unittest.TestCase):
68 sigla='MPOG', 68 sigla='MPOG',
69 endereco='Esplanada bloco C', 69 endereco='Esplanada bloco C',
70 email='admin@planemaneto.gov.br', 70 email='admin@planemaneto.gov.br',
71 - telefone='(61) 2025-4117' 71 + telefone='(61) 2025-4117',
  72 + url="http://api.brlight.net/api"
72 ) 73 )
73 self.assertIsInstance(orgao_obj, orgao.Orgao) 74 self.assertIsInstance(orgao_obj, orgao.Orgao)
74 self.assertEqual(orgao_obj.nome, 'Ministério do Planejamento') 75 self.assertEqual(orgao_obj.nome, 'Ministério do Planejamento')
75 - self.assertEqual(orgao_obj.cargo, 'Gestor')  
76 76
77 def tearDown(self): 77 def tearDown(self):
78 """ 78 """
wscacicneo/views.py
  Diff comments   View file @0330810
@@ -98,7 +98,8 @@ def listorgao(request): @@ -98,7 +98,8 @@ def listorgao(request):
98 sigla = 'MPOG', 98 sigla = 'MPOG',
99 endereco = 'Esplanada bloco C', 99 endereco = 'Esplanada bloco C',
100 email = 'admin@planemaneto.gov.br', 100 email = 'admin@planemaneto.gov.br',
101 - telefone = '(61) 2025-4117' 101 + telefone = '(61) 2025-4117',
  102 + url = 'http://api.brlight.net/api'
102 ) 103 )
103 search = orgao_obj.search_list_orgaos() 104 search = orgao_obj.search_list_orgaos()
104 return {'orgao_doc': search.results} 105 return {'orgao_doc': search.results}
@@ -160,7 +161,8 @@ def editorgao(request): @@ -160,7 +161,8 @@ def editorgao(request):
160 sigla = sigla, 161 sigla = sigla,
161 endereco = 'Esplanada bloco C', 162 endereco = 'Esplanada bloco C',
162 email = 'admin@planemaneto.gov.br', 163 email = 'admin@planemaneto.gov.br',
163 - telefone = '(61) 2025-4117' 164 + telefone = '(61) 2025-4117',
  165 + url = 'http://api.brlight.net/api'
164 ) 166 )
165 search = orgao_obj.search_orgao(sigla) 167 search = orgao_obj.search_orgao(sigla)
166 return { 168 return {
@@ -170,7 +172,8 @@ def editorgao(request): @@ -170,7 +172,8 @@ def editorgao(request):
170 'sigla' : search.results[0].sigla, 172 'sigla' : search.results[0].sigla,
171 'endereco' : search.results[0].endereco, 173 'endereco' : search.results[0].endereco,
172 'email' : search.results[0].email, 174 'email' : search.results[0].email,
173 - 'telefone' : search.results[0].telefone 175 + 'telefone' : search.results[0].telefone,
  176 + 'url' : search.results[0].url
174 } 177 }
175 178
176 @view_config(route_name='notify', renderer='templates/notify.pt') 179 @view_config(route_name='notify', renderer='templates/notify.pt')
@@ -218,7 +221,8 @@ def post_orgao(request): @@ -218,7 +221,8 @@ def post_orgao(request):
218 sigla = doc['sigla'], 221 sigla = doc['sigla'],
219 endereco = doc['end'], 222 endereco = doc['end'],
220 email = doc['email'], 223 email = doc['email'],
221 - telefone = doc['telefone'] 224 + telefone = doc['telefone'],
  225 + url = doc['url']
222 ) 226 )
223 227
224 id_doc = orgao_obj.create_orgao() 228 id_doc = orgao_obj.create_orgao()
@@ -232,7 +236,7 @@ def put_orgao(request): @@ -232,7 +236,7 @@ def put_orgao(request):
232 Edita um doc apartir do id 236 Edita um doc apartir do id
233 """ 237 """
234 params = request.params 238 params = request.params
235 - sigla = params['url'] 239 + sigla = params['id']
236 orgao_obj = Orgao( 240 orgao_obj = Orgao(
237 nome = params['nome'], 241 nome = params['nome'],
238 cargo = params['gestor'], 242 cargo = params['gestor'],
@@ -240,7 +244,8 @@ def put_orgao(request): @@ -240,7 +244,8 @@ def put_orgao(request):
240 sigla = params['sigla'], 244 sigla = params['sigla'],
241 endereco = params['end'], 245 endereco = params['end'],
242 email = params['email'], 246 email = params['email'],
243 - telefone = params['telefone'] 247 + telefone = params['telefone'],
  248 + url = params['url']
244 ) 249 )
245 orgao = { 250 orgao = {
246 'nome' : params['nome'], 251 'nome' : params['nome'],
@@ -249,7 +254,8 @@ def put_orgao(request): @@ -249,7 +254,8 @@ def put_orgao(request):
249 'sigla' : params['sigla'], 254 'sigla' : params['sigla'],
250 'endereco' : params['end'], 255 'endereco' : params['end'],
251 'email' : params['email'], 256 'email' : params['email'],
252 - 'telefone' : params['telefone'] 257 + 'telefone' : params['telefone'],
  258 + 'url' : params['url']
253 } 259 }
254 search = orgao_obj.search_orgao(sigla) 260 search = orgao_obj.search_orgao(sigla)
255 id = search.results[0]._metadata.id_doc 261 id = search.results[0]._metadata.id_doc
@@ -272,7 +278,8 @@ def delete_orgao(request): @@ -272,7 +278,8 @@ def delete_orgao(request):
272 sigla = 'asdasdas', 278 sigla = 'asdasdas',
273 endereco = 'asdsad', 279 endereco = 'asdsad',
274 email = 'asdsad', 280 email = 'asdsad',
275 - telefone = 'sadasd' 281 + telefone = 'sadasd',
  282 + url = 'sadasd'
276 ) 283 )
277 search = orgao_obj.search_orgao(sigla) 284 search = orgao_obj.search_orgao(sigla)
278 id = search.results[0]._metadata.id_doc 285 id = search.results[0]._metadata.id_doc