Download as
Browse Code »

Commit a386d0ec80724bebae763b02ce6280b9bb1e40c0

Authored by Lucas Schmoeller da Silva
1 parent ad64726c
Exists in master

Alterado ordenação de listagens de aluno no sistema 

portabilis/ieducar#115
Showing 5 changed files with 5 additions and 5 deletions   Show diff stats
ieducar/intranet/educar_matriculas_turma_cad.php
  Diff comments   View file @a386d0e
... ... @@ -205,7 +205,7 @@ class indice extends clsCadastro
205 205  
206 206 if (is_numeric($this->ref_cod_turma) && !$_POST) {
207 207 $obj_matriculas_turma = new clsPmieducarMatriculaTurma();
208   - $obj_matriculas_turma->setOrderby('nome_aluno');
  208 + $obj_matriculas_turma->setOrderby('sequencial_fechamento, nome_aluno');
209 209 $lst_matriculas_turma = $obj_matriculas_turma->lista(NULL, $this->ref_cod_turma,
210 210 NULL, NULL, NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL,
211 211 array(1, 2, 3), NULL, NULL, $ano_letivo, NULL, TRUE, NULL, 1, TRUE);
... ...
ieducar/intranet/include/pmieducar/clsPmieducarMatricula.inc.php
  Diff comments   View file @a386d0e
... ... @@ -599,7 +599,7 @@ class clsPmieducarMatricula
599 599 ) as data_nasc";
600 600 }
601 601  
602   - $sql = "SELECT {$this->_campos_lista}, c.ref_cod_instituicao, p.nome, a.cod_aluno, a.ref_idpes, c.cod_curso, m.observacao FROM {$this->_tabela} m, {$this->_schema}curso c, {$this->_schema}aluno a, cadastro.pessoa p ";
  602 + $sql = "SELECT {$this->_campos_lista}, c.ref_cod_instituicao, p.nome, a.cod_aluno, a.ref_idpes, c.cod_curso, m.observacao, (SELECT sequencial_fechamento FROM pmieducar.matricula_turma WHERE ref_cod_matricula = cod_matricula AND ativo = 1 LIMIT 1) as sequencial_fechamento FROM {$this->_tabela} m, {$this->_schema}curso c, {$this->_schema}aluno a, cadastro.pessoa p ";
603 603  
604 604 $whereAnd = " AND ";
605 605 $filtros = " WHERE m.ref_cod_aluno = a.cod_aluno AND a.ativo = 1 AND m.ref_cod_curso = c.cod_curso AND p.idpes = a.ref_idpes ";
... ...
ieducar/modules/Avaliacao/Views/DiarioApiController.php
  Diff comments   View file @a386d0e
... ... @@ -536,7 +536,7 @@ class DiarioApiController extends ApiCoreController
536 536  
537 537 if ($this->canGetMatriculas()) {
538 538 $alunos = new clsPmieducarMatriculaTurma();
539   - $alunos->setOrderby("translate(pessoa.nome,'".Portabilis_String_Utils::toLatin1(åáàãâäéèêëíìîïóòõôöúùüûçÿýñÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ)."', '".Portabilis_String_Utils::toLatin1(aaaaaaeeeeiiiiooooouuuucyynAAAAAAEEEEIIIIOOOOOUUUUCYN)."')");
  539 + $alunos->setOrderby("sequencial_fechamento , translate(pessoa.nome,'".Portabilis_String_Utils::toLatin1(åáàãâäéèêëíìîïóòõôöúùüûçÿýñÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ)."', '".Portabilis_String_Utils::toLatin1(aaaaaaeeeeiiiiooooouuuucyynAAAAAAEEEEIIIIOOOOOUUUUCYN)."')");
540 540  
541 541 $alunos = $alunos->lista(
542 542 $this->getRequest()->matricula_id,
... ...
ieducar/modules/DynamicInput/Views/MatriculaController.php
  Diff comments   View file @a386d0e
... ... @@ -57,7 +57,7 @@ class MatriculaController extends ApiCoreController
57 57 protected function getMatriculas() {
58 58 if ($this->canGetMatriculas()) {
59 59 $matriculas = new clsPmieducarMatricula();
60   - $matriculas->setOrderby(" translate(nome,'".Portabilis_String_Utils::toLatin1(åáàãâäéèêëíìîïóòõôöúùüûçÿýñÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ)."', '".Portabilis_String_Utils::toLatin1(aaaaaaeeeeiiiiooooouuuucyynAAAAAAEEEEIIIIOOOOOUUUUCYN)."') ");
  60 + $matriculas->setOrderby("sequencial_fechamento , translate(nome,'".Portabilis_String_Utils::toLatin1(åáàãâäéèêëíìîïóòõôöúùüûçÿýñÅÁÀÃÂÄÉÈÊËÍÌÎÏÓÒÕÔÖÚÙÛÜÇÝÑ)."', '".Portabilis_String_Utils::toLatin1(aaaaaaeeeeiiiiooooouuuucyynAAAAAAEEEEIIIIOOOOOUUUUCYN)."') ");
61 61 $matriculas = $matriculas->lista(NULL,
62 62 NULL,
63 63 $this->getRequest()->escola_id,
... ...
ieducar/modules/HistoricoEscolar/Views/ProcessamentoApiController.php
  Diff comments   View file @a386d0e
... ... @@ -808,7 +808,7 @@ class ProcessamentoApiController extends Core_Controller_Page_EditController
808 808  
809 809  
810 810 $alunos = new clsPmieducarMatriculaTurma();
811   - $alunos->setOrderby('ref_cod_curso, ref_ref_cod_serie, ref_cod_turma, nome');
  811 + $alunos->setOrderby('ref_cod_curso, ref_ref_cod_serie, ref_cod_turma, sequencial_fechamento, nome');
812 812  
813 813 $alunos = $alunos->lista(
814 814 $this->getRequest()->matricula_id,
... ...