perquenas correções no html

Adley
1 parent 38b1c333
Showing 5 changed files with 51 additions and 26 deletions Show diff stats
wscacicneo/security.py
wscacicneo/templates/cadastro_coleta.pt
wscacicneo/templates/master.pt
wscacicneo/templates/menu.pt
wscacicneo/utils/utils.py
 #!/usr/env python
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-asdasd
+
 # # 1. carregar usuário da sessão
 # # 2. carregar objeto usuário
 # # 3. pegar grupo do usuário
@@ -9,16 +10,16 @@ from wscacicneo.model.user import User
 def groupfinder(userid, request):
     user_obj = User(
-        nome = 'asdasd',
-        matricula = 'asdasd',
-        email = 'asdsad',
-        orgao = 'asdsad',
-        telefone = 'sdasd',
-        cargo = 'asdasdasd',
-        setor = 'asdasd',
-        permissao = 'asdasd',
-        senha = 'sadasdasd',
-        favoritos = ['asdasdasdasd']
+        nome = 'usuario',
+        matricula = '000000',
+        email = 'usuario@gov.br',
+        orgao = 'mpog',
+        telefone = '(11)1111-1111',
+        cargo = 'adm',
+        setor = 'ti',
+        permissao = 'Administrador',
+        senha = '123',
+        favoritos = ['favoritos']
     )
     usuario = user_obj.search_user_by_email(userid)
     permissao = usuario.results[0].permissao
@@ -9,6 +9,7 @@
       <label class="col-lg-2 control-label">Orgão:</label>
       <div class="col-lg-5">
         <select  id="orgao" class="form-control">
+          <option></option>
           <option tal:repeat="doc orgao_doc">${doc.nome}</option>
         </select>
       </div>
@@ -21,15 +22,16 @@
     </div>
     <br/>
     <div class="form-group">
-      <div style="margin-left: 200px;font-size: 150%;">Software List</div>
+      <div style="margin-left: 200px;font-size: 150%;">Lista de Softwares</div>
     </div>
     <div class="form-group">
-      <label class="col-lg-2 control-label">softwarelist:</label>
-      <div class="col-lg-5">
-        <input type="text" id="softwarelist" class="form-control" placeholder="softwarelist">
+      <label class="col-lg-2 control-label">Lista de Softwares:</label>
+      <button class="add_field_button">Add More Fields</button>
+      <div class="col-lg-5 input_fields_wrap">
+        <input type="text" id="softwarelist" class="form-control" placeholder="software">
       </div>
     </div>
-    
+
     <br/>
     <div class="form-group">
       <div style="margin-left: 200px;font-size: 150%;">Sistema Operacional</div>
@@ -54,7 +56,7 @@
       </div>
     </div>
     <div class="form-group"> 
-      <div style="margin-left: 200px;font-size: 150%;">win32_bios</div>
+      <div style="margin-left: 200px;font-size: 150%;">BIOS</div>
     </div>
       <div class="form-group">
       <label class="col-lg-2 control-label">win32_bios_manufacturer:</label>
@@ -64,7 +66,7 @@
     </div>
         <br/>
     <div class="form-group">
-      <div style="margin-left: 200px;font-size: 150%;">win32_processor</div>
+      <div style="margin-left: 200px;font-size: 150%;">Processador</div>
     </div>
     <div class="form-group">
       <label class="col-lg-2 control-label">win32_processor_manufacturer:</label>
@@ -94,11 +96,32 @@
         <button type="button" id="enviar" class="btn btn-sm" style="margin-left: 315px;" >Enviar</button>
         <button type="button" id="limpar" class="btn btn-sm">Limpar</button>
       </div>
+
+
 </form>
 	</metal:content>
   <metal:content fill-slot="javascript">
     <script type="text/javascript">
+      $(document).ready(function() {
+          var max_fields      = 10; //maximum input boxes allowed
+          var wrapper         = $(".input_fields_wrap"); //Fields wrapper
+          var add_button      = $(".add_field_button"); //Add button ID
+          
+          var x = 1; //initlal text box count
+          $(add_button).click(function(e){ //on add input button click
+              e.preventDefault();
+              if(x < max_fields){ //max input box allowed
+                  x++; //text box increment
+                  $(wrapper).append('<div><input type="text" id="softwarelist" class="form-control" placeholder="software"/><a href="#" class="remove_field">Remove</a></div>'); //add input box
+              }
+          });
+          
+          $(wrapper).on("click",".remove_field", function(e){ //user click on remove text
+              e.preventDefault(); $(this).parent('div').remove(); x--;
+          })
+      });
+
        $('#limpar').click(function(){
                 $('#data_coleta').val('')
                 $('#softwarelist').val('')
@@ -101,7 +101,7 @@
 							<i class="fa fa-home"></i>&nbsp;
 							</h2>
 							<h2 class="pull-left" id="dashlocation">
-								Você está em: ${request.path} 
+								${request.path} 
 							</h2>
@@ -133,8 +133,8 @@
 			<metal:content fill-slot="javascript">
 			<script type="text/javascript">
 				$( document ).ready(function() {
-	    			var string = $('#dashlocation').text().replace("/wscacicneo/", "");
-	    			$('#dashlocation').text(string);
+	    			var string = $('#dashlocation').text().split("/");
+	    			$('#dashlocation').text(string[2]);
 				});
 		</script>
 		<metal:content define-slot="javascript"/>
@@ -9,16 +9,17 @@
             </li>
           <li class="has_sub" >
             <a href="#"><i class="fa fa-file-o"></i> Orgão <span class="pull-right"><i class="fa fa-chevron-right"></i></span></a>
-            <ul
->              <li><a href="${request.route_url('root')}orgao/cadastro">Cadastrar Orgão</a></li>
-              <li><a href="${request.route_url('root')}orgao/lista">Listar Orgãos</a></li>
+            <ul>
               <li><a href="${request.route_url('root')}notificacoes/lista">Notificações</a></li>
+              <li><a href="${request.route_url('root')}orgao/lista">Listar Orgãos</a></li>
+              <li><a href="${request.route_url('root')}coleta/cadastro">Cadastrar Coleta</a></li>
+              <li><a href="${request.route_url('root')}orgao/cadastro">Cadastrar Orgão</a></li>
             </ul>
           <li class="has_sub">
             <a href="#"><i class="fa fa-file-o"></i> Usuário <span class="pull-right"><i class="fa fa-chevron-right"></i></span></a>
             <ul>
-              <li><a href="${request.route_url('root')}usuario/cadastro">Cadastrar Usuário</a></li>
               <li><a href="${request.route_url('root')}usuario/lista">Listar Usuários</a></li>
+              <li><a href="${request.route_url('root')}usuario/cadastro">Cadastrar Usuário</a></li>
             </ul>
           </li>
     </ul>
@@ -31,5 +31,5 @@ class Utils:
     # Retorna um hex de um objeto hash, com uma senha encryptada
     def hash_password(password):
-        hash_object = hashlib.md5(password.encode())
+        hash_object = hashlib.md5(password.encode("utf-8"))
         return hash_object.hexdigest()
	@@ -31,5 +31,5 @@ class Utils:		@@ -31,5 +31,5 @@ class Utils:
31		31
32	# Retorna um hex de um objeto hash, com uma senha encryptada	32	# Retorna um hex de um objeto hash, com uma senha encryptada
33	def hash_password(password):	33	def hash_password(password):
34	- hash_object = hashlib.md5(password.encode())	34	+ hash_object = hashlib.md5(password.encode("utf-8"))
35	return hash_object.hexdigest()	35	return hash_object.hexdigest()