diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fbea8bc5..ad33601ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ +## [Versão 3.93.210] +- Corrigindo a busca por aulas em aulas ministradas quando o usuário é um professor da educação infantil + ## [Versão 3.93.209] - Trocado "Série" por "Etapa" na Ficha de Matrícula - O Campo 27 da Ficha de Matrícula (Autorização do Termo de Consentimento de Imagem) agora traz preenchido do cadastro do aluno diff --git a/app/controllers/ClassesController.php b/app/controllers/ClassesController.php index 5f429c86b..44a732d69 100755 --- a/app/controllers/ClassesController.php +++ b/app/controllers/ClassesController.php @@ -189,13 +189,11 @@ public function actionGetClassContents() ->queryAll(); $additionalClasses = Yii::app()->db->createCommand( - "select distinct cc.id, cp.name as cpname, ed.id as edid, ed.name as edname, cc.order, cc.content, cp.id as cpid + "select cc.id, cp.name as cpname, cp.discipline_fk ,cc.order, cc.content, cp.id as cpid from course_class cc join course_plan cp on cp.id = cc.course_plan_fk - join course_plan_discipline_vs_abilities dvsa on dvsa.course_class_fk = cc.id - join edcenso_discipline ed on ed.id = dvsa.discipline_fk where cp.school_inep_fk = :school_inep_fk and cp.modality_fk = :modality_fk and cp.users_fk = :users_fk and cp.discipline_fk IS NULL - order by ed.name, cp.name" + order by cp.name" ) ->bindParam(":school_inep_fk", Yii::app()->user->school) ->bindParam(":modality_fk", $schedules[0]->classroomFk->edcenso_stage_vs_modality_fk) diff --git a/config.php b/config.php index 777597621..8bc552b7f 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.209'); +define("TAG_VERSION", '3.93.210'); define("YII_VERSION", Yii::getVersion()); define("BOARD_MSG", '