diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarMatricula.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarMatricula.inc.php index 315c171..a0d2585 100644 --- a/ieducar/intranet/include/pmieducar/clsPmieducarMatricula.inc.php +++ b/ieducar/intranet/include/pmieducar/clsPmieducarMatricula.inc.php @@ -570,7 +570,7 @@ class clsPmieducarMatricula $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 "; $whereAnd = " AND "; - $filtros = " WHERE m.ref_cod_aluno = a.cod_aluno AND m.ref_cod_curso = c.cod_curso AND p.idpes = a.ref_idpes "; + $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 "; if (is_numeric($int_cod_matricula)) { $filtros .= "{$whereAnd} m.cod_matricula = '{$int_cod_matricula}'"; diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarMatriculaTurma.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarMatriculaTurma.inc.php index 4490a24..50babdb 100644 --- a/ieducar/intranet/include/pmieducar/clsPmieducarMatriculaTurma.inc.php +++ b/ieducar/intranet/include/pmieducar/clsPmieducarMatriculaTurma.inc.php @@ -367,7 +367,7 @@ class clsPmieducarMatriculaTurma ) as nome_aluno"; $tab_aluno = ", {$this->_schema}aluno a"; - $where_nm_aluno = " AND a.cod_aluno = m.ref_cod_aluno "; + $where_nm_aluno = " AND a.cod_aluno = m.ref_cod_aluno AND a.ativo=1"; } if ( $bool_escola_andamento) { diff --git a/ieducar/modules/Avaliacao/Views/DiarioApiController.php b/ieducar/modules/Avaliacao/Views/DiarioApiController.php index 6c26275..47f117f 100644 --- a/ieducar/modules/Avaliacao/Views/DiarioApiController.php +++ b/ieducar/modules/Avaliacao/Views/DiarioApiController.php @@ -552,7 +552,7 @@ class DiarioApiController extends ApiCoreController $this->getRequest()->instituicao_id, $this->getRequest()->aluno_id, NULL, - NULL, + 3, NULL, NULL, $this->getRequest()->ano, -- libgit2 0.21.2