Download as
Browse Code »

Commit b830012894195da580ef79fab50f44e77ca3b87c

Authored by Adley
2 parents 7eb5a787 bae4bd09
Exists in master

erges

Showing 4 changed files with 96 additions and 68 deletions   Show diff stats
wscacicneo/model/user.py
  Diff comments   View file @b830012
... ... @@ -285,3 +285,11 @@ class User(user_base.metaclass):
285 285 results = user_base.documentrest.delete(id)
286 286  
287 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 @b830012
... ... @@ -43,7 +43,7 @@
43 43 </div>
44 44 <button type="button" class="btn btn-sm btn-default">Salvar</button>
45 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 47 </metal:content>
48 48 <metal:content fill-slot="javascript">
49 49 <script type="text/javascript">
... ... @@ -51,12 +51,26 @@
51 51 index = $(this).index()
52 52 a = $(this).find('a')
53 53 value = $(a).html()
  54 + itens = ${itens}
  55 + itens.splice(index, 1)
  56 + favoritos = ${favoritos}
  57 + favoritos.push(value)
54 58 var data = {
55   - 'value': value,
  59 + 'matricola': $('#url').val(),
56 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 74 $.ajax({
61 75 type: "PUT",
62 76 url: "${request.route_url('root')}edit_favoritos",
... ... @@ -65,24 +79,6 @@
65 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 82 </script>
87 83 </metal:content>
88 84 </metal:main>
... ...
wscacicneo/utils/utils.py
  Diff comments   View file @b830012
... ... @@ -8,3 +8,9 @@ class Utils:
8 8  
9 9 def to_url(*args):
10 10 return '/'.join(list(args))
  11 +
  12 + def verifica_email_institucional(email):
  13 + if("gov.br" in email):
  14 + return True
  15 + else:
  16 + return False
11 17 \ No newline at end of file
... ...
wscacicneo/views.py
  Diff comments   View file @b830012
... ... @@ -9,7 +9,6 @@ from .models import (
9 9 DBSession,
10 10 SistemaOperacional,
11 11 )
12   -from wscacicneo.utils.utils import Utils
13 12 from wscacicneo.model.orgao import Orgao
14 13 from wscacicneo.model.orgao import OrgaoBase
15 14 from wscacicneo.model.user import User
... ... @@ -121,9 +120,18 @@ def favoritos(request):
121 120 search = user_obj.search_user(matricula)
122 121 favoritos = search.results[0].favoritos
123 122 return {
124   - 'favoritos': search.results[0].favoritos,
125   - 'itens': search.results[0].itens
126   - }
  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 + }
127 135  
128 136 @view_config(route_name='config', renderer='templates/config.pt')
129 137 def config(request):
... ... @@ -317,35 +325,30 @@ def post_user(request):
317 325 """
318 326 Post doc users
319 327 """
320   -
321 328 rest_url = REST_URL
322 329 userbase = UserBase().lbbase
323 330 doc = request.params
324   - email_user = doc['email']
325   - email_is_institucional = Utils.verifica_email_institucional(email_user)
326   - document = doc['favoritos']
327   - favoritos = [document]
328   - itens = [doc['lista_orgao'], doc['cadastro_orgao'], doc['lista_user'], doc['cadastro_user'], doc['relatorios'], doc['coleta'], doc['notify']]
329   - user_obj = User(
330   - nome = doc['nome'],
331   - matricula = doc['matricula'],
332   - email = doc['email'],
333   - orgao = doc['orgao'],
334   - telefone = doc['telefone'],
335   - cargo = doc['cargo'],
336   - setor = doc['setor'],
337   - permissao = doc['permissao'],
338   - senha = doc['senha'],
339   - favoritos = favoritos,
340   - itens = itens
341   - )
342   - print(user_obj)
343   - id_doc = user_obj.create_user()
344   - print(id_doc)
345   -
346   - return Response(str(id_doc))
347   - else:
348   - return Response(str('não criou'))
  331 + document = doc['favoritos']
  332 + favoritos = [document]
  333 + itens = [doc['lista_orgao'], doc['cadastro_orgao'], doc['lista_user'], doc['cadastro_user'], doc['relatorios'], doc['coleta'], doc['notify']]
  334 + user_obj = User(
  335 + nome = doc['nome'],
  336 + matricula = doc['matricula'],
  337 + email = doc['email'],
  338 + orgao = doc['orgao'],
  339 + telefone = doc['telefone'],
  340 + cargo = doc['cargo'],
  341 + setor = doc['setor'],
  342 + permissao = doc['permissao'],
  343 + senha = doc['senha'],
  344 + favoritos = favoritos,
  345 + itens = itens
  346 + )
  347 + print(user_obj)
  348 + id_doc = user_obj.create_user()
  349 + print(id_doc)
  350 +
  351 + return Response(str(id_doc))
349 352  
350 353 @view_config(route_name='edituser', renderer='templates/editaruser.pt')
351 354 def edituser(request):
... ... @@ -456,24 +459,39 @@ def edit_favoritos(request):
456 459 """
457 460 Editar do Favoritos
458 461 """
459   - doc = request.params
460   - value = doc['value']
461   - matricula = doc['matricula']
462   - path = [doc['path']]
  462 + params = request.params
  463 + matricula = params['matricola']
463 464 user_obj = User(
464   - nome = 'asdasd',
465   - matricula = 'asdasd',
466   - email = 'asdsad',
467   - orgao = 'asdsad',
468   - telefone = 'sdasd',
469   - cargo = 'asdasdasd',
470   - setor = 'asdasd',
471   - permissao = 'asdasd',
472   - senha = 'sadasdasd',
473   - 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']
474 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 + }
475 492 search = user_obj.search_user(matricula)
476 493 id = search.results[0]._metadata.id_doc
477   - update= user_obj.create_favoritos(id, path, value)
  494 + doc = json.dumps(user)
  495 + edit = user_obj.edit_user(id, doc)
478 496  
479   - return Response(update)
  497 + return Response(edit)
... ...