diff --git a/CHANGELOG.md b/CHANGELOG.md index b69b6bd0c..dc799a695 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [Versão 3.94.213] +- Controle de status a serem considerados na exportação do sagres. Por padrão apenas matriculas com status "matriculado" são envadas. No entanto, usando o diario eletronico, o status de algumas matriculas mudaram para "Aprovado", "Reprovado" e outros. Foi adicionado um controle para optar ou não por considerar esses status na exportação. +- Novo campo na turma para definir o periodo da turma: Anual, 1 Semestre ou 2 Semestre; +- Novo campo na turma para deliberadamente desconsiderar ela na exportação do sagres; + + ## [Versão 3.93.212] - Ordem das etapas ajustada no relatório de Matrículas Anuais diff --git a/app/models/InstanceConfig.php b/app/models/InstanceConfig.php index 3e6275912..67ba74ae3 100644 --- a/app/models/InstanceConfig.php +++ b/app/models/InstanceConfig.php @@ -28,8 +28,8 @@ public function rules() // will receive user inputs. return array( array('parameter_key, parameter_name', 'required'), - array('parameter_key', 'length', 'max' => 20), - array('parameter_name', 'length', 'max' => 75), + array('parameter_key', 'length', 'max' => 40), + array('parameter_name', 'length', 'max' => 150), array('value', 'length', 'max' => 250), // The following rule is used by search(). array('id, parameter_key, parameter_name, value', 'safe', 'on' => 'search'), diff --git a/app/modules/sagres/models/SagresConsultModel.php b/app/modules/sagres/models/SagresConsultModel.php index c108bf4b6..c5a88acdb 100644 --- a/app/modules/sagres/models/SagresConsultModel.php +++ b/app/modules/sagres/models/SagresConsultModel.php @@ -1612,12 +1612,17 @@ public function getAttendances($professionalId, $referenceYear, $month) } private function getAcceptedEnrollmentStatus(): array { - return [ - \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_ACTIVE), - \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_APPROVED), - \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_APPROVEDBYCOUNCIL), - \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_DISAPPROVED), - ]; + + if(Yii::app()->features->isEnable("FEAT_SAGRES_STATUS_ENROL")){ + return [ + \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_ACTIVE), + \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_APPROVED), + \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_APPROVEDBYCOUNCIL), + \StudentEnrollment::getStatusId(\StudentEnrollment::STATUS_DISAPPROVED), + ]; + } + + return [\StudentEnrollment::getStatusId(status: \StudentEnrollment::STATUS_ACTIVE)]; } /** * Sets a new MatriculaTType diff --git a/config.php b/config.php index 18e8f02bd..60c862795 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.212'); +define("TAG_VERSION", '3.94.213'); define("YII_VERSION", Yii::getVersion()); define("BOARD_MSG", '