From 220366e8b6aea0ef072e97142a02e935a6fbdea2 Mon Sep 17 00:00:00 2001
From: Francisco Junior <natsujunior7@gmail.com>
Date: Fri, 11 Oct 2024 16:13:47 -0300
Subject: [PATCH 1/4] Add enrollment status label to grades view

---
 CHANGELOG.md                                              | 3 +++
 .../usecases/GetStudentGradesByDisciplineUsecase.php      | 3 +++
 app/models/Classroom.php                                  | 2 +-
 js/grades/functions.js                                    | 8 ++++++++
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b859df615..18aee28af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [Versão 3.89.195]
+- Label de status de matricula adicionado a tela de notas
+
 ## [Versão 3.89.194]
 - Corrigido Cartão do SUS, Etapa e Grau de Escolaridade na ficha de matrícula
 - Inserido Cartão do SUS, RG do Aluno e CPF do Aluno em documentos entregues no cadastro do aluno
diff --git a/app/domain/grades/usecases/GetStudentGradesByDisciplineUsecase.php b/app/domain/grades/usecases/GetStudentGradesByDisciplineUsecase.php
index 58cd7db2b..279a3ca6e 100644
--- a/app/domain/grades/usecases/GetStudentGradesByDisciplineUsecase.php
+++ b/app/domain/grades/usecases/GetStudentGradesByDisciplineUsecase.php
@@ -482,11 +482,13 @@ class StudentGradesResult
     private $situation;
     private $unities;
     private $partialRecoveries;
+    private $enrollmentStatus;
 
     public function __construct($studentName, $enrollmentId)
     {
         $this->studentName = $studentName;
         $this->enrollmentId = $enrollmentId;
+        $this->enrollmentStatus = StudentEnrollment::model()->findByPk($enrollmentId)->getCurrentStatus();
     }
 
     public function getStudentName()
@@ -534,6 +536,7 @@ public function toArray(): array
         return [
             'studentName' => $this->studentName,
             'enrollmentId' => $this->enrollmentId,
+            'enrollmentStatus' => $this->enrollmentStatus,
             'finalMedia' => $this->finalMedia,
             'semAvarage' => $this->semAvarage,
             'situation' => $this->situation,
diff --git a/app/models/Classroom.php b/app/models/Classroom.php
index b516022bb..a9ba94f1c 100755
--- a/app/models/Classroom.php
+++ b/app/models/Classroom.php
@@ -189,7 +189,7 @@ public function relations()
                 'classroom_fk',
                 'join' => 'JOIN student_identification ON student_identification.id=student_fk',
                 'order' => 'daily_order ASC, student_identification.name',
-                'condition' => 'status IN (1, 6, 7, 8, 9, 10) or status IS NULL'
+                'condition' => 'status IN (1, 2, 6, 7, 8, 9, 10) or status IS NULL'
             ),
             'activeEnrollmentsCount' => array(
                 self::STAT,
diff --git a/js/grades/functions.js b/js/grades/functions.js
index b5c0d22d2..5f21a8e45 100644
--- a/js/grades/functions.js
+++ b/js/grades/functions.js
@@ -189,6 +189,7 @@ function GradeTableBuilder(data) {
                                 class="enrollment-id"
                                 value="${student.enrollmentId}"
                             />
+                            ${buildEnrollmentStatusLabel(student.enrollmentStatus)}
                             ${student.studentName}
                         </td>
                         ${buildUnities(
@@ -231,6 +232,13 @@ function GradeTableBuilder(data) {
                     </td>`
                 : ''
     }
+
+    function buildEnrollmentStatusLabel(status){
+        return `<label class="t-badge-info t-margin-none--left ${status == 'MATRICULADO' ? 'hide' : ''}">
+                    ${status}
+                </label>`;
+    }
+
     function buildUnities(unities, isUnityConcept, conceptOptions) {
         const unitesGrade = unities
             .map((unity) => {

From 7f2e323236468c1abaa4d38bd95f06648955311a Mon Sep 17 00:00:00 2001
From: AnotherOne07 <93009549+AnotherOne07@users.noreply.github.com>
Date: Fri, 18 Oct 2024 12:54:02 -0300
Subject: [PATCH 2/4] remove label for no status enrollments

---
 js/grades/functions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/grades/functions.js b/js/grades/functions.js
index 5f21a8e45..eff892431 100644
--- a/js/grades/functions.js
+++ b/js/grades/functions.js
@@ -234,7 +234,7 @@ function GradeTableBuilder(data) {
     }
 
     function buildEnrollmentStatusLabel(status){
-        return `<label class="t-badge-info t-margin-none--left ${status == 'MATRICULADO' ? 'hide' : ''}">
+        return `<label class="t-badge-info t-margin-none--left ${status == 'MATRICULADO' || status == '' ? 'hide' : ''}">
                     ${status}
                 </label>`;
     }

From af79363d5cf06d2db521f4dba1b30b5f23430c30 Mon Sep 17 00:00:00 2001
From: AnotherOne07 <93009549+AnotherOne07@users.noreply.github.com>
Date: Fri, 18 Oct 2024 15:25:18 -0300
Subject: [PATCH 3/4] add label to classdiary view accessed by instructor

---
 .../classdiary/services/StudentService.php    | 30 +++++++++++++++++--
 .../views/default/_frequencyElementMobile.php |  7 ++++-
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/app/modules/classdiary/services/StudentService.php b/app/modules/classdiary/services/StudentService.php
index 4078185a9..f9f3c493d 100644
--- a/app/modules/classdiary/services/StudentService.php
+++ b/app/modules/classdiary/services/StudentService.php
@@ -54,6 +54,8 @@ public function getFrequency($classroom_fk, $stage_fk, $discipline_fk, $date) {
                 foreach ($enrollments as $enrollment) {
                     $array["studentId"] = $enrollment->student_fk;
                     $array["studentName"] = $enrollment->studentFk->name;$array["studentName"] = $enrollment->studentFk->name;
+                    $array["status"] = $enrollment->status;
+                    $array["statusLabel"] = $enrollment->getCurrentStatus();
                     foreach($schedule as $s) {
                         $classFault = ClassFaults::model()->find("schedule_fk = :schedule_fk and student_fk = :student_fk", ["schedule_fk" => $s->id, "student_fk" => $enrollment->student_fk]);
                         $available = date("Y-m-d") >= Yii::app()->user->year . "-" . str_pad($s->month, 2, "0", STR_PAD_LEFT);
@@ -83,11 +85,33 @@ public function getFrequency($classroom_fk, $stage_fk, $discipline_fk, $date) {
     private function verifyStatusEnrollment($enrollment, $schedule)
     {
         $dateFormat = 'd/m/Y';
+        $dateFormat2 = 'Y-m-d';
+
         $date = $this->gerateDate($schedule->day, $schedule->month, $schedule->year, 0);
-        $startDate = date_create_from_format($dateFormat, $enrollment->school_readmission_date);
-        $transferedDate = date_create_from_format($dateFormat, $enrollment->class_transfer_date);
+
+        $startDate = DateTime::createFromFormat($dateFormat, $enrollment->school_readmission_date);
+        $returnDate = DateTime::createFromFormat($dateFormat, $enrollment->class_transfer_date);
+
         $scheduleDate = date_create_from_format($dateFormat, $date);
-        return !(($scheduleDate < $startDate && $scheduleDate > $transferedDate) && $enrollment->status == '13') && $enrollment->status != '2' && $enrollment->status != '11';
+        $transferDate = isset($enrollment->transfer_date) ? DateTime::createFromFormat($dateFormat2, $enrollment->transfer_date) : null;
+
+
+        switch ($enrollment->status) {
+            case '2': // TRANSFERIDO
+                $result = isset($transferDate) && $scheduleDate <= $transferDate;
+                break;
+            case '13': // Aluno saiu e retornou
+                $result = ($scheduleDate < $startDate && $scheduleDate > $returnDate);
+                break;
+            case '11': // DEATH
+                $result = false;
+                break;
+            default: // Qualquer outro status
+                $result = true;
+                break;
+        }
+
+        return $result;
     }
 
     private function gerateDate($day, $month, $year, $usecase){
diff --git a/app/modules/classdiary/views/default/_frequencyElementMobile.php b/app/modules/classdiary/views/default/_frequencyElementMobile.php
index 0d133899b..41060e149 100644
--- a/app/modules/classdiary/views/default/_frequencyElementMobile.php
+++ b/app/modules/classdiary/views/default/_frequencyElementMobile.php
@@ -16,7 +16,12 @@
     <?php foreach ($frequency["students"] as $f):
     ?>
             <tr>
-                <td><?php echo $f["studentName"]; ?></td>
+                <td>
+                    <label class="t-badge-info t-margin-none--left <?=$f['status'] == '1' || $f['status'] == '' ? 'hide' : ''; ?>">
+                        <?= $f['statusLabel'] ?>
+                    </label>
+                    <?php echo $f["studentName"]; ?>
+                </td>
                 <td class='justify-content--end'>
                         <?php foreach ($f["schedule"] as $s):
                             $is_disabled = ((!$s["available"] || !$s["valid"] ) ? "disabled" : "");

From aea2c71b66382051cf83d0e324b4c10eb422cfa5 Mon Sep 17 00:00:00 2001
From: Francisco Junior <natsujunior7@gmail.com>
Date: Mon, 21 Oct 2024 10:58:47 -0300
Subject: [PATCH 4/4] minorEducation columns added to response body

---
 app/modules/classdiary/services/StudentService.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/modules/classdiary/services/StudentService.php b/app/modules/classdiary/services/StudentService.php
index f9f3c493d..41da19e7a 100644
--- a/app/modules/classdiary/services/StudentService.php
+++ b/app/modules/classdiary/services/StudentService.php
@@ -35,6 +35,8 @@ public function getFrequency($classroom_fk, $stage_fk, $discipline_fk, $date) {
                 foreach ($enrollments as $enrollment) {
                     $array["studentId"] = $enrollment->student_fk;
                     $array["studentName"] = $enrollment->studentFk->name;
+                    $array["status"] = $enrollment->status;
+                    $array["statusLabel"] = $enrollment->getCurrentStatus();
                     $classFault = ClassFaults::model()->find("schedule_fk = :schedule_fk and student_fk = :student_fk", ["schedule_fk" => $schedule->id, "student_fk" => $enrollment->student_fk]);
                     $available = date("Y-m-d") >= Yii::app()->user->year . "-" . str_pad($schedule->month, 2, "0", STR_PAD_LEFT);
                     $valid = $this->verifyStatusEnrollment( $enrollment, $schedule);