feature: class council from 6th to 9th grade and high school

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

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()

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());

themes/default/views/reports/buzios/quarterly/QuarterlyClassCouncil.php

@@ -84,7 +84,7 @@
                     <th rowspan="2" scope="col">NOME DO ALUNO</th>
                     <th class="vertical-head" rowspan="2" scope="col">PCD</th>
                     <th class="vertical-head" rowspan="2" scope="col">INFREQ.</th>
-                    <th colspan="2" scope="col">Área Cognitiva (AS)</th>
+                    <th colspan="2" scope="col">Área Cognitiva (AC)</th>
                     <th colspan="2" scope="col">Área Socioafetiva (AS)</th>
                     <th rowspan="2" scope="col">Observações</th>
                 </tr>