Download as
Browse Code »

Commit ee3558b5f02d3fb6fcdded51d789aa0941db2f81

Authored by Macieski
2 parents 5e4fe74b d27f6537
Exists in master

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

Showing 3 changed files with 68 additions and 39 deletions   Show diff stats
wscacicneo/model/coleta_manual.py
  Diff comments   View file @ee3558b
@@ -35,6 +35,19 @@ class ColetaManualBase(): @@ -35,6 +35,19 @@ class ColetaManualBase():
35 35
36 @property 36 @property
37 def lbbase(self): 37 def lbbase(self):
  38 +
  39 + """
  40 + COnfiguração da Coleta
  41 + """
  42 + data_coleta = Field(**dict(
  43 + name='data_coleta',
  44 + description='Data da Coleta',
  45 + alias='data_coleta',
  46 + datatype='Text',
  47 + indices=['Textual'],
  48 + multivalued=False,
  49 + required=True
  50 + ))
38 """ 51 """
39 LB Processadores 52 LB Processadores
40 """ 53 """
@@ -297,6 +310,7 @@ class ColetaManualBase(): @@ -297,6 +310,7 @@ class ColetaManualBase():
297 ) 310 )
298 311
299 content_list = Content() 312 content_list = Content()
  313 + content_list.append(data_coleta)
300 content_list.append(processador) 314 content_list.append(processador)
301 content_list.append(hd) 315 content_list.append(hd)
302 content_list.append(bios) 316 content_list.append(bios)
wscacicneo/templates/cadastro_coleta.pt
  Diff comments   View file @ee3558b
1 <metal:main use-macro="load: master.pt"> 1 <metal:main use-macro="load: master.pt">
2 <metal:content fill-slot="conteudo"> 2 <metal:content fill-slot="conteudo">
3 - <ul class="nav nav-tabs">  
4 - <li class="active">  
5 - <a href="#hd" data-toggle="tab">HD</a>  
6 - </li>  
7 - <li><a href="#so" data-toggle="tab">Sistema Operacional</a></li>  
8 - <li><a href="#bios" data-toggle="tab">Bios</a></li>  
9 - <li><a href="#memoria" data-toggle="tab">Memória</a></li>  
10 - <li><a href="#processador" data-toggle="tab">Processador</a></li>  
11 -</ul>  
12 <form role="form" class="form-horizontal" id="coleta_manual"> 3 <form role="form" class="form-horizontal" id="coleta_manual">
13 - <div class="tab-content">  
14 - <div id="hd" class="tab-pane active">  
15 <br/> 4 <br/>
16 - 5 + <div class="form-group">
  6 + <div style="margin-left: 200px;font-size: 150%;">Configuração</div>
  7 + </div>
  8 + <div class="form-group">
  9 + <label class="col-lg-2 control-label">Orgão:</label>
  10 + <div class="col-lg-5">
  11 + <select id="orgao" class="form-control">
  12 + <option tal:repeat="doc orgao_doc">${doc.nome}</option>
  13 + </select>
  14 + </div>
  15 + </div>
  16 + <div class="form-group">
  17 + <label class="col-lg-2 control-label">Data da Coleta:</label>
  18 + <div class="col-lg-5">
  19 + <div id="datetimepicker1" class="input-append input-group dtpicker">
  20 + <input data-format="dd-MM-yyyy" type="text" class="form-control">
  21 + <span class="input-group-addon add-on">
  22 + <i data-time-icon="fa fa-times" data-date-icon="fa fa-calendar"></i>
  23 + </span>
  24 + </div>
  25 + </div>
  26 + </div>
  27 + <br/>
  28 + <div class="form-group">
  29 + <div style="margin-left: 200px;font-size: 150%;">Hard Disk</div>
  30 + </div>
17 <div class="form-group"> 31 <div class="form-group">
18 <label class="col-lg-2 control-label">Marca do HD:</label> 32 <label class="col-lg-2 control-label">Marca do HD:</label>
19 <div class="col-lg-5"> 33 <div class="col-lg-5">
@@ -38,11 +52,10 @@ @@ -38,11 +52,10 @@
38 <input type="text" id="idade_hd" class="form-control" placeholder="Idade do HD"> 52 <input type="text" id="idade_hd" class="form-control" placeholder="Idade do HD">
39 </div> 53 </div>
40 </div> 54 </div>
41 -  
42 - </div>  
43 - <div id="so" class="tab-pane">  
44 <br/> 55 <br/>
45 - 56 + <div class="form-group">
  57 + <div style="margin-left: 200px;font-size: 150%;">Sistema Operacional</div>
  58 + </div>
46 <div class="form-group"> 59 <div class="form-group">
47 <label class="col-lg-2 control-label">Nome do SO:</label> 60 <label class="col-lg-2 control-label">Nome do SO:</label>
48 <div class="col-lg-5"> 61 <div class="col-lg-5">
@@ -61,13 +74,9 @@ @@ -61,13 +74,9 @@
61 <input type="text" id="fabricante_so" class="form-control" placeholder="Fabricante do Sistema Operacional"> 74 <input type="text" id="fabricante_so" class="form-control" placeholder="Fabricante do Sistema Operacional">
62 </div> 75 </div>
63 </div> 76 </div>
64 -  
65 -  
66 -  
67 - </div>  
68 - <div id="bios" class="tab-pane">  
69 - <br/>  
70 - 77 + <div class="form-group">
  78 + <div style="margin-left: 200px;font-size: 150%;">BIOS</div>
  79 + </div>
71 <div class="form-group"> 80 <div class="form-group">
72 <label class="col-lg-2 control-label">Patrimonio da BIOS:</label> 81 <label class="col-lg-2 control-label">Patrimonio da BIOS:</label>
73 <div class="col-lg-5"> 82 <div class="col-lg-5">
@@ -80,12 +89,11 @@ @@ -80,12 +89,11 @@
80 <input type="text" id="fabricante_bios" class="form-control" placeholder="Fabricante da BIOS"> 89 <input type="text" id="fabricante_bios" class="form-control" placeholder="Fabricante da BIOS">
81 </div> 90 </div>
82 </div> 91 </div>
83 -  
84 - </div>  
85 - <div id="memoria" class="tab-pane">  
86 <br/> 92 <br/>
87 -  
88 - <div class="form-group"> 93 + <div class="form-group">
  94 + <div style="margin-left: 200px;font-size: 150%;">Memória</div>
  95 + </div>
  96 + <div class="form-group">
89 <label class="col-lg-2 control-label">Interface da Memória:</label> 97 <label class="col-lg-2 control-label">Interface da Memória:</label>
90 <div class="col-lg-5"> 98 <div class="col-lg-5">
91 <input type="text" id="interface_memoria" class="form-control" placeholder="Interface da Memória"> 99 <input type="text" id="interface_memoria" class="form-control" placeholder="Interface da Memória">
@@ -103,12 +111,11 @@ @@ -103,12 +111,11 @@
103 <input type="text" id="idade_memoria" class="form-control" placeholder="Idade da Memória"> 111 <input type="text" id="idade_memoria" class="form-control" placeholder="Idade da Memória">
104 </div> 112 </div>
105 </div> 113 </div>
106 -  
107 - </div>  
108 - <div id="processador" class="tab-pane">  
109 <br/> 114 <br/>
110 -  
111 - <div class="form-group"> 115 + <div class="form-group">
  116 + <div style="margin-left: 200px;font-size: 150%;">Processador</div>
  117 + </div>
  118 + <div class="form-group">
112 <label class="col-lg-2 control-label">Nome do Processador:</label> 119 <label class="col-lg-2 control-label">Nome do Processador:</label>
113 <div class="col-lg-5"> 120 <div class="col-lg-5">
114 <input type="text" id="nome_processador" class="form-control" placeholder="Nome do Processador"> 121 <input type="text" id="nome_processador" class="form-control" placeholder="Nome do Processador">
@@ -126,16 +133,13 @@ @@ -126,16 +133,13 @@
126 <input type="text" id="nome_processador" class="form-control" placeholder="Data de Instalação do Processador"> 133 <input type="text" id="nome_processador" class="form-control" placeholder="Data de Instalação do Processador">
127 </div> 134 </div>
128 </div> 135 </div>
129 - 136 + <br/>
  137 +
130 <div class="form-group"> 138 <div class="form-group">
131 <div class="col-lg-offset-2 col-lg-6"> 139 <div class="col-lg-offset-2 col-lg-6">
132 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button> 140 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
133 <button type="button" id="limpar" class="btn btn-sm">Limpar</button> 141 <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
134 </div> 142 </div>
135 - </div>  
136 -  
137 - </div>  
138 -  
139 </form> 143 </form>
140 144
141 </metal:content> 145 </metal:content>
wscacicneo/views.py
  Diff comments   View file @ee3558b
@@ -569,4 +569,15 @@ def post_notify(request): @@ -569,4 +569,15 @@ def post_notify(request):
569 569
570 @view_config(route_name='cadastro_coleta', renderer='templates/cadastro_coleta.pt') 570 @view_config(route_name='cadastro_coleta', renderer='templates/cadastro_coleta.pt')
571 def cadastro_coleta(request): 571 def cadastro_coleta(request):
572 - return {'project': 'WSCacicNeo'} 572 + orgao_obj = Orgao(
  573 + nome = 'sahuds',
  574 + cargo = 'cargo',
  575 + coleta = '4h',
  576 + sigla = 'MPOG',
  577 + endereco = 'Esplanada bloco C',
  578 + email = 'admin@planemaneto.gov.br',
  579 + telefone = '(61) 2025-4117',
  580 + url = 'http://api.brlight.net/api'
  581 + )
  582 + search = orgao_obj.search_list_orgaos()
  583 + return {'orgao_doc': search.results}