From 77375abc0d184512cecb10d308ee33939f8ed100 Mon Sep 17 00:00:00 2001 From: TI GUSTAVO Date: Thu, 7 Nov 2024 11:21:57 -0300 Subject: [PATCH 1/2] =?UTF-8?q?Corrigindo=20errors=20referentes=20a=20migr?= =?UTF-8?q?a=C3=A7=C3=A3o=20do=20php=208?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/Controller.php | 12 ++++++------ app/config/main.php | 2 +- app/controllers/GradesController.php | 6 +++--- app/controllers/ReportsController.php | 4 ++-- app/modules/sagres/models/SagresConsultModel.php | 4 ++-- app/repository/ReportsRepository.php | 11 ++++++++--- instance.php | 2 +- .../default/views/forms/EnrollmentGradesReport.php | 6 ++++-- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/app/components/Controller.php b/app/components/Controller.php index 84273ab34..4c1f4a8bf 100755 --- a/app/components/Controller.php +++ b/app/components/Controller.php @@ -26,10 +26,10 @@ public function init() { parent::init(); - + if (!Yii::app()->user->isGuest) { - - $authTimeout = Yii::app()->user->getState("authTimeout", 20*60); // Valor padrão de 1800 segundos (30 minutos) + + $authTimeout = Yii::app()->user->getState("authTimeout", 5*60*60); // Valor padrão de 1800 segundos (30 minutos) Yii::app()->user->authTimeout = $authTimeout; ini_set('session.gc_maxlifetime', $authTimeout); @@ -53,12 +53,12 @@ public function beforeAction($action) if (parent::beforeAction($action)) { // Verifica se o authTimeout foi excedido antes de atualizar a atividade Yii::app()->user->setState('last_activity', time()); - + if (isset(Yii::app()->user->authTimeout) && time() - Yii::app()->user->getState('last_activity') > Yii::app()->user->authTimeout) { Yii::app()->user->logout(); return false; // Impede a ação se o usuário for desconectado } - + // Atualiza a hora da última atividade return true; @@ -66,4 +66,4 @@ public function beforeAction($action) return false; } -} \ No newline at end of file +} diff --git a/app/config/main.php b/app/config/main.php index ceae46449..c5594f47a 100755 --- a/app/config/main.php +++ b/app/config/main.php @@ -136,7 +136,7 @@ 'user' => array( // enable cookie-based authentication 'allowAutoLogin' => true, - 'authTimeout' => 20*60 + 'authTimeout' => 5*60*60 ), 'cache' => array( 'class' => 'system.caching.CDbCache' diff --git a/app/controllers/GradesController.php b/app/controllers/GradesController.php index 76f177e5d..19f3c60fc 100644 --- a/app/controllers/GradesController.php +++ b/app/controllers/GradesController.php @@ -566,9 +566,9 @@ public function actionGetGrades() Yii::import("application.domain.grades.usecases.GetStudentGradesByDisciplineUsecase"); - $classroomId = Yii::app()->request->getPost("classroom"); - $disciplineId = Yii::app()->request->getPost("discipline"); - $unityId = Yii::app()->request->getPost("unity"); + $classroomId = (int) Yii::app()->request->getPost("classroom"); + $disciplineId = (int) Yii::app()->request->getPost("discipline"); + $unityId = (int) Yii::app()->request->getPost("unity"); if (!isset($classroomId) || !isset($disciplineId) || !isset($unityId)) { diff --git a/app/controllers/ReportsController.php b/app/controllers/ReportsController.php index e2ae75a3a..0b06884dc 100644 --- a/app/controllers/ReportsController.php +++ b/app/controllers/ReportsController.php @@ -413,8 +413,8 @@ public function actionEnrollmentStatisticsByYearReport() $schools = []; foreach ($classrooms as $classroom) { //Coloca em um array o nome de todas as escolas que já não estão no mesmo (através da lista de classes) - if (!in_array($schools, $classroom->schoolInepFk->name)) { - array_push($schools, $classroom->schoolInepFk->name); + if (!in_array($classroom->schoolInepFk->name, $schools)) { + $schools[] = $classroom->schoolInepFk->name; } //Coloca em um array todos o stage number e nome dos estágios que // já não estão no mesmo (através da lista de classes) diff --git a/app/modules/sagres/models/SagresConsultModel.php b/app/modules/sagres/models/SagresConsultModel.php index 9eda221f4..4d05d9218 100644 --- a/app/modules/sagres/models/SagresConsultModel.php +++ b/app/modules/sagres/models/SagresConsultModel.php @@ -1673,7 +1673,7 @@ public function getEnrollments($classId, $referenceYear, $month, $finalClass, $i $studentType ->setNome($enrollment['name']) ->setDataNascimento($birthdate) - ->setCpfAluno(!empty($cpf) ? $cpf : null) + ->setCpfAluno(!empty($cpf) ? $cpf : "") ->setPcd($enrollment['deficiency']) ->setSexo($enrollment['gender']); @@ -1900,7 +1900,7 @@ public function getEnrollments($classId, $referenceYear, $month, $finalClass, $i $studentType ->setNome($enrollment['name']) ->setDataNascimento(DateTime::createFromFormat("d/m/Y", $convertedBirthdate)) - ->setCpfAluno(!empty($cpf) ? $cpf : null) + ->setCpfAluno(!empty($cpf) ? $cpf : "") ->setPcd($enrollment['deficiency']) ->setSexo($enrollment['gender']); diff --git a/app/repository/ReportsRepository.php b/app/repository/ReportsRepository.php index 243b1e378..454ae6f98 100644 --- a/app/repository/ReportsRepository.php +++ b/app/repository/ReportsRepository.php @@ -1917,8 +1917,8 @@ public function getStudentByClassroom(CHttpRequest $request): array INNER JOIN student_identification as s on s.id=se.student_fk INNER JOIN school_identification as e on c.school_inep_fk = e.inep_id LEFT JOIN student_documents_and_address as d on s.id = d.id - INNER JOIN edcenso_stage_vs_modality classroomEsvm on classroomEsvm.id = c.edcenso_stage_vs_modality_fk - LEFT JOIN edcenso_stage_vs_modality enrollmentEsvm on enrollmentEsvm.id = se.edcenso_stage_vs_modality_fk + INNER JOIN edcenso_stage_vs_modality classroomEsvm on classroomEsvm.id = c.edcenso_stage_vs_modality_fk + LEFT JOIN edcenso_stage_vs_modality enrollmentEsvm on enrollmentEsvm.id = se.edcenso_stage_vs_modality_fk WHERE c.school_year = :year AND c.school_inep_fk = :school_inep_fk AND @@ -2124,7 +2124,12 @@ public function getAttendanceForBF(CHttpRequest $request): array } foreach ($classroom->studentEnrollments as $studentEnrollment) { for ($i = $monthI; $i <= $monthF; $i++) { - $groupByClassroom[$classroom->name][$studentEnrollment->studentFk->name]['Classes'][$i] = isset($days[$i]) ? (floor(((count($days[$i]) - count($faultDays[$studentEnrollment->studentFk->name][$i])) / count($days[$i])) * 100 * 100) / 100) . "%" : "N/A"; + $daysCount = isset($days[$i]) && is_array($days[$i]) ? count($days[$i]) : 0; + $faultDaysCount = isset($faultDays[$studentEnrollment->studentFk->name][$i]) && is_array($faultDays[$studentEnrollment->studentFk->name][$i]) ? count($faultDays[$studentEnrollment->studentFk->name][$i]) : 0; + + $groupByClassroom[$classroom->name][$studentEnrollment->studentFk->name]['Classes'][$i] = $daysCount > 0 + ? (floor((($daysCount - $faultDaysCount) / $daysCount) * 100 * 100) / 100) . "%" + : "N/A"; } $groupByClassroom[$classroom->name][$studentEnrollment->studentFk->name]['Info']["Classroom"] = $classroom->name; $groupByClassroom[$classroom->name][$studentEnrollment->studentFk->name]['Info']["NIS"] = $studentEnrollment->studentFk->documentsFk->nis == null ? "Não Informado" : $studentEnrollment->studentFk->documentsFk->nis; diff --git a/instance.php b/instance.php index 82e3c28b9..395696cfe 100644 --- a/instance.php +++ b/instance.php @@ -17,7 +17,7 @@ $newdb = $domain . '.tag.ong.br'; if ($domain == "localhost") { - $newdb = 'boquim.tag.ong.br'; + $newdb = 'demo.tag.ong.br'; } $_GLOBALGROUP = 0; diff --git a/themes/default/views/forms/EnrollmentGradesReport.php b/themes/default/views/forms/EnrollmentGradesReport.php index 792bd423a..5bbefd40b 100755 --- a/themes/default/views/forms/EnrollmentGradesReport.php +++ b/themes/default/views/forms/EnrollmentGradesReport.php @@ -146,8 +146,10 @@ class="table table-bordered report-table-empty"> type == 'UC') { ?> From 6f6e15b245af84d007460272d9e598e03426f5a4 Mon Sep 17 00:00:00 2001 From: TI GUSTAVO Date: Thu, 7 Nov 2024 11:30:01 -0300 Subject: [PATCH 2/2] =?UTF-8?q?Modificando=20a=20vers=C3=A3o=20do=20change?= =?UTF-8?q?log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 4 ++++ config.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ece7bffd4..4f2282cc8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [Versão 3.89.202] +- Modificando o tempo de sessão +- Corrigindo errors relacionados a comparação de variáveis + ## [Versão 3.89.201] - Adicionando o informativo de total de aulas da carga horária e total de aulas ministradas nas telas de aulas ministradas - Enriquecido Termo de Suspensão com Dados carregados do banco diff --git a/config.php b/config.php index 494ea86e1..876fba947 100644 --- a/config.php +++ b/config.php @@ -4,7 +4,7 @@ $debug = getenv("YII_DEBUG"); defined('YII_DEBUG') or define('YII_DEBUG', $debug); -define("TAG_VERSION", '3.89.201'); +define("TAG_VERSION", '3.89.202'); define("YII_VERSION", Yii::getVersion()); define("BOARD_MSG", '
Novas atualizações no TAG. Confira clicando aqui.
');