release/v3.93.212 (#906)

* Feat/md5 to bcrypt (#616)

* Feat: md5 modified for bcript in user creation function

* Feat: Update password length validation, extending maximum allowed characters to 60.

* Feat: added bcriptHash in AdminController

* Feat: added bcriptHash

* Feat: added class PasswordHasher

* Feat: added bcriptHash in instructor create

* Feat: added bcrypt authenticate user

* Feat: added file migration

* Feat: added modification in changelog

* Feat: no sonar

* Fix: md5 Make sure this weak hash algorithm is not used in a sensitive context here.

* Fix: md5 Use of Password Hash With Insufficient Computational Effort

* Fix/meals (#621)

* consertando a listagem de refeições

* alterado changelog e config.php

* escondendo botão de lista de compras

* create migration

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Icon font version update

* Fix/synchronize sedsp student data (#623)

* Feat: added validation to ensure a value for classroom_fk

* Feat: Added return for error when importing classes

* Feat: added changelog

* Feat/foods report (#622)

* created shoppingListReport

* aumentado tamanho das celulas no relatório de lista de compras

* alterado relatório

* alterado relatório de lista de compras

* shoppingListReport finalized

* shoppingListReport finalized

* adicionada migration

* mudando changelog

* sonarcloud issues

* Corrigindo o botão de lista de compras

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>

* [3.69.107]Fix/report_head_poco_dantas (#617)

* feat/rename head

* fix/ add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/food inventory style (#618)

* fix(foods): Modificando o estilo do botão dos botões de movimentações na tabela de estoque e escondendo o botão de solicitacoes na tela de estoque

* Modificando versão do changelog

* Corrigindo a duplicidade do código

* fix(foods): Corrigindo o estilo da tela de estoque, as colunas status e entrada/saida atualizadas para facilitar a usabilidade

* Modificando versão do changelog e realizando o merge com a dev

* Resolvendo issues

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/report card unities (#614)

* Fixing reportCard grades

* fix(grades): Corrigindo a disposição de unidades de lançamento de notas de búzios, permitindo que sejam adicionadas notas maiores de 10 em lançamento de notas e adicionada a verificação de recuperação final

* Fazendo o merge com a dev e alterando o changelog

* Fixing code smells

* Corrigindo o valor da média final quando nem todas as unidades estavam preenchidas na tela de lançamento de notas

* feat/modify head

* feat/add changelog

* fixing code security failure

* Corrigindo erro de segurança

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Evellyn Jade <97754536+evellynreis@users.noreply.github.com>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Realizando o merge com a dev e criando as tabelas de farmer

* Criando tela de cadastro de agricultor

* Fix/cod municipio dne (#620)

* Feat: added city code

* Feat: added memory limit to 2048M for importMaster

* Fix: remoção de validação sem uso

* Feat: added Código Ubatuba

* Feat: added migration

* Feat: adicionado alterações no changelog

* Fix: Correção na obtenção do CPF do estudante para o arquivo SAGRES: (#625)

* Fix: get student cpf

* Feat: added changelog

* Feat: adicionado nova versão

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* criado módulo de dashboard (#632)

* criado módulo de dashboard

* sonarlint issues

* change version

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Criando esqueleto da tela de cadastro de agricultor

* Criando verificações

* Criando verificação de relação de produtos

* Feat/button alphabetic order (#631)

* feat(classroom): Adicionando o botão de ordem alfabética na aba de ordem de diário no formulário de turmas

* Modificando a versão do changelog e fazendo o merge com a dev

* Corrigindo issues

* Corrigindo issues

* Corrigindo issues

* Corrigindo irregularidade

* Corrigindo irregularidade

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix/add input no (#633)

* fix/add input no

* fix/config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [Versão 3.71.112] Fix/class plan abilities view (#628)

* first commit

* modal created

* events added to buttons

* js changes

* manipulating form and events related to it

* form and route is already working but still missing update select and actionCreate

* modal finished and select already is been updated

* minor changes

* almost there, still missing to fill type field in form

* form is already working but still need to fix the style

* funcionality is already working, but still needs to fix the layout yet

* removing unnecessary comments

* remove comment

* fix remove resource from list

* 💄feat/badge style updated

* 💄feat/fix icon style and padding in button

* 🗃️raw/upload sql changes and CHANGELOG update

* 🗃️raw/upload sql changes and remove comments

* small change on placeholder in modal

* 🏷️fix/removing var declared variables

* 🏷️fix/removing sonarlint issues

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* main.css

* Feat calendar surpassing year (#619)

* primeiro commit da branch

* feito parcialmente calendário

* retirado função de disponibilizar calendário

* update do calendar_fk das turmas

* adequado vigencia das unidades

* calendario supostamente finalizado

* quadro de horário com add/change/remove schedule pendentes

* refatorado quadro de horário com ano passando

* reinserido schedule

* corrigido bug no carregamento dos hardunavailabledays e na geração do quadro de horário

* o alerta de alteração de data do calendario nunca aparecia

* Adequado selects em aulas ministradas e frequencia

* Adição dos calendarios no cadastro das turmas

* alterado sql

* Merge

* fix sonarcloud

---------

Co-authored-by: paulones <Ppcc8986>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Criando a action de save no controller de farmer register

* fix merge

* Criando a tabela de visualização de agricultores

* Criado as telas de relacionadas a agricultor

* fix/variable declared incorrectly in function scope

* Adicionando a school_fk e o status em food_request

* conectando com o firebase

* Realizando integração com o firebase

* Corrigindo erros do sonarlint

* Corrigindo errors sonarlint

* Corrigindo erros do sonarlint

* Corrigindo issues alertados pelo sonarlint

* Corrigindo issues

* Feat/change food measurement (#635)

* create migration

* adicionando input de quantidade

* mudando componente de cardápio

* alterado food_measurement

* change reports

* mudado componente de cardápio

* alterado food_measurement

* alterado food_measurement

* alterado food_measurement

* alterado food_measurement

* sonarlint issues

* resolve conflicts

* sonarlint issues

* main.css

* mudado componente de cardápio

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>

* [TCDA-240] Fix/load schedules by discipline (#637)

* 🐛fix/minor fundamental conditional fixed

* :docs:docs/CHANGELOG updated

* fix/function parameter fixed

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat: case added for class 22 and multi alias (#638)

* Feat: case added for class 22 and multi alias

* Feat: added changelog

* Feat: added version in config

* Feat: added case 2 for class

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix: gestor not edit calendar (#640)

* Fix: gestor not edit calendar

* Feat: added version in changelog e config

* Feat: added menu for calendário para professor

* Feat: added acess for admin

---------

Co-authored-by: AnotherOne07 <93009549+AnotherOne07@users.noreply.github.com>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix/poco_dantas (#643)

* fix/ add cep formated

* fix/ add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* rename food folders

* fix: rename foodrequest folder

* fix file rename

* consertado redirecionamento em Foodmenu

* fix: rename folder

* fix: delete file

* Feat/warning missing content (#639)

* Apresentação de duas listas na pagina inicial

* Apresentação dos primeiros warns e estrutura contada

* Mais warnings avaliados

* Alertando todos os problemas pedidos

* Limite de quantidade de warns e ajustes

* inserido painel de cadastros pendentes 100%

* inserindo validação pra gestor escolar

* updating name branch

* ajeitado painel de cadastros pendentes

* bug phps

* bug phps

* renomeado pra maiusculos novamente

* renomeado pra maiusculos novamente

* renomeado pra maiusculos novamente

* corrigido incongruências de case sensitive

* corrigido incongruências de case sensitive

* retirado conflito de foodmenu.php

* config e changelog

---------

Co-authored-by: paulones <Ppcc8986>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/frequency_75 (#644)

* fix/ add property frequency in use case

* fix/add function get and set

* fix/modify controller

* fix/add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/scholarity sql column removed (#645)

* Fix/scholarity sql column removed

* Feat: added new version in changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/merenda escolar (#648)

* first commit

* first commit

* Ajustes visuais na tela de cadastro de cardápio

* Ajustes visuais na tela de cadastro de cardápio

* change foodmenu

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fixing tag version number

* Fixing changelog

* Feat/food notice (#650)

* finalizado crud de edital

* adicionado botão para editais na tela de listagem de merenda

* update migration

* github issues

* sonnar issues

* atualizado versão do sistema

* ignore case

* corrigindo viewlunch

* rename file

* rename file

* fix: creating notice button and fixing delete notice redirection

* consertado o redirecionamento na actionDelete

* fix folders

* fix some sonarcloud issues

* sonarlint issues

* sonarlint issues

* sonarlint issues

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/no_notes (#651)

* fix/sets status to one

* fix/ add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/corrections and improvements (#655)

* Feat: added limit for not accessing future month

* Fix: correction in attribute id_school

* Fix: added inepId for inconsistencys

* Fix: removed integer $inep_id

* Fix: added filter for auth assignment

* Feat: added new version in changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix: added food Enabled (#654)

* Fix: added food Enabled

* Feat: added migration

* Feat/boquim integration (#652)

* sqls para rodar nos bancos velhos de boquim

* testado import de vanda 100%

* ORGANIZADO SQLS

* minor fix

* Adaptado educacenso para importar dados quando não há professor;
Melhorado tela de turma para não remover o teaching data quando não tem teaching_matrix;
organizado melhor os arquivos SQL

* aprimorado o readme

* Integração dos bancos de boquim do TAG. Como foi reformulado o arquivo de importação. essa branch precisa ser merjada

* update logs

* fix: alterando condição de isStudent para importação do arquivo original do censo

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/instructor frequency (#657)

* sqls para rodar nos bancos velhos de boquim

* testado import de vanda 100%

* ORGANIZADO SQLS

* minor fix

* Adaptado educacenso para importar dados quando não há professor;
Melhorado tela de turma para não remover o teaching data quando não tem teaching_matrix;
organizado melhor os arquivos SQL

* aprimorado o readme

* Integração dos bancos de boquim do TAG. Como foi reformulado o arquivo de importação. essa branch precisa ser merjada

* update logs

* Frequência do professor

* fix update log

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/added professional for different schools (#659)

* Feat: added professional for different schools

* Fix: remove unique for cpf_professional

* Feat: added new version in changelog and config

* Feat: added new version in changelog and config

* ci: add release sql

* fix: added msg for inconsistency sagres (#626)

* Feat: added msg for inconsistency sagres

* Fix:  modified code with only the first letter of "description" and "action" capitalized

* Fix: corretion in uninitialized value

* Fix/manager not authorized for school pdf (#661)

* Fix: manager authorized for school pdf

* Fix: set id student inconsistency sagres

* Feat: added new version in changelog and config

* Fix de teste da falta de curricular matrix e notas

* logs

* Icon font version update

* Feat: added new version in changelog and config

* Feat/added professional for different schools (#665)

* Feat: added professional for different schools

* Fix: remove unique for cpf_professional

* Feat: added new version in changelog and config

* Feat: added new version in changelog and config

* Fix: correction in find professional

* Fix: correction in inep_id (#664)

* Fix: correction in inep_id

* Feat: added new version in changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix: correction in description class (#668)

* Fix: correction in description class

* Feat: added new version for changelog and config

* Fix: Define a constant instead of duplicating this literal "<strong>SÉRIE<strong>" 4 times.

* Feat/food notice (#647)

* finalizado crud de edital

* adicionado botão para editais na tela de listagem de merenda

* update migration

* github issues

* sonnar issues

* atualizado versão do sistema

* ignore case

* corrigindo viewlunch

* rename file

* rename file

* fix: creating notice button and fixing delete notice redirection

* consertado o redirecionamento na actionDelete

* fix folders

* fix some sonarcloud issues

* sonarlint issues

* sonarlint issues

* sonarlint issues

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Gustavo Santos <gustavo.santos23703@gmail.com>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/create farmer register (#653)

* Pegando as informações do firebase

* realizando o merge com a dev e modificando o changelog

* Corrigindo o controller farmerregister

* Pegando o cadastro do agricultor de acordo com o seu cpf

* Conectando o update do agricultor com o firebase

* Finalizada conexão para alteração do agricultor no firebase

* Permitindo a atualização e a exclusão no firebase e adicionando verificações de cpf

* Corrigindo issues

* corrigindo code smells

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* corrigido bug produzido em 15/03/2024

* Fix/add lunch unities [Versão 3.77.132] (#677)

* add lunch unities

* mudado versão do sistema

* Feat/school management signature (#675)

* Feat: added school management signature

* Feat: added new version for changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/date corrections (#673)

* Fix: correction in the student date field

* Fix: correction in the school initial_date field

* Fix: correction in the Instructor birthday_date field

* Feat: added validation for duplicate cpfs

* Feat: added function for validate cpf

* Feat: added new version form changelog e config

* Feat: only takes active schools

* Fix: corrections for dates

* Fix: correction in js validation for initial_date

* Feat: added limit for date initial_date

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/instructor frequency [Versão 3.77.131] (#676)

* alterado _initialization_instructor

* fix instructor frequency

* fix instructor frequency

* mudado versão do sistema

* refatorado _initialization_instructor.js

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix: Reordered parameters in getSchedulesFromMajorStage method (#667)

* Fix: Reordered parameters in getSchedulesFromMajorStage method

* Feat: added new version in changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix: remove jquery

* Fix/sagres componentes curriculares (#691)

* Fix? added new inconsistencys for empty components curriculares

* Feat: added new version for changelog and config

* Icon font version update

* add bytecodes

* Fix/class turn (#683)

* Fix: correction in class id

* Feat: added new version for changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-214] Feat/class plan validate  (#694)

* first commit

* models adjustment and module configs

* create view finished

* create action finished/ update function already working

* pendingPlans added

* ref/module adjusted

* table finished, just missing the action to validate

* new inputs added

* function adjusted

* minor adjustment

* request added

* feat/forms finished, just missing to create a new type of access

* feat/create button to enable edition

* feat/add readonly property to fields that shouldn't be change

* feat/observation field added to form

* fix/date fixed and hiding buttons depending on auth item

* docs/CHANGELOG e config.php updated

* fix/update description in select itens

* fix/sanitize html appends and sonarlint issues

* fix/sonarlint and change description

* feat/icons inserted

* fix/icon styles

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/datepicker pt br (#693)

* Feat: added class DatePickerWidget

* Fix: added new renderDatePicker

* Fix: added new renderDatePicker for school

* Fix: added new renderDatePicker for student

* Feat: added new version for changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/inconsistency lunch (#679)

* fix: added new id for lunch inconsistencys

* Feat: added property for class model

* Feat: added min caractres for restrictions lunch

* Feat: added msg for error

* Feat: added new version for changelog and config

* Feat: added migration

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/food module (#672)

* fix merenda

* alterando menuCOmponent

* mudado componente de menu

* mudando componente de cardápio

* mudado componente de cardápio

* mudando FoodMenuReport

* mudando componente de cardápio

* change componente de menu

* corrigido componente de cardápio

* change menuComponent.js

* alterada versão do tag

* fix inventory

* alterado _initialization.js

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-232] Fix/lunch meal portion (#669)

* fix/select now shows food values

* fix:modal updated and necessary API routes created

* fix/lunch meal controller adjusted

* fix/model updated, database adjusted but still missing controller fixes

* fix/change in render partial params

* fix/some forms are already working

* fix/form and action finished

* fix/remove unnecessary comments

* CHANGELOG updated

* fix/sonarlint fixes

* fix(lunch): Corrigindo comando sql da migration

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Gustavo Santos <gustavo.santos23703@gmail.com>

* Fix/stock [Versão 3.77.135] (#686)

* fix/stock

* atualizado versão do tag

* refatorada a função de concatName

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/instructor frequency (#689)

* alterado _initialization_instructor

* fix instructor frequency

* fix instructor frequency

* mudado versão do sistema

* refatorado _initialization_instructor.js

* fix/intructor_frequency

* fix/intructor_frequency

* corrigindo frequency_instructor

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* add 2024-29-04_remove_duplicate_lunch_unity

* Fix/food inventory (#707)

* fix food inventory

* sonarlint issues

* atualizando versão

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>

* [TCDA-318] Feat/insert-disorder (#701)

* feat/create table student_disorder

* feat/modify StudentFileForm disorder

* feat/add field disorder in form student

* feat/add model student disorder

* feat/add echo model StudentDisorder in form student

* feat/migration

* feat/modify controller student action update and create

* feat/add margin

* feat/add column of nationality

* feat/add constraint

* feat/save studentDisorder

* feat/modify label others

* feat/modify field deficiency

* feat/add margin

* feat/modify label

* Fix/counting faults (#674)

* Fix: added filter for schedule year

* Fix: correction in sql for get number faults

* Fix: remove selection for s.year

* Feat: added new version in changelog and config

* Fix: added filter for edcenso_stage_vs_modality_fk to get faults

* Fix: added set 0 for null days

* Fix: count falts

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix: delete user

* fix/courseplan start date field fixed

* [TCDA-380] Fix/ Add Nationality Origin To StudentFile (#700)

* fix/add nation to report

* fix/report file and studentfile view updated

* fix/adjust in report view

* CHANGELOG updated

* raw/studentfile view updated

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA - 392] Fix/Scrollbar Visualization (#705)

* fix/hide property removed from table

* CHANGELOG & config.php updated

* fix/sticky property added to student name column

* minor changes

* fix/add sticky property to empty cells

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix/reports-correction (#708)

* [TCDA-394] fix/do-not-fill-grade (#711)

* fix/add option select...

* fix/add assignment of option outside of condition

* fix/add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-422] Fix/layout problem (#712)

* Refactor: Enhanced UI and adjusted student data iteration

* Refactor: Optimized updateStudentAnottations function for better data handling

* Refactor: Enhanced updateStudentAnottations function for better data organization

* Feat: added new verson in changelog and config

---------

Co-authored-by: Nathan Santos <nathanaelsantos15@gmail.com>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-380] Fix/ Report Style (#713)

* fix/row colspan fixed and new sql view added to migrations

* fix/string format converter removed

* docs/CHANGELOG and version file updated

* fix/view sql file fixed

* Fix: correction of the modality options

---------

Co-authored-by: Nathan Santos <ti.natan@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-436] Feat: students-class-report (#714)

* Feat: added migration

* Feat: added new version for changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-157] Fix/erro-message-educacenso (#715)

* fix/correction rule instructor educacenso

* fix/ add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix: correction in id student identification (#716)

* Fix: correction in id student identification

* Feat: added new version for changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-446] Feat/date-final (#717)

* feat/ add date final form school

* feat/identation html

* feat/add click reset js

* feat/update reset js

* feat/add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-437] Feat/validator-register-civil (#720)

* feat/update model

* feat/update function validateCivilRegister, and message added error

* add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-426] Fix/empty_users_fk_istructor_identification (#721)

* Refactor user creation and school assignment logic

* Feat: added new version for changlog and config

* Feat: added visibility should be explicitly declared

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/timesheet overwrite past days (#704)

* permitido que adicione/remova schedule quando houve frequencia ou aula ministrada em data mais recente

* feito com que, na remoção do primeiro schedule do dia, nao detone a aula ministrada do dia (salvo se todas as schedules do dia forem deletadas)

* changelog

* feito a regra de removeSchedule também abarcando fundamental maior, pois a regra de cadastro de aula ministrada é a mesma (só guarda no primeiro schedule da disciplina)

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* change power bi module

* [TCDA-475] Fix/erro-educacenso-stage (#719)

* fix/create migration update modality classroom

* fix/update form, and added option education professional

* fix/update form

* fix/correction function isValidProfessionalEducation

* revert instance

* Fix/error-pdf-studentfileform (#724)

* fix/ refatoring html

* fix/correction form

* fix/add margin css print

* correction merge

* fix/correction sonarlint css and add div head

* fix/correction table th, and modify indice 21

* fix/add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/edcenso 2024 (#730)

* Adaptação para o educacenso 2024

* Inserido situação de matrícula AVANÇADO

* changelog

* Update config.php

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-464] fix/delete-enrollmet (#731)

* fix/edit name link, of delete enrollment

* add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/error-educacenso-duplicated (#734)

* fix/refactoring actionvalidate in class censo controller

* fix/implementing processed instructor

* fix/add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/correction-datepicker-last (#739)

* fix/correction option max date, function renderDatePickerFinal

* fix/add changelog

* correction render date picker final

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-523] fix/error-classContents (#735)

* fix/correction error class contents, array of schedules null

* fix/add changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Adicionando o código do professor na listagem da tabela (#746)

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>

* Adicionando o código na exibição da tabela de turmas (#747)

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Adicionando o código na exibição da tabela de alunos (#748)

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* retirado regra velha de registros com numeros defasados

* enviando apenas matriculas de alunos cujo status esteja 1 (matriculado)

* permitido que se exporte matrículas com status NULL

* resolvido bug de inep_id de instructor_documents_and_address vazio SOBRESCREVENDO o inep_id preenchido (ou não) de instructor_identification.

* Feat/teacher classrons list (#754)

* first commit

* criada aba para visualisação das turmas dos professores

* remove links

* add sanitize

* adicionando link

* Corrigindo o instance

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>

* Feat: new inconsistency for Management Unit (#749)

* Feat: new inconsistency for Management Unit

* Feat: add new version for changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/timesheet turn (#738)

* Corrigido o turno que é exibido no quadro de horário

* refresh versão

* corrigido bug produzido em 15/03/2024

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-533] Fix/transfered student frequency (#741)

* issue fixed

* CHANGELOG and config updated

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/add sem recovery (#742)

* first commit

* change grade structe

* change form

* change grades-structure

* adicionado validações no formulário de estrutura de unidades e avaliação

* change grades structure

* change  grades-structure

* created updateGradePartialRecoveryUseCase

* recuperação parcial salva

* change grade-structure

* mudado grades-structure.js

* mudado grades-structure.js

* mudado grades-structure.js

* mudado grades-structure.js

* adicionado filtro na tela de notas

* mudado grades-structure.js

* mudado grades-structure.js

* change functions.js

* change functions.js

* mudado módulo de  grades

* mudado módulo de  grades

* salvando recuperações

* mudado módulo de  grades

* salvando recuperações

* reuperações salves em grades results

* mudado módulo de notas

* reuperações salves em grades results

* adicionado peso nas recuperações parciais

* reuperações salves em grades results

* adicionado peso nas recuperações parciais

* atualizado UpdateGradePartialRecoveryUseCase.php

* adicionadas recuperações parciais

* change version

* adicionada validação no formulário de grades-structure.js

* alterado recuperações parciais

* fix bugs

* fix some bugs

* add new column on grade table

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-380] Fix/enrollment report nationality (#745)

* migration added and report updated

* CHANGELOG and config updated

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/stage edcenso field to name (#755)

* fix(stages): Adicionando o código na exibição da tabela de alunos

* Modificando a visualização da etapa relacionada ao educacenso no formulário de etapas

* Inicializando o select2 no select de etapa

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-463] Fix/class specification report (#718)

* Feat: added classroom

* Feat: get name classroom

* Feat: added filter by type EJA and Mult

* Feat: added new version for changlog and config

* Fix: implemented getEjaClassroomName function for report generation

* Fix: correction in get classrom by multi

* Fix: correction in get name student classroom

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/head school required (#757)

* fix(school): Retirando a obrigatóriedade do código da escola sede no formulário de escola

* fix(school): Retirando a obrigatóriedade do código da escola sede no formulário de escola

* corrigindo changelog

* fazendo o merge com a dev e modificando o changelog

* Fix/food adjustments (#770)

* first commit

* add school saturday

* add unit inputs

* change menuComponent.js

* change food reports

* some fixes

* adicionado validação para os diferentes tipos de usuário

* change version

* change stock

* Adicionando filtro de status na tela de estoque

* change menuComponent

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Gusta-Santos01~ <gustavo.santos23703@gmail.com>

* fix/index-food-menu

* fix/index-food-menu

* fix food action Index

* [TCDA-526] Fix/Instructor Imported Without User (#751)

* first commit, usecase created

* fix/update user now create a new user if cpf is added and user doesn´t exist

* docs updated

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix: dynamic width for lesson plans (#758)

* Feat/csv exports (#760)

* Criando arquivo CSV bruto e tela de exportações

* Ajustado delimitador das colunas e testes

* COlocando o resultado de uma query em um csv

* Impressão de todos os CSV's

* Ajuste pra exportar o CSV igual ao JSON

* corrigido campo solto na tela

* Ajuste na geração do arquivo para criar as pastas

* criado exportadores de alunos, notas e faltas

* inserido changelog

* alterado nome de colunas de recuperação semestrais para ficar em conformidade com o migration de mudança de nomes de colunas

* alterado nomes novamente

* ajeitado erro na exportação de grades

* aprimorado exportação de notas pra sempre trazer todas as disciplinas, com apenas as notas vazias

* ajeitado exportação de faltas dos alunos

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/frequency multi classes (#763)

* fix/frequency-multi-classes

* change _initialization.js

* fix/frequency-multi-class

* Alterado o _initialization_instructor.js

* finalizadas correções para turmas multiseriadas

* change version

* change changelog.md

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat: classroom_qtd_students (#772)

* Feat: added migration

* Feat: added new changelog and config

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-634] Fix: Inconsistency for students born in the current year (#787)

* Fix: date of birth

* Feat: added new version for changlog and config

* Define a constant instead of duplicating this literal "Data da matrícula no formato inválido: <strong>" 3 times.

* Define a constant instead of duplicating this literal "d/m/Y" 10 times.

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/add created at and update at (#779)

* add behaviors

* add behaviors

* created migration

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>

* [TCDA-609] Fix/Course Plan Loading Delay (#781)

* first commit

* refactor, only missing update the table

* selects finished but still missing update the table

* functionality finished but still missing investigate

* small fixes

* docs updated

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix(reports): Corrigindo o relatório de professores por escola para que o mesmo exiba somente os professores da escola que estão ligados a turmas (#782)

Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/new recovery calculation (#788)

* first commit

* change grade structure

* change grades

* add semester field

* add semester field

* change calulateNumericGradeUseCase

* change grades

* change calulateNumericGradeUseCase

* created new grade calculation

* created new grade calculation

* fix exhibition

* created new grade calculation

* new grade calculation

* mudado ata de notas

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/rename column type to methodology (#790)

* label for objective and type changed

* courseplan resource duplication on method fixed

* add sql file

* fix sql commands

* docs updated and classes added to form

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/create aee record (#791)

* Criados os esqueletos das telas Ficha Aee

* Corrigindo exibição inicial da ficha e atualização

* Corrigindo action de update

* Criado o esqueleto do pdf da ficha aee

* Criando esqueleto do relatório

* Corrigindo a exibição do index

* feat(aeeRecord): Criado o módulo de ficha AEE, permitindo o cadastro, alteração e impressão de fichas de alunos pertencentes a turmas AEE

* Modificando o changelog

* Corrigindo errors do sonarlint

* Corrigindo o instance

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-534] Fix/Student Transfered New Enrollment (#764)

* first commit

* remove sql change and add new column to schedule object sent to front

* model adjusted and inputs added to form

* up temp changes

* event added to select still missing to show the inputs

* input now are been hidden, still missing to update values and check validations

* input hide or show according to status input and mask added to inputs

* minor changes

* SQL migration added and docs updated

* remove sonarlint issues

* temp changes

* remove unnecessary comments

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/courseplan batchclassroom (#776)

* Retirado opções de 8 anos no batchupdate de classroom; aumentado campo tipo de 100 para 1000 caracteres

* corrigido bug no aparecimento do plano de aula, bem como contagem errada nas aulas ministradas

* Corrigido bug no datatable

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix create nutritionist profile

* fix(food): Retirando a obrigatóriedade do campo de validade no lançamento de estoque e corrigindo erro ao adicionar alimento que já existe no estoque de  outra escola (#798)

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>

* Fix/Search input disabled (#799)

* fix/rename function

* CHANGELOG added and update function name

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/report electronic diary data (#796)

* first commit

* fix/report-eletronic-diary-data

* fix/report-eletronic-diary-data

* fix/report-eletronic-diary-data

* change version

* git issues

* git issues

* change validation on grade-sctruture

* updating GradeResults model

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>

* Fix/aee record permissions (#797)

* Modificando as permissões de acesso as fichas AEE, permitindo que gestores escolares e coordenadores acessem

* Corrigindo a variável de banco de dados no instance

* Modificando o changelog

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/increase maximum number of characters in fields aee (#805)

* first commit

* change version

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix no select da estrutura de unidades, "Forma de Cálculo" da rec. final (#807)

* Feat/enrich stage creation (#804)

* COlocando o resultado de uma query em um csv

* Inserido a modalidade da etapa;
Impedido que se vincule uma etapa do censo a outra etapa do censo;
Impedido deletar etapa do censo

* Resolvido problema do plano de aula não deletando

* [TCDA-614] Fix/add creation date enrollment view (#795)

* Adicionada a exibição da data de matricula do aluno em uma turma na aba de matrículas no formulário do aluno

* Atualizando o changelog

* Corrigindo instance

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/Student frequency (#801)

* fix/last change fixed

* instructor frequency fixed

* add death status to conditional

* fix/conditional fixed

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/courseplan abilities early years (#808)

* Criando select de minor education disciplines

* Resolvendo modificações de plano de aula

* Modificando a tabela dos planos de aula

* Corrigindo class contents e adicionando separação por habilidades

* Exibindo planos de aula com mais de uma disciplina na listagem de planos de aula em aulas ministradas

* Permitindo a adição de habilidades de disciplinas diferentes em planos de aula para etapas de fundamental menor

* Realizando o merge com a dev e modificando o changelog

* modificando o nome do banco de dados

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* inserido cor/raça na planilha de exportação de alunos (#817)

* adding log

* chore: adding separete folder to logs

* chore: adding monitoring and log

* Feat/change classdiary (#822)

* first commit

* mudado módulo de diário de classe

* update classDiary

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>

* Feat/change classdiary (#825)

* first commit

* mudado módulo de diário de classe

* update classDiary

* update classDiary

* update classDiary

* consertado módulo de  diário de classe

* change version

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>

* fix: raven capture error

* fix: correç~]ao de lançamento de aulas ministradas

* add_edcenso_associated_stage_id (#835)

* fix: error on order by actions

* change version

* chore: removendo comentário

* Fix/ Delay on courseplan loading (#819)

* first commit

* create new file for table and add selects

* selects and table are already working but still having some bugs

* functions finished

* CHANGELOG and config updated

* css classes updated

* sanitize html rendering

* sonarLint issues fixed

* change type on criteria

* Feat/unified frequency (#840)

* feat/unified-frequency

* change version

* finished unified frequency

* fix-classcontent-classdiary-module

* tab list fix

* Feat/reports enrichment (#841)

* inserido relatório de certificado de conclusão;
inserido bncc e parte diversificadora no relatório de ata de notas da turma

* fix no select da estrutura de unidades, "Forma de Cálculo" da rec. final

* inserido termo de suspensão

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Aprimorado ficha de matrícula, inserido mais opções de documentos entregues (#843)

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* [TCDA-699] Feat/Frequency for transfered students (#848)

* Add new check to function verifyStatusEnrollment

* changelod updated

* Update sonarcloud-analysis.yml

* Update sonarcloud-analysis.yml

* Update sonarcloud-analysis.yml

* fix: sagres food_menu

* change version

* fix getGrades withaut params

* chore: improve error capture on raven-js

* ci: enable tracing

* ci: upgrade php version to 8.3

* fix: directory permission and remove node global installer

* fix deprecated

* fix grades

* [TCDA-705]Feat/Add enrollment status label to Grades view (#849)

* Add enrollment status label to grades view

* remove label for no status enrollments

* add label to classdiary view accessed by instructor

* minorEducation columns added to response body

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/Student Frequency New Classroom (#853)

* Add new check to function verifyStatusEnrollment

* changelod updated

* Add new column 'enrollment_date' on student_enrollment

* Fix frequency on new classroom and add label to instructor frequency view

* add label to frequency view

* Fix/change class contents schedule (#857)

* Criando o sql que modifica a tabela de class_contents

* Adicionando campos em class contents

* Retirando a chave estrangeira de schedule em class_contents e adicionando campos relacionadoos a data na sua tabela

* Modificando o changelog

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Múltiplas correções (#858)

* ver changelog 3.89.198

* changelog

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/add classes count on class contents (#864)

* Adicionando o total de aulas ministradas e aulas da carga horária nas telas de aulas ministradas

* Adicionando o badge no informativo de total de aulas ministradas

* Adicionando o informativo de total de aulas da carga horária e total de aulas ministradas nas telas de aulas ministradas

* Corrigindo o texto informativo de total de aulas na tela de aulas ministradas

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* adicionado formulada média para o cálculo da recuperação final (#876)

* adicionado formulada média para o cálculo da recuperação final

* change version

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>

* Fix/class contents report (#880)

* Adicionando o total de aulas ministradas e aulas da carga horária nas telas de aulas ministradas

* Adicionando o badge no informativo de total de aulas ministradas

* Adicionando o informativo de total de aulas da carga horária e total de aulas ministradas nas telas de aulas ministradas

* Corrigindo o texto informativo de total de aulas na tela de aulas ministradas

* Criando esqueleto do relatório de aulas ministradas

* Pegando os classContents na action que gera o relatório

* Criando a tabela de aulas ministradas dentro do relatório

* corrigindo o relatório

* Corrigindo a action de classContentsReport

* Adicionando o filtro de instrutor na action de getClassContentsReport

* Criando as tabelas dentro do relatório de class contents

* Criando as tabelas de classContentsReport

* Adicionando os campos de assinatura

* Corrigindo assinaturas

* Finalizado o relatório de aulas ministradas

* Adicionando frequencia no relatório de aulas ministradas

* Realizando o merge com a dev e modificando o changelog

* corrigindo errors do sonarlint

* Adicionando os campos de mês, ano, turma e discipline ao salvar aulas ministradas na tela de diario de classe

---------

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>

* corrigidos TCDAs 744, 745 e 746 (#872)

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Fix/unity recovery (#859)

* fix unity with recovery

* remove console.log

* change version

* fix grades

* change validation

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix: remove wrong *

* Finalizado TCDAs 738, 741 e 774 (#877)

* Finalizado TCDAs 738, 741 e 774

* Corrigido erro encontrado pelo revisor Almir; resolvido erro do sonarlint

* bugfix

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* 2024-12-11_add_new_grade_concept_columns

* Corrigido o relatório de alunos por escola (Cpg, Rg e Nis), exibindo somente os alunos do ano em que o relatório foi emitido (#885)

Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>

* Feat/add multi grade rules (#873)

* add stage select

* add filter

* fix saveGrades

* ajustes

* ajustes

* finished add stage filter

* change version

* fix github issues

* remove colon from line

* change grades view

* change grades

* add classroom stage

* fix grade final calculation

* change alert

* Fix change student status

* fix change status student

---------

Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: AnotherOne07 <93009549+AnotherOne07@users.noreply.github.com>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Corrigir os dias indisponíveis erroneamente (#800)

* Corrigir os dias indisponíveis erroneamente

* Ajuste no changeEvent do calendário pra evitar aula indisponivel erroneamente caso o usuário mude o intervalo do evento

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* Feat/tcda 789 (#888)

* aprimorado ficha de matrícula

* bugfix

---------

Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* first commit (#894)

---------

Co-authored-by: Nathan Santos <117388330+nathanipti@users.noreply.github.com>
Co-authored-by: GabrielChagas14 <84946326+GabrielChagas14@users.noreply.github.com>
Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Lívia Martins <131170355+LiviaMartinsIPTI@users.noreply.github.com>
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Evellyn Jade <97754536+evellynreis@users.noreply.github.com>
Co-authored-by: Gustavo Santos <gustavo.santos23703@gmail.com>
Co-authored-by: Francisco Junior <93009549+AnotherOne07@users.noreply.github.com>
Co-authored-by: Paulo Roberto da Costa Cardoso <paulones89@gmail.com>
Co-authored-by: paulones <Ppcc8986>
Co-authored-by: Nathan Santos <ti.natan@ipti.org.br>
Co-authored-by: GabrielChagas14 <gmelo123455@gmail.com>
Co-authored-by: Nathan Santos <nathanaelsantos15@gmail.com>
Co-authored-by: TI GUSTAVO <ti.gustavo@thp.org.br>

Author: 12 people

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [Versão 3.93.212]
+- Ordem das etapas ajustada no relatório de Matrículas Anuais
+
 
 ## [Versão 3.93.211]
 - Ordenando de acordo com a ordem da turma o relatório de ata de notas

app/controllers/ReportsController.php

@@ -404,7 +404,7 @@ public function actionEnrollmentStatisticsByYearReport()
     {
         // Construíndo condicionais e definindo ordenação para a consulta
         $criteria = new CDbCriteria;
-        $criteria->order = 'name ASC';
+        $criteria->order = 'edcenso_stage_vs_modality_fk, name ASC';
         $criteria->condition = "school_year = :year";
         $criteria->params = array("year" => Yii::app()->user->year);
         //Consulta todas as classes abertas no ano atual

app/domain/grades/usecases/CalculateFinalMediaUsecase.php

@@ -81,8 +81,6 @@ public function exec()
                 $this->saveFinalRecoveryMedia($this->gradesResult, $finalMedia);
             }
             TLog::info("Média final calculada", ["finalMedia" => $finalMedia]);
-
-
     }
 
     private function saveFinalMedia($gradesResult, $finalMedia)

app/domain/grades/usecases/ChageStudentStatusByGradeUsecase.php

@@ -114,7 +114,7 @@ private function updateStudentSituation()
             $hasRecoveryGrade = isset($recoveryMedia) && $recoveryMedia !== "";
             if (!$hasRecoveryGrade) {
                 $this->gradeResult->situation = $recoverySituation;
-            } elseif ($recoveryMedia >= $finalRecoveryMedia) {
+            } elseif ($recoveryMedia >= $finalRecoveryMedia && $finalRecovery->gradeCalculationFk->name == "Maior") {
                 $this->gradeResult->situation = $approvedSituation;
             }
 

config.php

@@ -7,7 +7,7 @@
 defined('YII_DEBUG') or define('YII_DEBUG', $debug);
 defined("SESSION_MAX_LIFETIME") or define('SESSION_MAX_LIFETIME', 3600);
 
-define("TAG_VERSION", '3.93.211');
+define("TAG_VERSION", '3.93.212');
 
 define("YII_VERSION", Yii::getVersion());
 define("BOARD_MSG", '<div class="alert alert-success">Novas atualizações no TAG. Confira clicando <a class="changelog-link" href="?r=admin/changelog">aqui</a>.</div>');