From 7665dce120d98ffdd40909e1a498e1f2a374e96a Mon Sep 17 00:00:00 2001
From: adleywd <adleydamaceno@gmail.com>
Date: Tue, 2 Sep 2014 15:26:49 -0300
Subject: [PATCH] edição de usuário, templete e rotas

---
 wscacicneo/templates/editarorgao.pt |  1 -
 wscacicneo/templates/editaruser.pt  | 34 +++++++++++++++++++++++++---------
 wscacicneo/views.py                 |  6 +++---
 3 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/wscacicneo/templates/editarorgao.pt b/wscacicneo/templates/editarorgao.pt
index cbb85cd..b9e52aa 100644
--- a/wscacicneo/templates/editarorgao.pt
+++ b/wscacicneo/templates/editarorgao.pt
@@ -72,7 +72,6 @@
                     $('#sigla').val('')
                     $('#coleta').val('')
                     $('#end').val('')
-                    $('#url').val('')
            });
            $('#enviar').click(function(){
                 var nome = $('#nome').val()
diff --git a/wscacicneo/templates/editaruser.pt b/wscacicneo/templates/editaruser.pt
index 1d88ded..1f0ec9d 100644
--- a/wscacicneo/templates/editaruser.pt
+++ b/wscacicneo/templates/editaruser.pt
@@ -59,12 +59,13 @@
                 <div class="form-group">
                     <label class="col-lg-2 control-label">Senha</label>
                         <div class="col-lg-5">
-                        <input type="password" id="senha" class="form-control" placeholder="Informe novamente sua senha">
+                        <input type="text" id="senha" value="${senha}" class="form-control" placeholder="Informe novamente sua senha">
                     </div>
                 </div>
                 <div class="form-group">
                   <div class="col-lg-offset-2 col-lg-6">
                     <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
+                    <input style="display:none;" id="url" value="${request.matchdict['matricula']}">
                     <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
                   </div>
                 </div>
@@ -82,18 +83,33 @@
                     $('#cargo').val('')
                     $('#setor').val('')
                     $('#permissao').val('Permissões')
+                    $('#senha').val('')
            });
            $('#enviar').click(function(){
+                var nome = $('#nome').val()
+                    matricula = $('#matricula').val()
+                    email = $('#email').val()
+                    telefone = $('#telefone').val()
+                    orgao = $('#orgao').val()
+                    cargo = $('#cargo').val()
+                    setor = $('#setor').val()
+                    permissao = $('#permissao').val()
+                    url = $('#url').val()
+                    senha = $('#senha').val()
+    
                 var data = {
-                    'nome' : $('#nome').val(),
-                    'matricula' : $('#matricula').val(),
-                    'email' : $('#email').val(),
-                    'telefone' : $('#telefone').val(),
-                    'orgao' : $('#orgao').val(),
-                    'cargo' : $('#cargo').val(),
-                    'setor' : $('#setor').val(),
-                    'permissao' : $('#permissao').val(),
+                    'url': url,
+                    'nome': nome,
+                    'matricula': matricula,
+                    'email': email,
+                    'telefone': telefone,
+                    'orgao': orgao,
+                    'cargo': cargo,
+                    'setor': setor,
+                    'permissao': permissao,
+                    'senha': senha
                 }
+
                 if (data.email.indexOf("gov.br") > -1 == false){
                    alert('Somente é permitido cadastro de e-mails institucionais');
                 }else{
diff --git a/wscacicneo/views.py b/wscacicneo/views.py
index c643e72..d4a2f8a 100644
--- a/wscacicneo/views.py
+++ b/wscacicneo/views.py
@@ -338,7 +338,7 @@ def edituser(request):
         'cargo' : search.results[0].cargo,
         'setor' : search.results[0].setor,
         'permissao' : search.results[0].permissao,
-        'senha' : search.results[0].permissao
+        'senha' : search.results[0].senha
     }
 
 @view_config(route_name='put_user')
@@ -362,7 +362,7 @@ def put_user(request):
     user = {
         'nome' : params['nome'],
         'matricula' : params['matricula'],
-        'email' : params['meila'],
+        'email' : params['email'],
         'orgao' : params['orgao'],
         'telefone' : params['telefone'],
         'cargo' : params['cargo'],
@@ -370,7 +370,7 @@ def put_user(request):
         'permissao' : params['permissao'],
         'senha' : params['senha']
     }
-    search = user_obj.search_orgao(matricula)
+    search = user_obj.search_user(matricula)
     id = search.results[0]._metadata.id_doc
     doc = json.dumps(user)
     edit = user_obj.edit_user(id, doc)
--
libgit2 0.21.2