From 849b3f749b83c0a23f3b082598bfe5927a48a7fb Mon Sep 17 00:00:00 2001
From: Caroline Salib <carolinesalibc@gmail.com>
Date: Sat, 29 Apr 2017 05:57:52 -0300
Subject: [PATCH] Ajustado erro ao cadastrar funcionario; portabilis/ieducar#167

---
 ieducar/convert.sh                                     | 4 ----
 ieducar/intranet/funcionario_lst.php                   | 2 +-
 ieducar/intranet/include/pessoa/clsFuncionario.inc.php | 6 +++---
 3 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 ieducar/convert.sh

diff --git a/ieducar/convert.sh b/ieducar/convert.sh
deleted file mode 100644
index d4398c9..0000000
--- a/ieducar/convert.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-for file in *.php; do
-   echo "Processing $file file..."
-   iconv -f iso-8859-1 -t utf-8 "$file" -o "$file"
-done
diff --git a/ieducar/intranet/funcionario_lst.php b/ieducar/intranet/funcionario_lst.php
index 2599ece..898256b 100755
--- a/ieducar/intranet/funcionario_lst.php
+++ b/ieducar/intranet/funcionario_lst.php
@@ -56,7 +56,7 @@ class indice extends clsListagem
 		$iniciolimit = ( $_GET["pagina_{$this->nome}"] ) ? $_GET["pagina_{$this->nome}"]*$limite-$limite: 0;
 
 		$obj_func = new clsFuncionario();
-		$obj_func->setOrderby("to_ascii(nome) ASC");
+		$obj_func->setOrderby("nome ASC");
 		$obj_func->setLimite($limite, $iniciolimit);
 		$lst_func = $obj_func->lista($_GET["matricula"], $_GET['nm_pessoa']);
 
diff --git a/ieducar/intranet/include/pessoa/clsFuncionario.inc.php b/ieducar/intranet/include/pessoa/clsFuncionario.inc.php
index be080c9..996c8f7 100755
--- a/ieducar/intranet/include/pessoa/clsFuncionario.inc.php
+++ b/ieducar/intranet/include/pessoa/clsFuncionario.inc.php
@@ -27,7 +27,7 @@
 require_once ("include/clsBanco.inc.php");
 require_once ("include/Geral.inc.php");
 
-class clsFuncionario extends clsPessoaFisica 
+class clsFuncionario extends clsPessoaFisica
 {
 	var $idpes;
 	var $matricula;
@@ -223,7 +223,7 @@ class clsFuncionario extends clsPessoaFisica
 
 		if($int_inicio_limit !== false  && $int_qtd_registros !== false)
 		{
-			$sql .= "{$filtros}"." ORDER BY to_ascii(f.nome) ASC ".$limite;
+			$sql .= "{$filtros}"." ORDER BY f.nome ASC ".$limite;
 		}
 		else
 		{
@@ -231,7 +231,7 @@ class clsFuncionario extends clsPessoaFisica
 		}
 
 		$this->_total = $db->CampoUnico( "SELECT COUNT(0) FROM {$this->schema_portal}.v_funcionario f {$filtros}" );
-		
+
 		$db->Consulta( $sql );
 
 		if( $countCampos > 1 )
--
libgit2 0.21.2