Download as
Browse Code »

Commit a4190bf5e46d476604c59c1de84a10e777304a6e

Authored by Macieski
2 parents f3544c49 c1576b4d
Exists in master

Merge branch 'master' of https://github.com/lightbase/WSCacicNeo

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