diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d01abfec..3040e255c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Atualizações +## [Versão 3.18.38] +- Modelo de ata de conselho de classe de 6º ao 9º ano adicionado +- Modelo de ata de conselho de classe de ensino médio adicionado + ## [Versão 3.16.38] - No relatório trimestral o cabeçalho com as informações do aluno foi adicionado a primeira página - No relatório trimestral de 1ºANO, 2º ANO e 3º ANO o cabeçalho de buzios foi corrigido para a logo ficar posicionada corretamente diff --git a/app/controllers/ReportsController.php b/app/controllers/ReportsController.php index 8519b0e2e..b0ba79882 100755 --- a/app/controllers/ReportsController.php +++ b/app/controllers/ReportsController.php @@ -163,6 +163,7 @@ public function actionClassCouncilReport() $hour = $_POST['hour']; $quarterly = $_POST['quarterly']; $school_inep_id = Yii::app()->user->school; + $model = $_POST['quarterly-model']; $year = $_POST['year']; $condition = ''; if (isset($_POST['classroom2']) && $_POST['classroom2'] != '') { @@ -186,21 +187,39 @@ public function actionClassCouncilReport() c.school_year = :year AND c.school_inep_fk = :school_inep_id $condition - ORDER BY c.id"; + ORDER BY c.id, s.name"; $classrooms = Yii::app()->db->createCommand($sql)->bindParam(":year", $year)->bindParam(":school_inep_id", $school_inep_id)->queryAll(); - $this->render('buzios/quarterly/QuarterlyClassCouncil', array( - "classroom" => $classrooms, - "count_days" => $count_days, - "mounth" => $mounth, - "hour" => $hour, - "quarterly" => $quarterly, - "year" => $year - )); + if ($model == 1) { + $this->render('buzios/quarterly/QuarterlyClassCouncil', array( + "classroom" => $classrooms, + "count_days" => $count_days, + "mounth" => $mounth, + "hour" => $hour, + "quarterly" => $quarterly, + "year" => $year + )); + }else if ($model == 2) { + $this->render('buzios/quarterly/QuarterlyClassCouncilSixNineYear', array( + "classroom" => $classrooms, + "count_days" => $count_days, + "mounth" => $mounth, + "hour" => $hour, + "quarterly" => $quarterly, + "year" => $year + )); + }else if ($model == 3) { + $this->render('buzios/quarterly/QuarterlyClassCouncilHighSchool', array( + "classroom" => $classrooms, + "count_days" => $count_days, + "mounth" => $mounth, + "hour" => $hour, + "quarterly" => $quarterly, + "year" => $year + )); + } } - Yii::app()->user->setFlash('error', Yii::t('default', 'Selecione ao menos uma opção')); - return $this->redirect(array('index')); } public function actionStudentsUsingSchoolTransportationRelationReport() diff --git a/config.php b/config.php index 5ccc449f5..b636027ca 100644 --- a/config.php +++ b/config.php @@ -2,7 +2,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true); // defined('YII_DEBUG') or define('YII_DEBUG', false); -define("TAG_VERSION", '3.16.39'); +define("TAG_VERSION", '3.18.38'); define("YII_VERSION", Yii::getVersion()); diff --git a/themes/default/views/reports/buzios/quarterly/QuarterlyClassCouncil.php b/themes/default/views/reports/buzios/quarterly/QuarterlyClassCouncil.php index 89cd10336..2001994c5 100644 --- a/themes/default/views/reports/buzios/quarterly/QuarterlyClassCouncil.php +++ b/themes/default/views/reports/buzios/quarterly/QuarterlyClassCouncil.php @@ -84,7 +84,7 @@
Aos dias do mês de de
+ às hs, teve início a
+ reunião de Conselho de Classe referente ao
Trimestre do ,
+ turma , do turno , presidido por _________________________________________.
Alunos com baixo rendimento, faltosos e com problemas de atitude:
+Nº | +NOME DO ALUNO | +Baixo Rendimento | +Prob. de Atitude | +Dif. de Aprendizagem | +Não Paticipativo | +Destaque | +Movimentação do Aluno | +|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
L. Portuguesa | +Geografia | +História | +Matemática | +Ciências | +Arte e Cultura | +Ed. Física | +Inglês | +Espanhol | +Faltoso | +|||||||
= $count_std < 10 ? "0" . $count_std : $count_std ?> | += $c['name'] ?> | ++ | + | + | + | + | + | + | + | + | + | + | + | + | + | + + | +
2 Visão geral da turma:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+_________________________________________________________________________________________________________________________________________________________________________________ +
+_________________________________________________________________________________________________________________________________________________________________________________ +
+2.1 Frequência e Pontualidade:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+2.2 Relacionamento:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+2.3 Atitude:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+2.4 Desempenho:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+Justificativas:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+3 Alunos destaque:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+4 - Deliberações Finais (diagnóstico dos problemas, suas causas e soluções):
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+5 - Quadro de rendimentos (Positivos e Negativos):
+Disciplinas | +Total de alunos | +|
---|---|---|
Positivos | +Negativos | +|
= $c['discipline'] ?> | ++ | + |
6 Observações:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+7 - Sem mais para o momento, lavro a presente ata_____________________________________________________________________________________________________________________
+Nada mais havendo a declarar, lavramos a presente Ata
+Disciplina | +Nome do Professor | +Assinatura | +
---|---|---|
= $c['discipline'] ?> | += $c['prof_name'] ?> | ++ |
+ _______________________________________ + _______________________________________ +
++ Prof. Supervisor + Prof. Orientador (a) Educacional +
++ _______________________________________ + _______________________________________ +
++ Prof. Inspetor (a) Escolar + Secretário (a) Escolar +
++ _______________________________________ +
++ Direção +
+Aos dias do mês de de
+ às hs, teve início a
+ reunião de Conselho de Classe referente ao
Trimestre do ,
+ turma , do turno , presidido por _________________________________________.
Alunos com baixo rendimento, faltosos e com problemas de atitude:
+Nº | +NOME DO ALUNO | +Baixo Rendimento | +Prob. de Atitude | +Dif. de Aprendizagem | +Não Paticipativo | +Destaque | +Movimentação do Aluno | +|||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
L. Portuguesa | +Geografia | +História | +Matemática | +Ciências | +Arte e Cultura | +Ed. Física | +Inglês | +Espanhol | +Faltoso | +|||||||
= $count_std < 10 ? "0" . $count_std : $count_std ?> | += $c['name'] ?> | ++ | + | + | + | + | + | + | + | + | + | + | + | + | + | + + | +
2 Visão geral da turma:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+_________________________________________________________________________________________________________________________________________________________________________________ +
+_________________________________________________________________________________________________________________________________________________________________________________ +
+2.1 Frequência e Pontualidade:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+2.2 Relacionamento:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+2.3 Atitude:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+2.4 Desempenho:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+Justificativas:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+3 Alunos destaque:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+4 - Deliberações Finais (diagnóstico dos problemas, suas causas e soluções):
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+5 - Quadro de rendimentos (Positivos e Negativos):
+Disciplinas | +Total de alunos | +|
---|---|---|
Positivos | +Negativos | +|
= $c['discipline'] ?> | ++ | + |
6 Observações:
+_________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
++ _________________________________________________________________________________________________________________________________________________________________________________ +
+7 - Sem mais para o momento, lavro a presente ata_____________________________________________________________________________________________________________________
+Nada mais havendo a declarar, lavramos a presente Ata
+Disciplina | +Nome do Professor | +Assinatura | +
---|---|---|
= $c['discipline'] ?> | += $c['prof_name'] ?> | ++ |
+ _______________________________________ + _______________________________________ +
++ Prof. Supervisor + Prof. Orientador (a) Educacional +
++ _______________________________________ + _______________________________________ +
++ Prof. Inspetor (a) Escolar + Secretário (a) Escolar +
++ _______________________________________ +
++ Direção +
+