Download as
Browse Code »

Commit 0cd8a03ada3720dd24578e7ef97f2f6b611a9825

Authored by Macieski
1 parent ff896734
Exists in master

add campo favoritos user

Showing 5 changed files with 31 additions and 19 deletions   Show diff stats
wscacicneo/__init__.py
  Diff comments   View file @0cd8a03
... ... @@ -51,7 +51,7 @@ def main(global_config, **settings):
51 51 config.add_route('post_user', 'post_user')
52 52 config.add_route('put_user', 'put_user')
53 53 config.add_route('edituser', 'editar/user/{matricula}')
54   - config.add_route('favoritos', 'editar/favoritos')
  54 + config.add_route('favoritos', 'editar/favoritos/{matricula}')
55 55 #
56 56 config.add_route('list', 'list')
57 57 config.add_route('gestao', 'gestao')
... ...
wscacicneo/templates/editarorgao.pt
  Diff comments   View file @0cd8a03
... ... @@ -3,11 +3,11 @@
3 3 <div class="padd">
4 4 <br />
5 5 <!-- Form starts. -->
6   - <form class="form-horizontal" role="form">
  6 + <form class="form-horizontal" id='form_orgaos' role="form">
7 7 <div class="form-group">
8 8 <label class="col-lg-2 control-label">Nome do Órgão</label>
9 9 <div class="col-lg-5">
10   - <input type="text" id="nome" class="form-control" value="${nome}" placeholder="Nome do Órgão">
  10 + <input type="text" name='nome' id="nome" class="form-control" value="${nome}" placeholder="Nome do Órgão">
11 11 </div>
12 12 </div>
13 13 <div class="form-group">
... ...
wscacicneo/templates/favoritos.pt
  Diff comments   View file @0cd8a03
... ... @@ -14,13 +14,13 @@
14 14 <!-- Visitors, pageview, bounce rate, etc., Sparklines plugin used -->
15 15 <ul id='favoritos-off' class="current-status">
16 16 <li class='cadastro-o'>
17   - <span>Cadastro Órgãos</span>
  17 + <span id='cadastroorgao'>Cadastro Órgãos</span>
18 18 </li>
19   - <span id="Lista Órgãos">Lista Órgãos</span>
  19 + <span id="listaorgaos">Lista Órgãos</span>
20 20 <li>
21   - <span id='Cadastro Usuario'>Cadastro Usuarios</span>
  21 + <span id='cadastrousuario'>Cadastro Usuarios</span>
22 22 </li>
23   - <span class='lista-u'>Lista de Usuarios</span>
  23 + <span class='listausuario'>Lista de Usuarios</span>
24 24 <li>
25 25 <span class='relatorios'>Relatorios</span>
26 26 </li>
... ... @@ -28,7 +28,7 @@
28 28 <li>
29 29 <span class='coleta'>Questionar Coleta</span>
30 30 </li>
31   - <span class='notify'>Notificações da Coleta</span>
  31 + <span class='notify'></span>
32 32 </ul>
33 33 </div>
34 34 </div>
... ... @@ -56,14 +56,6 @@
56 56 <metal:content fill-slot="javascript">
57 57 <script type="text/javascript">
58 58 $('span').click(function(){
59   - li = $(this).parent()
60   - ul = $(li).parent()
61   - id_ul = $(ul).attr('id')
62   - console.log(id_ul)
63   - id = $(this).html()
64   - li = "<li><span>"+id+"</span></li>"
65   - $('#favoritos-on').append(li)
66   -
67 59 });
68 60 </script>
69 61 </metal:content>
... ...
wscacicneo/templates/user.pt
  Diff comments   View file @0cd8a03
... ... @@ -102,6 +102,7 @@
102 102 'setor' : $('#setor').val(),
103 103 'permissao' : $('#permissao').val(),
104 104 'senha' : $('#senha').val(),
  105 + 'favoritos': 'Relatórios'
105 106 }
106 107 if (data.email.indexOf("gov.br") > -1 == false){
107 108 setTimeout(function() {noty({text: 'O e-mail tem que ser institucional',layout:'topRight',type:'error',timeout:5000});}, 100);
... ...
wscacicneo/views.py
  Diff comments   View file @0cd8a03
... ... @@ -104,7 +104,22 @@ def listorgao(request):
104 104  
105 105 @view_config(route_name='favoritos', renderer='templates/favoritos.pt')
106 106 def favoritos(request):
107   - return {'project': 'WSCacicNeo'}
  107 + matricula = request.matchdict['matricula']
  108 + user_obj = User(
  109 + nome = 'base',
  110 + matricula = matricula,
  111 + email = 'base@gov.br',
  112 + orgao = 'orgao',
  113 + telefone = 'telefone',
  114 + cargo = 'cargo',
  115 + setor = 'setor',
  116 + permissao = 'Gestor',
  117 + favoritos = ['asdsadasd', 'asdasdasd'],
  118 + senha = 'senha'
  119 + )
  120 + search = user_obj.search_user(matricula)
  121 + print(search.results[0])
  122 + return { }
108 123  
109 124 @view_config(route_name='config', renderer='templates/config.pt')
110 125 def config(request):
... ... @@ -301,6 +316,9 @@ def post_user(request):
301 316 rest_url = REST_URL
302 317 userbase = UserBase().lbbase
303 318 doc = request.params
  319 + document = doc['favoritos']
  320 + favoritos = [document]
  321 + print(type(favoritos))
304 322 user_obj = User(
305 323 nome = doc['nome'],
306 324 matricula = doc['matricula'],
... ... @@ -310,9 +328,10 @@ def post_user(request):
310 328 cargo = doc['cargo'],
311 329 setor = doc['setor'],
312 330 permissao = doc['permissao'],
313   - senha = doc['senha']
  331 + senha = doc['senha'],
  332 + favoritos = favoritos
314 333 )
315   -
  334 + print(user_obj)
316 335 id_doc = user_obj.create_user()
317 336 print(id_doc)
318 337  
... ...