ipti
diff --git a/‎CHANGELOG.md
Lines changed: 4 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 4 additions & 0 deletions
diff --git a/‎app/controllers/StudentController.php
Lines changed: 26 additions & 9 deletions b/‎app/controllers/StudentController.php
Lines changed: 26 additions & 9 deletions
diff --git a/‎app/migrations/2024-05-03-create-table-student-disorder/2024-05-03-create-table-student-disorder.sql
Lines changed: 15 additions & 0 deletions b/‎app/migrations/2024-05-03-create-table-student-disorder/2024-05-03-create-table-student-disorder.sql
Lines changed: 15 additions & 0 deletions
@@ -1,4 +1,8 @@
+## [Versão 3.78.138]
+- Efetuadas correções no SQL responsável pela contagem das faltas dos alunos
+
 ## [Versão 3.78.137]
+- corrigido erro na tela de estoque do novo módulo de merenda
 - Realizado validação para quadro de horários sem componentes
 
 ## [Versão 3.78.136]
 
@@ -31,6 +31,7 @@ class StudentController extends Controller implements AuthenticateSEDTokenInterf
     private $STUDENT_DOCUMENTS_AND_ADDRESS = 'StudentDocumentsAndAddress';
     private $STUDENT_ENROLLMENT = 'StudentEnrollment';
     private $STUDENT_RESTRICTIONS = 'StudentRestrictions';
+    private $STUDENT_DISORDER = 'StudentDisorder';
 
     public function authenticateSedToken()
     {
@@ -313,6 +314,7 @@ public function actionCreate()
         $modelStudentDocumentsAndAddress = new StudentDocumentsAndAddress;
         $modelEnrollment = new StudentEnrollment;
         $modelStudentRestrictions = new StudentRestrictions;
+        $modelStudentDisorder = new StudentDisorder;
 
         $vaccines = Vaccine::model()->findAll(array('order' => 'name'));
         $studentVaccinesSaves = StudentVaccine::model()->findAll(['select' => 'vaccine_id', 'condition' => 'student_id=:student_id', 'params' => [':student_id' => $modelStudentIdentification->id]]);
@@ -326,11 +328,12 @@ public function actionCreate()
         // $this->performAjaxValidation($model
         if (
             isset($_POST[$this->STUDENT_IDENTIFICATION]) && isset($_POST[$this->STUDENT_DOCUMENTS_AND_ADDRESS])
-            && isset($_POST[$this->STUDENT_RESTRICTIONS])
+            && isset($_POST[$this->STUDENT_RESTRICTIONS]) && isset($_POST[$this->STUDENT_DISORDER])
         ) {
             $modelStudentIdentification->attributes = $_POST[$this->STUDENT_IDENTIFICATION];
             $modelStudentDocumentsAndAddress->attributes = $_POST[$this->STUDENT_DOCUMENTS_AND_ADDRESS];
             $modelStudentRestrictions->attributes = $_POST[$this->STUDENT_RESTRICTIONS];
+            $modelStudentDisorder->attributes = $_POST[$this->STUDENT_DISORDER];
 
             // Validação CPF->Certidão->Nome
             if ($modelStudentDocumentsAndAddress->cpf != null) {
@@ -364,9 +367,10 @@ public function actionCreate()
                 if ($modelStudentIdentification->save()) {
                     $modelStudentDocumentsAndAddress->id = $modelStudentIdentification->id;
                     $modelStudentRestrictions->student_fk = $modelStudentIdentification->id;
+                    $modelStudentDisorder->student_fk = $modelStudentIdentification->id;
 
                     if ($modelStudentDocumentsAndAddress->validate()) {
-                        if ($modelStudentDocumentsAndAddress->save() && $modelStudentRestrictions->save()) {
+                        if ($modelStudentDocumentsAndAddress->save() && $modelStudentRestrictions->save() && $modelStudentDisorder->save()) {
                             $saved = true;
                             if (
                                 isset($_POST[$this->STUDENT_ENROLLMENT], $_POST[$this->STUDENT_ENROLLMENT]["classroom_fk"])
@@ -430,13 +434,12 @@ public function actionCreate()
                 }
             }
         }
-        //$modelEnrollment = array();
-        //array_push($modelEnrollment,  new StudentEnrollment);
 
         $this->render('create', array(
             'modelStudentIdentification' => $modelStudentIdentification,
             'modelStudentDocumentsAndAddress' => $modelStudentDocumentsAndAddress,
             'modelStudentRestrictions' => $modelStudentRestrictions,
+            'modelStudentDisorder' => $modelStudentDisorder,
             'modelEnrollment' => $modelEnrollment,
             'vaccines' => $vaccines,
             'studentVaccinesSaves' => $studentVaccinesSaves
@@ -454,6 +457,7 @@ public function actionUpdate($id)
         $modelStudentIdentification = $this->loadModel($id, $this->STUDENT_IDENTIFICATION);
         $modelStudentDocumentsAndAddress = $this->loadModel($id, $this->STUDENT_DOCUMENTS_AND_ADDRESS);
         $modelStudentRestrictions = $this->loadModel($id, $this->STUDENT_RESTRICTIONS);
+        $modelStudentDisorder = $this->loadModel($id, $this->STUDENT_DISORDER);
 
         $oldCpf = $modelStudentDocumentsAndAddress->cpf;
 
@@ -468,11 +472,12 @@ public function actionUpdate($id)
 
         if (
             isset($_POST[$this->STUDENT_IDENTIFICATION]) && isset($_POST[$this->STUDENT_DOCUMENTS_AND_ADDRESS])
-            && isset($_POST[$this->STUDENT_RESTRICTIONS])
+            && isset($_POST[$this->STUDENT_RESTRICTIONS]) && isset($_POST[$this->STUDENT_DISORDER])
         ) {
             $modelStudentIdentification->attributes = $_POST[$this->STUDENT_IDENTIFICATION];
             $modelStudentDocumentsAndAddress->attributes = $_POST[$this->STUDENT_DOCUMENTS_AND_ADDRESS];
             $modelStudentRestrictions->attributes = $_POST[$this->STUDENT_RESTRICTIONS];
+            $modelStudentDisorder->attributes = $_POST[$this->STUDENT_DISORDER];
             //Atributos comuns entre as tabelas
             $modelStudentDocumentsAndAddress->id = $modelStudentIdentification->id;
             $modelStudentDocumentsAndAddress->school_inep_id_fk = $modelStudentIdentification->school_inep_id_fk;
@@ -489,15 +494,16 @@ public function actionUpdate($id)
                     Yii::app()->user->setFlash(
                         'error', Yii::t('default', 'Já existe um registro associado a este CPF de um aluno cadastrado!')
                     );
-                    $this->redirect(array('/student/update', 'id' => $modelStudentDocumentsAndAddress->id));    
-                }  
+                    $this->redirect(array('/student/update', 'id' => $modelStudentDocumentsAndAddress->id));
+                }
             }
 
             if ($modelStudentIdentification->validate() && $modelStudentDocumentsAndAddress->validate()) {
                 if ($modelStudentIdentification->save()) {
                     $modelStudentRestrictions->student_fk = $modelStudentIdentification->id;
+                    $modelStudentDisorder->student_fk = $modelStudentIdentification->id;
                     $modelStudentDocumentsAndAddress->id = $modelStudentIdentification->id;
-                    if ($modelStudentDocumentsAndAddress->save() && $modelStudentRestrictions->save()) {
+                    if ($modelStudentDocumentsAndAddress->save() && $modelStudentRestrictions->save() && $modelStudentDisorder->save()) {
                         $saved = true;
                         if (
                             isset($_POST[$this->STUDENT_ENROLLMENT], $_POST[$this->STUDENT_ENROLLMENT]["classroom_fk"])
@@ -540,7 +546,7 @@ public function actionUpdate($id)
                                 }
                             }
                         }
-                        
+
                         if ($saved) {
                             $flash = "success";
                             $msg = 'O Cadastro de ' . $modelStudentIdentification->name . ' foi alterado com sucesso!';
@@ -587,6 +593,7 @@ public function actionUpdate($id)
             'modelStudentIdentification' => $modelStudentIdentification,
             'modelStudentDocumentsAndAddress' => $modelStudentDocumentsAndAddress,
             'modelStudentRestrictions' => $modelStudentRestrictions,
+            'modelStudentDisorder' => $modelStudentDisorder,
             'modelEnrollment' => $modelEnrollment,
             'vaccines' => $vaccines,
             'studentVaccinesSaves' => $studentVaccinesSaves
@@ -678,6 +685,11 @@ public function actionDelete($id)
                 $documentsAndAddress->delete();
             }
 
+            $studentRestriction = $this->loadModel($id, $this->STUDENT_RESTRICTIONS);
+            if (isset($studentRestriction->id) && $studentRestriction->id > 0) {
+                $studentRestriction->delete();
+            }
+
             $identification = $this->loadModel($id, $this->STUDENT_IDENTIFICATION);
             $inNumRA = $identification->gov_id;
 
@@ -824,6 +836,11 @@ public function loadModel($id, $model)
             if ($return === null) {
                 $return = new StudentRestrictions;
             }
+        } elseif ($model == $this->STUDENT_DISORDER) {
+            $return = StudentDisorder::model()->findByAttributes(array('student_fk' => $id));
+            if ($return === null) {
+                $return = new StudentDisorder;
+            }
         }
 
         return $return;
 
@@ -0,0 +1,15 @@
+CREATE TABLE `student_disorder` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `student_fk` int(11) NOT NULL,
+  `tdah` tinyint(1) NOT NULL DEFAULT '0',
+  `depressao` tinyint(1) NOT NULL DEFAULT '0',
+  `tab` tinyint(1) NOT NULL DEFAULT '0',
+  `toc` tinyint(1) NOT NULL DEFAULT '0',
+  `tag` tinyint(1) NOT NULL DEFAULT '0',
+  `tod` tinyint(1) NOT NULL DEFAULT '0',
+  `tcne` tinyint(1) NOT NULL DEFAULT '0',
+  `others` varchar(200)  NULL DEFAULT "",
+  PRIMARY KEY (`id`),
+  KEY `student_disorder_FK` (`student_fk`),
+  CONSTRAINT `student_disorder_FK` FOREIGN KEY (`student_fk`) REFERENCES `student_identification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;