Download as
Browse Code »

Commit 13fe3fb7f94709ee7d089e0dfb730483cd6343f0

Authored by Adley
1 parent 7cfb1598
Exists in master

atualização do template e da views, referente aos formularios de cadastro manual

Showing 2 changed files with 54 additions and 39 deletions   Show diff stats
wscacicneo/templates/cadastro_coleta.pt
  Diff comments   View file @13fe3fb
1 1 <metal:main use-macro="load: master.pt">
2 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 3 <form role="form" class="form-horizontal" id="coleta_manual">
13   - <div class="tab-content">
14   - <div id="hd" class="tab-pane active">
15 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 31 <div class="form-group">
18 32 <label class="col-lg-2 control-label">Marca do HD:</label>
19 33 <div class="col-lg-5">
... ... @@ -38,11 +52,10 @@
38 52 <input type="text" id="idade_hd" class="form-control" placeholder="Idade do HD">
39 53 </div>
40 54 </div>
41   -
42   - </div>
43   - <div id="so" class="tab-pane">
44 55 <br/>
45   -
  56 + <div class="form-group">
  57 + <div style="margin-left: 200px;font-size: 150%;">Sistema Operacional</div>
  58 + </div>
46 59 <div class="form-group">
47 60 <label class="col-lg-2 control-label">Nome do SO:</label>
48 61 <div class="col-lg-5">
... ... @@ -61,13 +74,9 @@
61 74 <input type="text" id="fabricante_so" class="form-control" placeholder="Fabricante do Sistema Operacional">
62 75 </div>
63 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 80 <div class="form-group">
72 81 <label class="col-lg-2 control-label">Patrimonio da BIOS:</label>
73 82 <div class="col-lg-5">
... ... @@ -80,12 +89,11 @@
80 89 <input type="text" id="fabricante_bios" class="form-control" placeholder="Fabricante da BIOS">
81 90 </div>
82 91 </div>
83   -
84   - </div>
85   - <div id="memoria" class="tab-pane">
86 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 97 <label class="col-lg-2 control-label">Interface da Memória:</label>
90 98 <div class="col-lg-5">
91 99 <input type="text" id="interface_memoria" class="form-control" placeholder="Interface da Memória">
... ... @@ -103,12 +111,11 @@
103 111 <input type="text" id="idade_memoria" class="form-control" placeholder="Idade da Memória">
104 112 </div>
105 113 </div>
106   -
107   - </div>
108   - <div id="processador" class="tab-pane">
109 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 119 <label class="col-lg-2 control-label">Nome do Processador:</label>
113 120 <div class="col-lg-5">
114 121 <input type="text" id="nome_processador" class="form-control" placeholder="Nome do Processador">
... ... @@ -126,16 +133,13 @@
126 133 <input type="text" id="nome_processador" class="form-control" placeholder="Data de Instalação do Processador">
127 134 </div>
128 135 </div>
129   -
  136 + <br/>
  137 +
130 138 <div class="form-group">
131 139 <div class="col-lg-offset-2 col-lg-6">
132 140 <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
133 141 <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
134 142 </div>
135   - </div>
136   -
137   - </div>
138   -
139 143 </form>
140 144  
141 145 </metal:content>
... ...
wscacicneo/views.py
  Diff comments   View file @13fe3fb
... ... @@ -565,4 +565,15 @@ def post_notify(request):
565 565  
566 566 @view_config(route_name='cadastro_coleta', renderer='templates/cadastro_coleta.pt')
567 567 def cadastro_coleta(request):
568   - return {'project': 'WSCacicNeo'}
  568 + orgao_obj = Orgao(
  569 + nome = 'sahuds',
  570 + cargo = 'cargo',
  571 + coleta = '4h',
  572 + sigla = 'MPOG',
  573 + endereco = 'Esplanada bloco C',
  574 + email = 'admin@planemaneto.gov.br',
  575 + telefone = '(61) 2025-4117',
  576 + url = 'http://api.brlight.net/api'
  577 + )
  578 + search = orgao_obj.search_list_orgaos()
  579 + return {'orgao_doc': search.results}
569 580 \ No newline at end of file
... ...