ipti
diff --git a/‎CHANGELOG.md
+11-4 b/‎CHANGELOG.md
+11-4
diff --git a/‎app/components/UserIdentity.php
+1-1 b/‎app/components/UserIdentity.php
+1-1
diff --git a/‎app/controllers/AdminController.php
+10-1 b/‎app/controllers/AdminController.php
+10-1
diff --git a/‎app/domain/grades/usecases/CalculateFinalMediaUsecase.php
+26-7 b/‎app/domain/grades/usecases/CalculateFinalMediaUsecase.php
+26-7
diff --git a/‎app/domain/grades/usecases/CalculateNumericGradeUsecase.php
+3-1 b/‎app/domain/grades/usecases/CalculateNumericGradeUsecase.php
+3-1
diff --git a/‎app/domain/grades/usecases/GetStudentGradesByDisciplineUsecase.php
+2-2 b/‎app/domain/grades/usecases/GetStudentGradesByDisciplineUsecase.php
+2-2
diff --git a/‎app/messages/pt_br/default.php
+1 b/‎app/messages/pt_br/default.php
+1
diff --git a/‎app/migrations/2024-12-12_add_weight_final_recovery/2024-12-12_add_weight_final_recovery.sql
+3 b/‎app/migrations/2024-12-12_add_weight_final_recovery/2024-12-12_add_weight_final_recovery.sql
+3
diff --git a/‎app/migrations/2025-04-02_update_instructors_scholarity/sql.sql
+3 b/‎app/migrations/2025-04-02_update_instructors_scholarity/sql.sql
+3
diff --git a/‎app/migrations/2025-20-01_create_reader_user/2025-20-01_create_reader_user.sql
+1 b/‎app/migrations/2025-20-01_create_reader_user/2025-20-01_create_reader_user.sql
+1
diff --git a/‎app/migrations/2025-2401_create_atand_update_at_on_log/2025-2401_create_atand_update_at_on_log.sql
+3 b/‎app/migrations/2025-2401_create_atand_update_at_on_log/2025-2401_create_atand_update_at_on_log.sql
+3
diff --git a/‎app/models/AltActiveRecord.php
+8-3 b/‎app/models/AltActiveRecord.php
+8-3
diff --git a/‎app/models/Attendance.php
+1-1 b/‎app/models/Attendance.php
+1-1
@@ -1,7 +1,15 @@
-## [Versão 3.94.214]
+## [Versão 3.95.217]
+- Corrigido o relatório de professores por escola
+- Correção no relatório "Ficha de Notas", disciplinas sem nota não afetam mais a situação final de matrícula.
+
+## [Versão 3.96.216]
+- Adicionada reuperação final por peso
+- Adicionado usuário de leitura
+
+## [Versão 3.95.216]
 - Corrigida a funcionalidade de imprimir aulas ministradas.
 
-## [Versão 3.94.214]
+## [Versão 3.95.215]
 - Correção na funcionalidade de atualizar situação de matrícula após calcular a nota final de aluno.
 
 ## [Versão 3.95.213]
@@ -16,7 +24,7 @@
 
 ## [Versão 3.94.210]
 - Permitido que se adicione casa decimal na carga horária na matriz curricular. o Valor da hora-aula é definida nas configurações gerais do município.
--
+
 ## [Versão 3.93.210]
 - Ordem das etapas ajustada no relatório de Matrículas Anuais
 
@@ -33,7 +41,6 @@ o relatório para ensino intanfil e fundamental menor do fundamental maior;
 - Novo campo na turma para definir o periodo da turma: Anual, 1 Semestre ou 2 Semestre;
 - Novo campo na turma para deliberadamente desconsiderar ela na exportação do sagres;
 
-
 ## [Versão 3.93.212]
 - Ordem das etapas ajustada no relatório de Matrículas Anuais
 
 
@@ -54,7 +54,7 @@ public function authenticate() {
         } elseif(!password_verify($this->password, $record->password)) {
             $this->errorCode = self::ERROR_PASSWORD_INVALID;
         } else {
-            if(Yii::app()->getAuthManager()->checkAccess('admin',$record->id)|| Yii::app()->getAuthManager()->checkAccess('nutritionist',$record->id)){
+            if(Yii::app()->getAuthManager()->checkAccess('admin',$record->id)|| Yii::app()->getAuthManager()->checkAccess('nutritionist',$record->id)|| Yii::app()->getAuthManager()->checkAccess('reader',$record->id)){
                 $userSchools = [];
                 $this->setState('hardfoot',false);
                 //@done s2 - mostrar apenas escolas ativas
 
@@ -337,7 +337,7 @@ public function actionCreateUser()
             ]
         );
         if (isset($_POST['Users'])) {
-            if(!isset($_POST['schools']) && ($_POST['Role']) != 'admin' && ($_POST['Role']) != 'nutritionist')
+            if(!isset($_POST['schools']) && ($_POST['Role']) != 'admin' && ($_POST['Role']) != 'nutritionist' && ($_POST['Role']) != 'reader')
             {
                 Yii::app()->user->setFlash('error', Yii::t('default', 'É necessário atribuir uma escola para o novo usuário criado!'));
                 $this->redirect(['index']);
@@ -535,6 +535,8 @@ public function actionSaveUnities()
         $finalRecoverMedia = Yii::app()->request->getPost("finalRecoverMedia");
         $calculationFinalMedia = Yii::app()->request->getPost("finalMediaCalculation");
         $finalRecovery = Yii::app()->request->getPost("finalRecovery");
+        $finalRecoveryWeight = Yii::app()->request->getPost("finalRecoveryWeight");
+        $finalMediaWeight = Yii::app()->request->getPost("finalMediaWeight");
         $ruleType = Yii::app()->request->getPost("ruleType");
         $hasFinalRecovery = Yii::app()->request->getPost("hasFinalRecovery") === "true";
         $hasPartialRecovery = Yii::app()->request->getPost("hasPartialRecovery") === "true";
@@ -569,6 +571,13 @@ public function actionSaveUnities()
                 $recoveryUnity->edcenso_stage_vs_modality_fk = $stage;
                 $recoveryUnity->final_recovery_avarage_formula = $finalRecovery["final_recovery_avarage_formula"];
 
+                $gradeCalculation = GradeCalculation::model()->findByPk($finalRecovery["grade_calculation_fk"]);
+
+                if($gradeCalculation->name === "Peso"){
+                    $recoveryUnity->weight_final_media = $finalRecovery["WeightfinalMedia"];
+                    $recoveryUnity->weight_final_recovery = $finalRecovery["WeightfinalRecovery"];
+                }
+
                 if (!$recoveryUnity->validate()) {
                     $validationMessage = Yii::app()->utils->stringfyValidationErrors($recoveryUnity);
                     throw new CHttpException(400, "Não foi possivel salvar dados da recuperação final: \n" . $validationMessage, 1);
 
@@ -55,7 +55,9 @@ public function exec()
 
                 $gradesFinalRecovery = [];
 
-                if ($this->gradeRule->gradeCalculationFk->name == 'Média Semestral' && $gradeUnity->final_recovery_avarage_formula == "Médias dos Semestres") {
+
+
+                if ($gradeUnity->gradeCalculationFk->name == 'Média Semestral' && $gradeUnity->final_recovery_avarage_formula == "Médias dos Semestres") {
                     // Verifica se os valores são números antes de comparar
                     $semRecPartial1 = is_numeric($this->gradesResult["sem_rec_partial_1"]) ? $this->gradesResult["sem_rec_partial_1"] : 0;
                     $semRecPartial2 = is_numeric($this->gradesResult["sem_rec_partial_2"]) ? $this->gradesResult["sem_rec_partial_2"] : 0;
@@ -73,10 +75,12 @@ public function exec()
                         $gradesFinalRecovery[] = $gradesSemAvarage2;
                     }
 
-                } else {
+                }
+                else {
                     $gradesFinalRecovery[] = $finalMedia;
                 }
 
+
                 $finalMedia = $this->applyFinalRecovery($this->gradesResult, $gradesFinalRecovery);
                 $this->saveFinalRecoveryMedia($this->gradesResult, $finalMedia);
             }
@@ -105,13 +109,27 @@ private function shouldApplyFinalRecovery($gradeRule, $finalMedia)
     private function applyFinalRecovery($gradesResult, $gradesFinalRecovery)
     {
         $result = null;
-        $finalRecovery = $this->getFinalRevovery($gradesResult->enrollment_fk, $gradesResult->discipline_fk);
+
+        $finalRecovery = GradeUnity::model()->findByAttributes(
+            ["edcenso_stage_vs_modality_fk" => $this->gradeRule->edcenso_stage_vs_modality_fk,
+            "type" =>  "RF"]);
         $finalRecoveryGrade = $this->getFinalRevoveryGrade($gradesResult->enrollment_fk, $gradesResult->discipline_fk, $finalRecovery->id);
         array_push($gradesFinalRecovery, $finalRecoveryGrade);
         if ($finalRecovery->gradeCalculationFk->name == "Média Semestral") {
+
             $calculation = GradeCalculation::model()->findByAttributes(["name" => "Média"]);
             $result = $this->applyCalculation($calculation, $gradesFinalRecovery);
-        } else {
+        } elseif ($finalRecovery->gradeCalculationFk->name == "Peso")
+        {
+            $weights = [
+                $finalRecovery->weight_final_recovery,
+                $finalRecovery->weight_final_media
+
+            ];
+            $result = $this->applyCalculation($finalRecovery->gradeCalculationFk, $gradesFinalRecovery, $weights);
+        }
+         else
+        {
             $result = $this->applyCalculation($finalRecovery->gradeCalculationFk, $gradesFinalRecovery);
         }
         return $result;
@@ -124,8 +142,8 @@ private function getFinalRevovery($enrollmentId, $discipline)
         $criteria->select = "distinct gu.id, gu.*";
         $criteria->join = "join grade_unity_modality gum on gum.grade_unity_fk = gu.id";
         $criteria->join .= " join grade g on g.grade_unity_modality_fk = gum.id";
-        $criteria->condition = "g.discipline_fk = :discipline_fk and enrollment_fk = :enrollment_fk and gu.type = :type";
-        $criteria->params = array(":discipline_fk" => $discipline, ":enrollment_fk" => $enrollmentId, ":type" => GradeUnity::TYPE_FINAL_RECOVERY);
+        $criteria->condition = "g.discipline_fk = :discipline_fk and enrollment_fk = :enrollment_fk and gu.type = :type and gu.edcenso_stage_vs_modality_fk = :edcenso_stage_vs_modality_fk";
+        $criteria->params = array(":discipline_fk" => $discipline, ":enrollment_fk" => $enrollmentId, ":type" => GradeUnity::TYPE_FINAL_RECOVERY, ":edcenso_stage_vs_modality_fk"=> $this->gradeRule->edcenso_stage_vs_modality_fk);
         $criteria->order = "gu.id";
         return GradeUnity::model()->find($criteria);
     }
@@ -147,10 +165,11 @@ private function getFinalRevoveryGrade($enrollmentId, $discipline, $finalRecover
 
     }
 
-    private function applyCalculation($calculation, $grades)
+    private function applyCalculation($calculation, $grades, $weights = [])
     {
         return (new ApplyFormulaOnGradesUsecase($calculation))
             ->setGrades($grades)
+            ->setWeights($weights)
             ->exec();
     }
 
 
@@ -339,7 +339,9 @@ private function applyStrategyComputeGradesByFormula($calculation, $unityOrRecov
                     $acc[0] += $grade * $weights[$key]->weight;
                     $acc[1] += $weights[$key]->weight;
                 }
-
+                if ($acc[1] == 0) {
+                    return 0;
+                }
                 $result = $acc[0] / $acc[1];
                 break;
         }
 
@@ -41,7 +41,7 @@ public function exec()
         } else {
             $studentEnrollments= $classroom->activeStudentEnrollments;
         }
-        $showSemAvarageColumn = $this->checkSemesterUnities( $this->stageId);
+        $showSemAvarageColumn = $this->checkSemesterUnities( $this->stageId) && $rules->gradeCalculationFk->name == 'Média Semestral';
 
         $unitiesByDisciplineResult = $this->getGradeUnitiesByDiscipline( $this->stageId);
         $unitiesByDiscipline = array_filter($unitiesByDisciplineResult, function ($item){
@@ -123,7 +123,7 @@ public function checkSemesterUnities($stage) {
 
         $criteria = new CDbCriteria();
         $criteria->addCondition("edcenso_stage_vs_modality_fk = :stage");
-        $criteria->addCondition("semester IS NULL"); // TODO: só deus e chagas sabiam, agora só deus sabe pq faz isso
+        $criteria->addCondition("semester IS NULL");
         $criteria->addCondition("type != :type");
         $criteria->params = [
             ':stage' => $stage,
 
@@ -882,6 +882,7 @@
     'instructor' => 'Professor',
     'coordinator' => 'Coordenador Pedagógico',
     'nutritionist' => 'Nutricionista',
+    'reader' => 'Somente Leitura',
     'admin' => 'Administrador',
     'Edit Password' => 'Alterar Senha',
 
 
@@ -0,0 +1,3 @@
+alter table grade_unity
+ add column weight_final_media int(11),
+ add column weight_final_recovery int(11);
@@ -0,0 +1,3 @@
+UPDATE instructor_variable_data ivd
+SET scholarity = 5
+WHERE ivd.scholarity = 7;
@@ -0,0 +1 @@
+insert into auth_item (name, type) values ('reader', 2);
@@ -0,0 +1,3 @@
+ALTER TABLE log
+ADD COLUMN created_at DATETIME DEFAULT NULL,
+ADD COLUMN updated_at DATETIME DEFAULT NULL;
@@ -6,8 +6,12 @@
  * Date: 23/11/2016
  * Time: 13:37
  */
-abstract class AltActiveRecord extends CActiveRecord
+class AltActiveRecord extends TagModel
 {
+    public function behaviors()
+    {
+        return array_merge([], parent::behaviors());
+    }
     public function setDb2Connection($db2 = false){
         if($db2){
             self::$db=Yii::app()->db;
@@ -19,6 +23,7 @@ public function setDb2Connection($db2 = false){
             self::$db=Yii::app()->db;
             self::$db->setActive(true);
             return self::$db;
-        }   
+        }
     }
-}
+
+}
@@ -13,7 +13,7 @@
  * @property Professional $professionalFk
  * @property Professional[] $professionals
  */
-class Attendance extends CActiveRecord
+class Attendance extends TagModel
 {
 	/**
 	 * @return string the associated database table name
Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,9 @@ private function applyStrategyComputeGradesByFormula($calculation, $unityOrRecov`
`339`	`339`	`$acc[0] += $grade * $weights[$key]->weight;`
`340`	`340`	`$acc[1] += $weights[$key]->weight;`
`341`	`341`	`}`
`342`		`-`
	`342`	`+ if ($acc[1] == 0) {`
	`343`	`+ return 0;`
	`344`	`+ }`
`343`	`345`	`$result = $acc[0] / $acc[1];`
`344`	`346`	`break;`
`345`	`347`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+alter table grade_unity`
	`2`	`+ add column weight_final_media int(11),`
	`3`	`+ add column weight_final_recovery int(11);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+UPDATE instructor_variable_data ivd`
	`2`	`+SET scholarity = 5`
	`3`	`+WHERE ivd.scholarity = 7;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+insert into auth_item (name, type) values ('reader', 2);`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TABLE log`
	`2`	`+ADD COLUMN created_at DATETIME DEFAULT NULL,`
	`3`	`+ADD COLUMN updated_at DATETIME DEFAULT NULL;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* @property Professional $professionalFk`
`14`	`14`	`* @property Professional[] $professionals`
`15`	`15`	`*/`
`16`		`-class Attendance extends CActiveRecord`
	`16`	`+class Attendance extends TagModel`
`17`	`17`	`{`
`18`	`18`	`/**`
`19`	`19`	`* @return string the associated database table name`