From 1a8b79229488651701ce8d8dc98c38c9ae9b00f2 Mon Sep 17 00:00:00 2001 From: Leandro Ramos Date: Tue, 10 Feb 2026 11:13:20 -0300 Subject: [PATCH 1/4] Adiciona .gitignore --- .gitignore | 52 +++++++++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 6a85cf76..e917a466 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,35 @@ -/vendor/ -*~ -*.swp -src/replicado_queries -composer.lock -.phpunit.result.cache - -.idea - -# index.php used for test -index.php +/node_modules +/public/hot +/public/storage +/storage/*.key +/vendor +/.idea +/.vscode +/.vagrant +Homestead.json +Homestead.yaml +npm-debug.log +yarn-error.log .env +/public/vendor/ -# test -test.php -log.log -credentials.php +# pasta onde guardo coisas que ando testando +/teste/ -# netbeans -nbproject/ +# init lando +.lando.yml +# lando dockerfile php extensions +Dockerfile.custom +# lando php.ini +php.ini -# phpdoc -docs/phpdoc-cache* - -sandbox/ +# vim bkp +*~ +*.swp -test*.php +# Curso graduação x Habilitação x Setor +/storage/curhabset.json -/docs/ +# DDEV +/.ddev +core.* From a23854df226f672f3115e4de66f266bad85e8ada Mon Sep 17 00:00:00 2001 From: Leandro Ramos Date: Tue, 10 Feb 2026 16:16:51 -0300 Subject: [PATCH 2/4] Aceita mais de um :codundclg em obterCursosHabilitacoes --- src/Graduacao.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Graduacao.php b/src/Graduacao.php index c58d4cf1..2ea901c8 100644 --- a/src/Graduacao.php +++ b/src/Graduacao.php @@ -21,7 +21,6 @@ public static function verifica($codpes, $codundclgi) ) { return true; } - } } return false; @@ -176,15 +175,15 @@ public static function nomeHabilitacao($codhab, $codcur) return $result; } - public static function obterCursosHabilitacoes($codundclgi) + public static function obterCursosHabilitacoes($codundclg) { $query = " SELECT CURSOGR.*, HABILITACAOGR.* FROM CURSOGR, HABILITACAOGR"; - $query .= " WHERE (CURSOGR.codclg = convert(int, :codundclgi)) AND (CURSOGR.codcur = HABILITACAOGR.codcur)"; + $query .= " WHERE (CURSOGR.codclg IN (:codundclgi)) AND (CURSOGR.codcur = HABILITACAOGR.codcur)"; $query .= " AND ( (CURSOGR.dtaatvcur IS NOT NULL) AND (CURSOGR.dtadtvcur IS NULL) )"; $query .= " AND ( (HABILITACAOGR.dtaatvhab IS NOT NULL) AND (HABILITACAOGR.dtadtvhab IS NULL) )"; $query .= " ORDER BY CURSOGR.nomcur, HABILITACAOGR.nomhab ASC"; $param = [ - 'codundclgi' => $codundclgi, + 'codundclg' => $codundclg, ]; return DB::fetchAll($query, $param); } @@ -772,7 +771,8 @@ public static function listarDisciplinasAlunoAnoSemestre(int $codpes, int $anoSe * @return Array * @author Kawan Santana, em 19/03/2024 */ - public static function listarDepartamentosDeEnsino(){ + public static function listarDepartamentosDeEnsino() + { $query = DB::getQuery('Graduacao.listarDepartamentosDeEnsino.sql'); return DB::fetchAll($query); } From 668ef84a5795b6baa83bb7816d551021c83f805c Mon Sep 17 00:00:00 2001 From: Leandro Ramos Date: Tue, 10 Feb 2026 16:59:47 -0300 Subject: [PATCH 3/4] =?UTF-8?q?Corrige=20indenta=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pessoa.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Pessoa.php b/src/Pessoa.php index 6db8ce6f..d23c0bcc 100644 --- a/src/Pessoa.php +++ b/src/Pessoa.php @@ -104,7 +104,6 @@ public static function email($codpes) if (trim($row['stamtr']) == 'S') { return $row['codema']; } - } return false; } From 11e9cf31e878ee36c0c708fa5af36ff4bf44750b Mon Sep 17 00:00:00 2001 From: Leandro Ramos Date: Thu, 12 Feb 2026 15:23:16 -0300 Subject: [PATCH 4/4] =?UTF-8?q?Adiciona=20m=C3=A9todo=20obterSetorAluno?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Graduacao.php | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/Graduacao.php b/src/Graduacao.php index 2ea901c8..96545208 100644 --- a/src/Graduacao.php +++ b/src/Graduacao.php @@ -372,6 +372,39 @@ public static function disciplinasEquivalentesCurriculo($codcur, $codhab) return DB::fetchAll($query, $param); } + /** + * Retorna o setor de um aluno + * É igual ao método setorAluno, mas chama o método obterCursoAtivo, que permite mais de um codundclg + * + * @param Int $codpes + * @param $codundclg + * @return Array(nomabvset) + */ + public static function obterSetorAluno($codpes, $codundclg) + { + + $codundclg = $codundclg ?: getenv('REPLICADO_CODUNDCLGS'); + $codundclg = $codundclg ?: getenv('REPLICADO_CODUNDCLG'); + + $codcur = self::obterCursoAtivo($codpes)['codcur']; + $codhab = self::obterCursoAtivo($codpes)['codhab']; + $query = " SELECT TOP 1 L.nomabvset FROM CURSOGRCOORDENADOR AS C + INNER JOIN LOCALIZAPESSOA AS L ON C.codpesdct = L.codpes + WHERE C.codcur = CONVERT(INT, :codcur) AND C.codhab = CONVERT(INT, :codhab)"; + $param = [ + 'codcur' => $codcur, + 'codhab' => $codhab, + ]; + $result = DB::fetch($query, $param); + // Nota: Situação a se tratar com log de ocorrências + // Se o departamento de ensino do alguno de graduação não foi encontrado + if ($result == false) { + // Será retornado 'DEPARTAMENTO NÃO ENCONTRADO' a fim de se detectar as situações ATÍPICAS em que isso ocorre + $result = ['nomabvset' => 'DEPARTAMENTO NÃO ENCONTRADO']; + } + return $result; + } + /** * Departamento de Ensino do Aluno de Graduação *