Download as
Browse Code »

Commit 7eae8ef886523905377463e65b3a7338e8235c56

Authored by Macieski
1 parent 269367da
Exists in master

editar órgão

Showing 4 changed files with 44 additions and 28 deletions   Show diff stats
wscacicneo/templates/editarorgao.pt
  Diff comments   View file @7eae8ef
... ... @@ -7,43 +7,43 @@
7 7 <div class="form-group">
8 8 <label class="col-lg-2 control-label">Nome do Órgão</label>
9 9 <div class="col-lg-5">
10   - <input type="text" id="nome" class="form-control" placeholder="Nome do Órgão">
  10 + <input type="text" id="nome" class="form-control" value="${nome}" placeholder="Nome do Órgão">
11 11 </div>
12 12 </div>
13 13 <div class="form-group">
14 14 <label class="col-lg-2 control-label">Telefone</label>
15 15 <div class="col-lg-5">
16   - <input type="text" id="telefone" class="form-control" placeholder="Telefone">
  16 + <input type="text" id="telefone" value="${telefone}" class="form-control" placeholder="Telefone">
17 17 </div>
18 18 </div>
19 19 <div class="form-group">
20 20 <label class="col-lg-2 control-label">Gestor</label>
21 21 <div class="col-lg-5">
22   - <input type="text" id="gestor" class="form-control" placeholder="Gestor">
  22 + <input type="text" id="gestor" value="${cargo}" class="form-control" placeholder="Gestor">
23 23 </div>
24 24 </div>
25 25 <div class="form-group">
26 26 <label class="col-lg-2 control-label">Sigla</label>
27 27 <div class="col-lg-5">
28   - <input type="text" id="sigla" class="form-control" placeholder="Sigla">
  28 + <input type="text" id="sigla" value="${sigla}" class="form-control" placeholder="Sigla">
29 29 </div>
30 30 </div>
31 31 <div class="form-group">
32 32 <label class="col-lg-2 control-label">Endereço</label>
33 33 <div class="col-lg-5">
34   - <input type="text" id="end" class="form-control" placeholder="Endereço">
  34 + <input type="text" id="end" value="${endereco}" class="form-control" placeholder="Endereço">
35 35 </div>
36 36 </div>
37 37 <div class="form-group">
38 38 <label class="col-lg-2 control-label">E-mail</label>
39 39 <div class="col-lg-5">
40   - <input type="text" id="email" class="form-control" placeholder="E-mail">
  40 + <input type="text" id="email" value="${email}" class="form-control" placeholder="E-mail">
41 41 </div>
42 42 </div>
43 43 <div class="form-group">
44 44 <label class="col-lg-2 control-label">Tempo da Coleta</label>
45 45 <div class="col-lg-2">
46   - <select id="coleta" class="form-control">
  46 + <select id="coleta" value="${coleta}" class="form-control">
47 47 <option>1 dia</option>
48 48 <option>2 dias</option>
49 49 <option>3 dias</option>
... ... @@ -55,6 +55,7 @@
55 55 <div class="form-group">
56 56 <div class="col-lg-offset-2 col-lg-6">
57 57 <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['orgao']}">
58 59 <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
59 60 </div>
60 61 </div>
... ... @@ -63,6 +64,9 @@
63 64 </metal:content>
64 65 <metal:content fill-slot="javascript">
65 66 <script type="text/javascript">
  67 + $('#limpar').click(function(){
  68 + alert(url)
  69 + });
66 70 $('#enviar').click(function(){
67 71 var nome = $('#nome').val()
68 72 email = $('#email').val()
... ... @@ -71,8 +75,10 @@
71 75 sigla = $('#sigla').val()
72 76 coleta = $('#coleta').val()
73 77 end = $('#end').val()
  78 + url = $('#url').val()
74 79  
75 80 var data = {
  81 + 'url': url,
76 82 'nome': nome,
77 83 'email': email,
78 84 'telefone': telefone,
... ... @@ -82,8 +88,8 @@
82 88 'end': end
83 89 }
84 90 $.ajax({
85   - type: "POST",
86   - url: "post_orgao",
  91 + type: "PUT",
  92 + url: "${request.route_url('root')}post_orgao",
87 93 data: data,
88 94 success: function(){ alert('aaaaaaaaaaaaaaaaaaaaaa') },
89 95 error: function(){ alert('ooooooooooooooooooooooooo') },
... ...
wscacicneo/templates/orgao.pt
  Diff comments   View file @7eae8ef
... ... @@ -64,22 +64,14 @@
64 64 <metal:content fill-slot="javascript">
65 65 <script type="text/javascript">
66 66 $('#enviar').click(function(){
67   - var nome = $('#nome').val()
68   - email = $('#email').val()
69   - telefone = $('#telefone').val()
70   - gestor = $('#gestor').val()
71   - sigla = $('#sigla').val()
72   - coleta = $('#coleta').val()
73   - end = $('#end').val()
74   -
75 67 var data = {
76   - 'nome': nome,
77   - 'email': email,
78   - 'telefone': telefone,
79   - 'gestor': gestor,
80   - 'sigla': sigla,
81   - 'coleta': coleta,
82   - 'end': end
  68 + 'nome' : $('#nome').val(),
  69 + 'email' : $('#email').val(),
  70 + 'telefone' : $('#telefone').val(),
  71 + 'gestor' : $('#gestor').val(),
  72 + 'sigla' : $('#sigla').val(),
  73 + 'coleta' : $('#coleta').val(),
  74 + 'end' : $('#end').val(),
83 75 }
84 76 $.ajax({
85 77 type: "POST",
... ...
wscacicneo/test/test_orgao_attributes.py
  Diff comments   View file @7eae8ef
... ... @@ -70,7 +70,7 @@ class TestOrgaoBase(unittest.TestCase):
70 70 orgao_obj = Orgao(
71 71 nome='Ministério do Planejameiaaaaaaaaanto',
72 72 cargo='cargo',
73   - coleta='4h',
  73 + coleta='1 hora',
74 74 sigla='MPOG',
75 75 endereco='Esplanada bloco C',
76 76 email='admin@planemaneto.gov.br',
... ...
wscacicneo/views.py
  Diff comments   View file @7eae8ef
... ... @@ -34,7 +34,6 @@ def master(request):
34 34 def root(request):
35 35 return {'project': 'WSCacicNeo'}
36 36  
37   -
38 37 @view_config(route_name='home', renderer='templates/home.pt')
39 38 def home(request):
40 39 return {'project': 'WSCacicNeo'}
... ... @@ -147,7 +146,26 @@ def configapi(request):
147 146  
148 147 @view_config(route_name='editorgao', renderer='templates/editarorgao.pt')
149 148 def editorgao(request):
150   - return {'project': 'WSCacicNeo'}
  149 + nm_orgao = request.matchdict['orgao']
  150 + orgao_obj = Orgao(
  151 + nome = nm_orgao,
  152 + cargo = 'cargo',
  153 + coleta = '4h',
  154 + sigla = 'MPOG',
  155 + endereco = 'Esplanada bloco C',
  156 + email = 'admin@planemaneto.gov.br',
  157 + telefone = '(61) 2025-4117'
  158 + )
  159 + search = orgao_obj.search_orgao(nm_orgao)
  160 + return {
  161 + 'nome' : search.results[0].nome,
  162 + 'cargo' : search.results[0].cargo,
  163 + 'coleta' : search.results[0].coleta,
  164 + 'sigla' : search.results[0].sigla,
  165 + 'endereco' : search.results[0].endereco,
  166 + 'email' : search.results[0].email,
  167 + 'telefone' : search.results[0].telefone
  168 + }
151 169  
152 170 @view_config(route_name='notify', renderer='templates/notify.pt')
153 171 def notify(request):
... ... @@ -209,7 +227,7 @@ def put_orgao(request):
209 227 Edita um doc apartir do id
210 228 """
211 229 doc = request.params
212   - nm_orgao = doc['nome']
  230 + nm_orgao = doc['url']
213 231 orgao_obj = Orgao(
214 232 nome = doc['nome'],
215 233 cargo = doc['gestor'],
... ...