Download as
Browse Code »

Commit c1576b4db312d30fbb67119b44ef6f799d16e612

Authored by Adley
1 parent 326998ee
Exists in master

correção de falhas da view

Showing 5 changed files with 79 additions and 4 deletions   Show diff stats
wscacicneo/__init__.py
  Diff comments   View file @c1576b4
... ... @@ -50,6 +50,7 @@ def main(global_config, **settings):
50 50 #Usuários
51 51 config.add_route('user', 'user/cadastro')
52 52 config.add_route('post_user', 'post_user')
  53 + config.add_route('put_user', 'put_user')
53 54 config.add_route('edituser', 'editar/user/{matricula}')
54 55 #
55 56  
... ...
wscacicneo/model/user.py
  Diff comments   View file @c1576b4
... ... @@ -114,6 +114,25 @@ class UserBase(WSCacicNeo):
114 114 multivalued=False,
115 115 required=True
116 116 ))
  117 +
  118 + senha = Field(**dict(
  119 + name='senha',
  120 + alias='senha',
  121 + description='Senha do Usuário',
  122 + datatype='Text',
  123 + indices=['Textual'],
  124 + multivalued=False,
  125 + required=True
  126 + ))
  127 + favoritos = Field(**dict(
  128 + name='favoritos',
  129 + alias='favoritos',
  130 + description='Favoritos do Usuário',
  131 + datatype='Text',
  132 + indices=['Textual'],
  133 + multivalued=True,
  134 + required=False
  135 + ))
117 136  
118 137 base_metadata = BaseMetadata(
119 138 name='users',
... ... @@ -128,6 +147,8 @@ class UserBase(WSCacicNeo):
128 147 content_list.append(cargo)
129 148 content_list.append(setor)
130 149 content_list.append(permissao)
  150 + content_list.append(senha)
  151 + content_list.append(favoritos)
131 152  
132 153 lbbase = Base(
133 154 metadata=base_metadata,
... ...
wscacicneo/templates/editaruser.pt
  Diff comments   View file @c1576b4
... ... @@ -57,6 +57,12 @@
57 57 </div>
58 58 </div>
59 59 <div class="form-group">
  60 + <label class="col-lg-2 control-label">Senha</label>
  61 + <div class="col-lg-5">
  62 + <input type="password" id="senha" class="form-control" placeholder="Informe novamente sua senha">
  63 + </div>
  64 + </div>
  65 + <div class="form-group">
60 66 <div class="col-lg-offset-2 col-lg-6">
61 67 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
62 68 <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
... ... @@ -93,7 +99,7 @@
93 99 }else{
94 100 $.ajax({
95 101 type: "PUT",
96   - url: "${request.route_url('root')}post_user",
  102 + url: "${request.route_url('root')}put_user",
97 103 data: data,
98 104 success: function(){ alert('sucesso') },
99 105 error: function(){ alert('erro') },
... ...
wscacicneo/templates/user.pt
  Diff comments   View file @c1576b4
... ... @@ -57,6 +57,12 @@
57 57 </div>
58 58 </div>
59 59 <div class="form-group">
  60 + <label class="col-lg-2 control-label">Senha</label>
  61 + <div class="col-lg-5">
  62 + <input type="password" id="senha" class="form-control" placeholder="Senha">
  63 + </div>
  64 + </div>
  65 + <div class="form-group">
60 66 <div class="col-lg-offset-2 col-lg-6">
61 67 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
62 68 <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
... ... @@ -87,6 +93,7 @@
87 93 'cargo' : $('#cargo').val(),
88 94 'setor' : $('#setor').val(),
89 95 'permissao' : $('#permissao').val(),
  96 + 'senha' : $('#senha').val(),
90 97 }
91 98 if (data.email.indexOf("gov.br") > -1 == false){
92 99 alert('Somente é permitido cadastro de e-mails institucionais');
... ...
wscacicneo/views.py
  Diff comments   View file @c1576b4
... ... @@ -305,7 +305,8 @@ def post_user(request):
305 305 telefone = doc['telefone'],
306 306 cargo = doc['cargo'],
307 307 setor = doc['setor'],
308   - permissao = doc['permissao']
  308 + permissao = doc['permissao'],
  309 + senha = doc['senha']
309 310 )
310 311  
311 312 id_doc = user_obj.create_user()
... ... @@ -324,7 +325,8 @@ def edituser(request):
324 325 telefone = 'telefone',
325 326 cargo = 'cargo',
326 327 setor = 'setor',
327   - permissao = 'Gestor'
  328 + permissao = 'Gestor',
  329 + senha = 'senha'
328 330 )
329 331 search = user_obj.search_user(matricula)
330 332 return {
... ... @@ -335,5 +337,43 @@ def edituser(request):
335 337 'telefone' : search.results[0].telefone,
336 338 'cargo' : search.results[0].cargo,
337 339 'setor' : search.results[0].setor,
338   - 'permissao' : search.results[0].permissao
  340 + 'permissao' : search.results[0].permissao,
  341 + 'senha' : search.results[0].permissao
339 342 }
  343 +
  344 +@view_config(route_name='put_user')
  345 +def put_user(request):
  346 + """
  347 + Edita um doc de user apartir do id
  348 + """
  349 + params = request.params
  350 + matricula = params['url']
  351 + user_obj = User(
  352 + nome = params['nome'],
  353 + matricula = params['matricula'],
  354 + email = params['email'],
  355 + orgao = params['orgao'],
  356 + telefone = params['telefone'],
  357 + cargo = params['cargo'],
  358 + setor = params['setor'],
  359 + permissao = params['permissao'],
  360 + senha = params['senha']
  361 + )
  362 + user = {
  363 + 'nome' : params['nome'],
  364 + 'matricula' : params['matricula'],
  365 + 'email' : params['meila'],
  366 + 'orgao' : params['orgao'],
  367 + 'telefone' : params['telefone'],
  368 + 'cargo' : params['cargo'],
  369 + 'setor' : params['setor'],
  370 + 'permissao' : params['permissao'],
  371 + 'senha' : params['senha']
  372 + }
  373 + search = user_obj.search_orgao(matricula)
  374 + id = search.results[0]._metadata.id_doc
  375 + doc = json.dumps(user)
  376 + edit = user_obj.edit_user(id, doc)
  377 +
  378 + return Response(edit)
  379 +
... ...