Download as
Browse Code »

Commit bae4bd099ed8ddc270d65d9698062ee8bff1f10a

Authored by Macieski
1 parent 25c199cd
Exists in master

correção do ajax do favoritos

Showing 3 changed files with 69 additions and 42 deletions   Show diff stats
wscacicneo/model/user.py
  Diff comments   View file @bae4bd0
@@ -285,3 +285,11 @@ class User(user_base.metaclass): @@ -285,3 +285,11 @@ class User(user_base.metaclass):
285 results = user_base.documentrest.delete(id) 285 results = user_base.documentrest.delete(id)
286 286
287 return results 287 return results
  288 +
  289 + def remove_path(self, id, path):
  290 + """
  291 + Deleta um valor especifico de um campo multivalorado
  292 + """
  293 + results = self.documentrest.delete_path(id, path)
  294 +
  295 + return results
wscacicneo/templates/favoritos.pt
  Diff comments   View file @bae4bd0
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 </div> 43 </div>
44 <button type="button" class="btn btn-sm btn-default">Salvar</button> 44 <button type="button" class="btn btn-sm btn-default">Salvar</button>
45 </div> 45 </div>
46 - <input style="display:none;" id="matricula" value="${request.matchdict['matricula']}"> 46 + <input style="display:none;" id='url' value="${request.matchdict['matricula']}">
47 </metal:content> 47 </metal:content>
48 <metal:content fill-slot="javascript"> 48 <metal:content fill-slot="javascript">
49 <script type="text/javascript"> 49 <script type="text/javascript">
@@ -51,12 +51,26 @@ @@ -51,12 +51,26 @@
51 index = $(this).index() 51 index = $(this).index()
52 a = $(this).find('a') 52 a = $(this).find('a')
53 value = $(a).html() 53 value = $(a).html()
  54 + itens = ${itens}
  55 + itens.splice(index, 1)
  56 + favoritos = ${favoritos}
  57 + favoritos.push(value)
54 var data = { 58 var data = {
55 - 'value': value, 59 + 'matricola': $('#url').val(),
56 'index': index, 60 'index': index,
57 - 'path': 'favoritos',  
58 - 'matricula': $('#matricula').val() 61 + 'favoritos': favoritos,
  62 + 'itens': itens,
  63 + 'nome' : '${nome}',
  64 + 'matricula' : '${matricula}',
  65 + 'email' : '${email}',
  66 + 'orgao' : '${orgao}',
  67 + 'telefone' : '${telefone}',
  68 + 'cargo' : '${cargo}',
  69 + 'setor' : '${setor}',
  70 + 'permissao' : '$permissao',
  71 + 'senha' : '${senha}'
59 } 72 }
  73 + console.log(data)
60 $.ajax({ 74 $.ajax({
61 type: "PUT", 75 type: "PUT",
62 url: "${request.route_url('root')}edit_favoritos", 76 url: "${request.route_url('root')}edit_favoritos",
@@ -65,24 +79,6 @@ @@ -65,24 +79,6 @@
65 error: function(){ alert('Não foi desta vez Tente novamente mais tarde') }, 79 error: function(){ alert('Não foi desta vez Tente novamente mais tarde') },
66 }); 80 });
67 }); 81 });
68 - $('#favoritos li').on('click', function(){  
69 - index = $(this).index()  
70 - a = $(this).find('a')  
71 - value = $(a).html()  
72 - var data = {  
73 - 'value': value,  
74 - 'index': index,  
75 - 'path': 'itens',  
76 - 'matricula': $('#matricula').val()  
77 - }  
78 - $.ajax({  
79 - type: "PUT",  
80 - url: "${request.route_url('root')}edit_favoritos",  
81 - data: data,  
82 - success: function(){ location.reload(); },  
83 - error: function(){ alert('Não foi desta vez Tente novamente mais tarde') },  
84 - });  
85 - });  
86 </script> 82 </script>
87 </metal:content> 83 </metal:content>
88 </metal:main> 84 </metal:main>
wscacicneo/views.py
  Diff comments   View file @bae4bd0
@@ -120,9 +120,18 @@ def favoritos(request): @@ -120,9 +120,18 @@ def favoritos(request):
120 search = user_obj.search_user(matricula) 120 search = user_obj.search_user(matricula)
121 favoritos = search.results[0].favoritos 121 favoritos = search.results[0].favoritos
122 return { 122 return {
123 - 'favoritos': search.results[0].favoritos,  
124 - 'itens': search.results[0].itens  
125 - } 123 + 'favoritos': search.results[0].favoritos,
  124 + 'itens': search.results[0].itens,
  125 + 'nome' : search.results[0].nome,
  126 + 'matricula' : search.results[0].matricula,
  127 + 'email' : search.results[0].email,
  128 + 'orgao' : search.results[0].orgao,
  129 + 'telefone' : search.results[0].telefone,
  130 + 'cargo' : search.results[0].cargo,
  131 + 'setor' : search.results[0].setor,
  132 + 'permissao' : search.results[0].permissao,
  133 + 'senha' : search.results[0].senha
  134 + }
126 135
127 @view_config(route_name='config', renderer='templates/config.pt') 136 @view_config(route_name='config', renderer='templates/config.pt')
128 def config(request): 137 def config(request):
@@ -316,7 +325,6 @@ def post_user(request): @@ -316,7 +325,6 @@ def post_user(request):
316 """ 325 """
317 Post doc users 326 Post doc users
318 """ 327 """
319 - print("SASDAKNADSHSADKNSADKBASDDASKJDSAKJSADHSADASDBKSADBKDSABKDSAKJ")  
320 rest_url = REST_URL 328 rest_url = REST_URL
321 userbase = UserBase().lbbase 329 userbase = UserBase().lbbase
322 doc = request.params 330 doc = request.params
@@ -451,24 +459,39 @@ def edit_favoritos(request): @@ -451,24 +459,39 @@ def edit_favoritos(request):
451 """ 459 """
452 Editar do Favoritos 460 Editar do Favoritos
453 """ 461 """
454 - doc = request.params  
455 - value = doc['value']  
456 - matricula = doc['matricula']  
457 - path = [doc['path']] 462 + params = request.params
  463 + matricula = params['matricola']
458 user_obj = User( 464 user_obj = User(
459 - nome = 'asdasd',  
460 - matricula = 'asdasd',  
461 - email = 'asdsad',  
462 - orgao = 'asdsad',  
463 - telefone = 'sdasd',  
464 - cargo = 'asdasdasd',  
465 - setor = 'asdasd',  
466 - permissao = 'asdasd',  
467 - senha = 'sadasdasd',  
468 - favoritos = ['asdasdasdasd'] 465 + nome = params['nome'],
  466 + matricula = params['matricula'],
  467 + email = params['email'],
  468 + orgao = params['orgao'],
  469 + telefone = params['telefone'],
  470 + cargo = params['cargo'],
  471 + setor = params['setor'],
  472 + permissao = params['permissao'],
  473 + senha = params['senha'],
  474 + favoritos = ['asdasdsad'],
  475 + itens = ['asdasdasd']
469 ) 476 )
  477 + itens = [params['itens']]
  478 + favoritos = [params['favoritos']]
  479 + user = {
  480 + 'nome' : params['nome'],
  481 + 'matricula' : params['matricula'],
  482 + 'email' : params['email'],
  483 + 'orgao' : params['orgao'],
  484 + 'telefone' : params['telefone'],
  485 + 'cargo' : params['cargo'],
  486 + 'setor' : params['setor'],
  487 + 'permissao' : params['permissao'],
  488 + 'senha' : params['senha'],
  489 + 'itens' : itens,
  490 + 'favoritos' : favoritos
  491 + }
470 search = user_obj.search_user(matricula) 492 search = user_obj.search_user(matricula)
471 id = search.results[0]._metadata.id_doc 493 id = search.results[0]._metadata.id_doc
472 - update= user_obj.create_favoritos(id, path, value) 494 + doc = json.dumps(user)
  495 + edit = user_obj.edit_user(id, doc)
473 496
474 - return Response(update) 497 + return Response(edit)