ipti
diff --git a/‎.vscode/launch.json
Lines changed: 3 additions & 2 deletions b/‎.vscode/launch.json
Lines changed: 3 additions & 2 deletions
diff --git a/‎.vscode/settings.json
Lines changed: 2 additions & 1 deletion b/‎.vscode/settings.json
Lines changed: 2 additions & 1 deletion
diff --git a/‎CHANGELOG.md
Lines changed: 14 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 14 additions & 0 deletions
diff --git a/‎Dockerfile
Lines changed: 36 additions & 25 deletions b/‎Dockerfile
Lines changed: 36 additions & 25 deletions
diff --git a/‎app/composer.json
Lines changed: 1 addition & 1 deletion b/‎app/composer.json
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/config/main.php
Lines changed: 6 additions & 1 deletion b/‎app/config/main.php
Lines changed: 6 additions & 1 deletion
diff --git a/‎app/controllers/ClassesController.php
Lines changed: 66 additions & 1 deletion b/‎app/controllers/ClassesController.php
Lines changed: 66 additions & 1 deletion
diff --git a/‎app/controllers/FormsController.php
Lines changed: 4 additions & 2 deletions b/‎app/controllers/FormsController.php
Lines changed: 4 additions & 2 deletions
diff --git a/‎app/controllers/GradesController.php
Lines changed: 9 additions & 1 deletion b/‎app/controllers/GradesController.php
Lines changed: 9 additions & 1 deletion
diff --git a/‎app/controllers/StudentController.php
Lines changed: 1 addition & 0 deletions b/‎app/controllers/StudentController.php
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/domain/grades/usecases/ApplyFormulaOnGradesUsecase.php
Lines changed: 9 additions & 3 deletions b/‎app/domain/grades/usecases/ApplyFormulaOnGradesUsecase.php
Lines changed: 9 additions & 3 deletions
diff --git a/‎app/domain/grades/usecases/CalculateConceptGradeUsecase.php
Lines changed: 3 additions & 0 deletions b/‎app/domain/grades/usecases/CalculateConceptGradeUsecase.php
Lines changed: 3 additions & 0 deletions
@@ -8,10 +8,11 @@
             "name": "Listen for XDebug on Docker",
             "type": "php",
             "request": "launch",
-            "port": 9001,
+            "port": 9003,
+            "hostname": "0.0.0.0",
             "pathMappings": {
                 "/app": "${workspaceFolder}"
             },
         },
     ]
-}
+}
@@ -9,5 +9,6 @@
         ".vscode/": true,
         "db": true
     },
-    "phpmd.rules": "ruleset.xml"
+    "phpmd.rules": "ruleset.xml",
+    "php.version": "8.3"
 }
@@ -1,3 +1,17 @@
+## [Versão 3.89.201]
+- Adicionando o informativo de total de aulas da carga horária e total de aulas ministradas nas telas de aulas ministradas
+- Enriquecido Termo de Suspensão com Dados carregados do banco
+- Corrigido tamanho da foto 3x4 na ficha de matrícula
+- Permitido que um aluno transferido de uma turma possa voltar para a mesma turma
+- Inserido coluna turma/ano no relatório de alunos por turma em multisseriados/EJA
+- Retirando a chave estrangeira de schedule em class_contents
+- Ajuste na view de frequência para a tela de professor, especificamente para alunos com matrícula transferida
+- Ajusta na view de classdiary, atribuindo label sobre o status da matrícula do aluno
+
+## [Versão 3.89.200]
+- Correção de consulta de cardápio sagres versão nova
+- Label de status de matricula adicionado a tela de notas
+
 ## [Versão 3.89.199]
 - Adicionado a sessão de conteúdo nas aulas ministradas selecionadas na tela de aulas ministradas
 
 
@@ -1,31 +1,42 @@
-FROM ipti/yii2:7.4-fpm
+FROM ipti/yii2:8.3-fpm
 
+# Definir o diretório principal
+WORKDIR /app
+
+# Copiar arquivos para o contêiner no diretório raiz da aplicação
 COPY . /app
 
-WORKDIR /app/app
+# Executar composer update e instalar dependências no diretório secundário (/app/app)
+USER root
 
 COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
-RUN composer update
-RUN composer update with the "--no-plugins"
-RUN composer install
+
+# Criar diretórios e ajustar arquivos de configuração
+RUN sed -i "s|/app/web|/app|g" /etc/nginx/conf.d/default.conf \
+    && sed -i "s|memory_limit=128M|memory_limit=512M|g" /usr/local/etc/php/conf.d/base.ini \
+    && sed -i "s|fastcgi_pass 127.0.0.1:9000;|fastcgi_pass 127.0.0.1:9000;fastcgi_read_timeout 2400;proxy_read_timeout 2400;|g" /etc/nginx/conf.d/default.conf
+
+WORKDIR /app/app
+RUN composer update \
+    && composer update --no-plugins \
+    && composer install
+
+# Voltar para o diretório principal (/app) e executar comandos adicionais
 WORKDIR /app
-RUN sass --no-source-map --style=compressed sass/scss:sass/css
-RUN composer update
-RUN composer update with the "--no-plugins"
-RUN composer install
-ENV MUSL_LOCALE_DEPS cmake make musl-dev gcc gettext-dev libintl
-ENV MUSL_LOCPATH /usr/share/i18n/locales/musl
-RUN apk add --no-cache \
-    $MUSL_LOCALE_DEPS \
-    && wget https://gitlab.com/rilian-la-te/musl-locales/-/archive/master/musl-locales-master.zip \
-    && unzip musl-locales-master.zip \
-      && cd musl-locales-master \
-      && cmake -DLOCALE_PROFILE=OFF -D CMAKE_INSTALL_PREFIX:PATH=/usr . && make && make install \
-      && cd .. && rm -r musl-locales-master
-RUN mkdir assets
-RUN sed -i "s|/app/web|/app|g" /etc/nginx/conf.d/default.conf
-RUN sed -i "s|memory_limit=128M|memory_limit=512M|g" /usr/local/etc/php/conf.d/base.ini
-RUN sed -i "s|fastcgi_pass 127.0.0.1:9000;|fastcgi_pass 127.0.0.1:9000;fastcgi_read_timeout 2400;proxy_read_timeout 2400;|g" /etc/nginx/conf.d/default.conf
-RUN chmod 777 /usr/local/bin/docker-run.sh
-RUN chown -R www-data:www-data /app \
-&& chown -R www-data:www-data /app/assets
+RUN composer update \
+    && composer update --no-plugins \
+    && composer install
+
+# Conctruir arquivos css do sass
+RUN vendor/scssphp/scssphp/bin/pscss --no-source-map --style=compressed sass/scss:sass/css
+
+# Ajustar permissões para o usuário www-data
+RUN chown -R www-data:www-data /app/app/runtime \
+    && mkdir -p /app/assets && chown -R www-data:www-data /app/assets \
+    && chown -R www-data:www-data /app/app/export
+
+RUN chmod +x /usr/local/bin/docker-run.sh \
+    && chown www-data:www-data /usr/local/bin/docker-run.sh
+
+# Mudar para o usuário não-root
+USER www-data
@@ -11,7 +11,7 @@
     "ramsey/uuid": "^4.2"
   },
   "require-dev": {
-    "goetas-webservices/xsd2php": "^0.3",
+    "goetas-webservices/xsd2php": "^0.4",
     "goetas-webservices/xsd2php-runtime": "0.2.16",
     "phpunit/phpunit": "^8.5",
     "phpunit/phpunit-selenium": "^8.0"
 
@@ -9,7 +9,7 @@
     $scope->setUser(['email' => 'jane.doe@example.com']);
 });
 
-$LOG_PATH = "/app/app/runtime/" . INSTANCE;
+$LOG_PATH = "/app/app/runtime/" . INSTANCE . "/" . date("Y-m-d");
 
 if (!file_exists($LOG_PATH)) {
 
@@ -25,6 +25,8 @@
             'levels' => 'info, warning, error',
             'categories' => 'application',
             'logPath' => $LOG_PATH,
+            'maxFileSize' => 10240,
+            'maxLogFiles' => 5,
             'filter' => array(
                 'class' => 'CLogFilter',
                 'prefixSession' => false,
@@ -218,6 +220,9 @@
             'dsn' => getenv("SENTRY_DSN")   ,
             'jsDsn' => getenv("SENTRY_DSN"),
             'options' => [
+                'traces_sampler' => function (\Sentry\Tracing\SamplingContext $context): float {
+                    return 1;
+                },
                 'traces_sample_rate' => 1.0,
                 'release' => 'tag@' . TAG_VERSION,
                 'environment' => INSTANCE,
 
@@ -149,6 +149,8 @@ public function actionGetClassContents()
 
         $students = $this->getStudentsByClassroom($classroomId);
         $isMinorEducation = $classroom->edcensoStageVsModalityFk->unified_frequency == 1 ? true : $this->checkIsStageMinorEducation($classroom);
+        $totalClasses = $this->getTotalClassesByMonth($classroomId, $month, $year, $disciplineId);
+        $totalClassContents = $this->getTotalClassContentsByMonth($classroomId, $month, $year, $disciplineId);
 
         if (!$isMinorEducation) {
             $schedules = $this->getSchedulesFromMajorStage($classroomId, $month, $year, $disciplineId);
@@ -248,12 +250,64 @@ public function actionGetClassContents()
                 "classContents" => $classContents,
                 "courseClasses" => $courseClasses,
                 "isMinorEducation" => $isMinorEducation,
+                "totalClasses" => $totalClasses,
+                "totalClassContents" => $totalClassContents
             ]);
         } else {
             echo json_encode(["valid" => false, "error" => "Mês/Ano " . ($isMinorEducation == false ? "e Disciplina" : "") . " sem aula no Quadro de Horário."]);
         }
     }
 
+    private function getTotalClassesByMonth($classroomId, $month, $year, $disciplineId) {
+        if(!$disciplineId) {
+            return Yii::app()->db->createCommand(
+                "select count(*) from schedule sc
+                where sc.year = :year and sc.month = :month and sc.classroom_fk = :classroom
+                and sc.unavailable = 0"
+            )
+                ->bindParam(":classroom", $classroomId)
+                ->bindParam(":month", $month)
+                ->bindParam(":year", $year)
+                ->queryScalar();
+        }
+        return Yii::app()->db->createCommand(
+            "select count(*) from schedule sc
+            where sc.year = :year and sc.month = :month and sc.classroom_fk = :classroom
+            and sc.discipline_fk = :discipline and sc.unavailable = 0"
+        )
+            ->bindParam(":classroom", $classroomId)
+            ->bindParam(":month", $month)
+            ->bindParam(":year", $year)
+            ->bindParam(":discipline", $disciplineId)
+            ->queryScalar();
+    }
+
+    private function getTotalClassContentsByMonth($classroomId, $month, $year, $disciplineId) {
+        if(!$disciplineId) {
+            return Yii::app()->db->createCommand(
+                "select count(*) from class_contents cc
+                join schedule sc on sc.id = cc.schedule_fk
+                where sc.year = :year and sc.month = :month and sc.classroom_fk = :classroom
+                and sc.unavailable = 0"
+            )
+                ->bindParam(":classroom", $classroomId)
+                ->bindParam(":month", $month)
+                ->bindParam(":year", $year)
+                ->queryScalar();
+        }
+        return Yii::app()->db->createCommand(
+            "select count(*) from class_contents cc
+            join schedule sc on sc.id = cc.schedule_fk
+            where sc.year = :year and sc.month = :month and sc.classroom_fk = :classroom
+            and sc.discipline_fk = :discipline and sc.unavailable = 0"
+        )
+            ->bindParam(":classroom", $classroomId)
+            ->bindParam(":month", $month)
+            ->bindParam(":year", $year)
+            ->bindParam(":discipline", $disciplineId)
+            ->queryScalar();
+    }
+
     private function getSchedulesFromMajorStage($classroomId, $month, $year, $disciplineId)
     {
         return Schedule::model()->findAll(
@@ -454,6 +508,11 @@ private function saveClassContents($content, $schedule)
         $classHasContent = new ClassContents();
         $classHasContent->schedule_fk = $schedule->id;
         $classHasContent->course_class_fk = $content;
+        $classHasContent->day = $schedule->day;
+        $classHasContent->month = $schedule->month;
+        $classHasContent->year = $schedule->year;
+        $classHasContent->classroom_fk = $schedule->classroom_fk;
+        $classHasContent->discipline_fk = $schedule->discipline_fk;
         $classHasContent->save();
     }
 
@@ -559,6 +618,7 @@ public function actionGetFrequency()
                     $array["studentName"] = $enrollment->studentFk->name;
                     $array["schedules"] = [];
                     $array["status"] = $enrollment->status;
+                    $array["statusLabel"] = $enrollment->getCurrentStatus();
                     foreach ($schedules as $schedule) {
                         $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") >= $schedule->year . "-" . str_pad($schedule->month, 2, "0", STR_PAD_LEFT) . "-" . str_pad($schedule->day, 2, "0", STR_PAD_LEFT);
@@ -694,6 +754,8 @@ private function saveFrequency($schedule)
         }
     }
 
+    // A função abaixo deve verificar se o status de matrícula do aluno é válido para preenchimento do quadro de frequência
+    // Retorna True para o caso positivo, e False para o caso negativo
     // A função abaixo deve verificar se o status de matrícula do aluno é válido para preenchimento do quadro de frequência
     // Retorna True para o caso positivo, e False para o caso negativo
     public function verifyStatusEnrollment($enrollment, $schedule)
@@ -708,9 +770,12 @@ public function verifyStatusEnrollment($enrollment, $schedule)
 
         $scheduleDate = date_create_from_format($dateFormat, $date);
         $transferDate = isset($enrollment->transfer_date) ? DateTime::createFromFormat($dateFormat2, $enrollment->transfer_date) : null;
-
+        $enrollmentDate = isset($enrollment->enrollment_date) ? DateTime::createFromFormat($dateFormat2, $enrollment->enrollment_date) : null;
 
         switch ($enrollment->status) {
+            case '1': // MATRICULADO
+                $result = !(isset($enrollmentDate) && $scheduleDate <= $enrollmentDate);
+                break;
             case '2': // TRANSFERIDO
                 $result = isset($transferDate) && $scheduleDate <= $transferDate;
                 break;
 
@@ -192,9 +192,11 @@ public function actionWarningTerm($enrollment_id) {
         $this->render('WarningTerm', $query);
     }
 
-    public function actionSuspensionTerm() {
+    public function actionSuspensionTerm($enrollment_id) {
 
         $this->layout = "reports";
-        $this->render('SuspensionTerm');
+        $repository = new FormsRepository;
+        $query = $repository->getSuspensionTerm($enrollment_id);
+        $this->render('SuspensionTerm', $query);
     }
 }
@@ -134,10 +134,12 @@ public function actionGetUnities()
         $classroom = Classroom::model()->findByPk($_POST["classroom"]);
         $unities = GradeUnity::model()->findAllByAttributes(["edcenso_stage_vs_modality_fk" => $classroom->edcenso_stage_vs_modality_fk]);
         $result = [];
+
         foreach ($unities as $unity) {
             $result[$unity['id']] = $unity["name"];
         }
-        echo json_encode($result, JSON_UNESCAPED_UNICODE);
+
+        echo CJSON::encode($result);
     }
 
     public function actionReportCard()
@@ -568,9 +570,15 @@ public function actionGetGrades()
         $disciplineId = Yii::app()->request->getPost("discipline");
         $unityId = Yii::app()->request->getPost("unity");
 
+
+        if (!isset($classroomId) || !isset($disciplineId) || !isset($unityId)) {
+            throw new CHttpException(400, "Requisição mal formada, faltam dados");
+        }
+
         $usecase = new GetStudentGradesByDisciplineUsecase($classroomId, $disciplineId, $unityId);
         $result = $usecase->exec();
         echo CJSON::encode($result);
+
     }
 
     public function actionCalculateFinalMedia()
 
@@ -629,6 +629,7 @@ public function actionTransfer($id)
             $modelEnrollment->observation = $_POST['StudentEnrollment']['observation'];
             $modelEnrollment->create_date = date('Y-m-d');
             $modelEnrollment->daily_order = $modelEnrollment->getDailyOrder();
+            $modelEnrollment->enrollment_date = $currentEnrollment->transfer_date;
 
             $hasDuplicate = $modelEnrollment->alreadyExists();
 
 
@@ -7,25 +7,31 @@
  */
 class ApplyFormulaOnGradesUsecase
 {
+    private $calculation;
+    private $grades;
+    private $weights;
+
     public function __construct($calculation, $weights = [])
     {
         $this->calculation = $calculation;
         $this->weights = $weights;
     }
 
-    public function setGrades($grades){
+    public function setGrades($grades)
+    {
         $this->grades = $grades;
         return $this;
     }
 
-    public function setWeights($weights){
+    public function setWeights($weights)
+    {
         $this->weights = $weights;
         return $this;
     }
 
     public function exec()
     {
-        if(empty($this->grades)){
+        if (empty($this->grades)) {
             throw new Exception("Não foram adicionadas notas antes de excutar o caso de uso", 1);
         }
 
 
@@ -6,6 +6,9 @@
  */
 class CalculateConceptGradeUsecase
 {
+
+    private $classroomId;
+    private $discipline;
     public function __construct($classroom, $discipline)
     {
         $this->classroomId = $classroom;
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@`
`9`	`9`	`".vscode/": true,`
`10`	`10`	`"db": true`
`11`	`11`	`},`
`12`		`- "phpmd.rules": "ruleset.xml"`
	`12`	`+ "phpmd.rules": "ruleset.xml",`
	`13`	`+ "php.version": "8.3"`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -192,9 +192,11 @@ public function actionWarningTerm($enrollment_id) {`
`192`	`192`	`$this->render('WarningTerm', $query);`
`193`	`193`	`}`
`194`	`194`
`195`		`- public function actionSuspensionTerm() {`
	`195`	`+ public function actionSuspensionTerm($enrollment_id) {`
`196`	`196`
`197`	`197`	`$this->layout = "reports";`
`198`		`- $this->render('SuspensionTerm');`
	`198`	`+ $repository = new FormsRepository;`
	`199`	`+ $query = $repository->getSuspensionTerm($enrollment_id);`
	`200`	`+ $this->render('SuspensionTerm', $query);`
`199`	`201`	`}`
`200`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,25 +7,31 @@`
`7`	`7`	`*/`
`8`	`8`	`class ApplyFormulaOnGradesUsecase`
`9`	`9`	`{`
	`10`	`+ private $calculation;`
	`11`	`+ private $grades;`
	`12`	`+ private $weights;`
	`13`	`+`
`10`	`14`	`public function __construct($calculation, $weights = [])`
`11`	`15`	`{`
`12`	`16`	`$this->calculation = $calculation;`
`13`	`17`	`$this->weights = $weights;`
`14`	`18`	`}`
`15`	`19`
`16`		`- public function setGrades($grades){`
	`20`	`+ public function setGrades($grades)`
	`21`	`+ {`
`17`	`22`	`$this->grades = $grades;`
`18`	`23`	`return $this;`
`19`	`24`	`}`
`20`	`25`
`21`		`- public function setWeights($weights){`
	`26`	`+ public function setWeights($weights)`
	`27`	`+ {`
`22`	`28`	`$this->weights = $weights;`
`23`	`29`	`return $this;`
`24`	`30`	`}`
`25`	`31`
`26`	`32`	`public function exec()`
`27`	`33`	`{`
`28`		`- if(empty($this->grades)){`
	`34`	`+ if (empty($this->grades)) {`
`29`	`35`	`throw new Exception("Não foram adicionadas notas antes de excutar o caso de uso", 1);`
`30`	`36`	`}`
`31`	`37`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,9 @@`
`6`	`6`	`*/`
`7`	`7`	`class CalculateConceptGradeUsecase`
`8`	`8`	`{`
	`9`	`+`
	`10`	`+ private $classroomId;`
	`11`	`+ private $discipline;`
`9`	`12`	`public function __construct($classroom, $discipline)`
`10`	`13`	`{`
`11`	`14`	`$this->classroomId = $classroom;`