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