Skip to content

Commit

Permalink
Corrigindo o sql de busca por aulas adicionais quando o usuário é pro…
Browse files Browse the repository at this point in the history
…fessor de educação infantil (#897)
  • Loading branch information
Gusta-Santos authored Dec 17, 2024
1 parent e2371d7 commit 96b5342
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions app/controllers/ClassesController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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", '<div class="alert alert-success">Novas atualizações no TAG. Confira clicando <a class="changelog-link" href="?r=admin/changelog">aqui</a>.</div>');
Expand Down

0 comments on commit 96b5342

Please sign in to comment.