diff --git a/CHANGELOG.md b/CHANGELOG.md index e7d9e2e4c..b69b6bd0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## [Versão 3.93.212] +- Ordem das etapas ajustada no relatório de Matrículas Anuais + ## [Versão 3.93.211] - Ordenando de acordo com a ordem da turma o relatório de ata de notas diff --git a/app/controllers/ReportsController.php b/app/controllers/ReportsController.php index 4ea7d6544..021351f55 100644 --- a/app/controllers/ReportsController.php +++ b/app/controllers/ReportsController.php @@ -404,7 +404,7 @@ public function actionEnrollmentStatisticsByYearReport() { // Construíndo condicionais e definindo ordenação para a consulta $criteria = new CDbCriteria; - $criteria->order = 'name ASC'; + $criteria->order = 'edcenso_stage_vs_modality_fk, name ASC'; $criteria->condition = "school_year = :year"; $criteria->params = array("year" => Yii::app()->user->year); //Consulta todas as classes abertas no ano atual diff --git a/app/domain/grades/usecases/CalculateFinalMediaUsecase.php b/app/domain/grades/usecases/CalculateFinalMediaUsecase.php index d511628f3..a70c41ac4 100644 --- a/app/domain/grades/usecases/CalculateFinalMediaUsecase.php +++ b/app/domain/grades/usecases/CalculateFinalMediaUsecase.php @@ -81,8 +81,6 @@ public function exec() $this->saveFinalRecoveryMedia($this->gradesResult, $finalMedia); } TLog::info("Média final calculada", ["finalMedia" => $finalMedia]); - - } private function saveFinalMedia($gradesResult, $finalMedia) diff --git a/app/domain/grades/usecases/ChageStudentStatusByGradeUsecase.php b/app/domain/grades/usecases/ChageStudentStatusByGradeUsecase.php index 8e2c04f2e..ab3b695ff 100644 --- a/app/domain/grades/usecases/ChageStudentStatusByGradeUsecase.php +++ b/app/domain/grades/usecases/ChageStudentStatusByGradeUsecase.php @@ -114,7 +114,7 @@ private function updateStudentSituation() $hasRecoveryGrade = isset($recoveryMedia) && $recoveryMedia !== ""; if (!$hasRecoveryGrade) { $this->gradeResult->situation = $recoverySituation; - } elseif ($recoveryMedia >= $finalRecoveryMedia) { + } elseif ($recoveryMedia >= $finalRecoveryMedia && $finalRecovery->gradeCalculationFk->name == "Maior") { $this->gradeResult->situation = $approvedSituation; } diff --git a/config.php b/config.php index 77f0bb3e5..18e8f02bd 100644 --- a/config.php +++ b/config.php @@ -7,7 +7,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', $debug); defined("SESSION_MAX_LIFETIME") or define('SESSION_MAX_LIFETIME', 3600); -define("TAG_VERSION", '3.93.211'); +define("TAG_VERSION", '3.93.212'); define("YII_VERSION", Yii::getVersion()); define("BOARD_MSG", '