From bbda9ea6265936dbd27fa70f13467b2a4de0af73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Gon=C3=A7alves?= <igor_goncalves@live.com>
Date: Thu, 6 Jun 2024 20:12:22 -0300
Subject: [PATCH] Release/3.80.161 (#743)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* adding unity recovery

* Feat/stock lunch module (#554)

* Criação do esqueleto da tela

* Criação do esquelo do modal de adicionar estoque

* Finalizando o modal de adicionar comida no estoque

* Criação da migration que adiciona informações em alias_id

* Realizada a action de pegar o food alias

* Criada a tabela de estoque

* Criado o modal de modificações na tela de controle de estoque

* Crida a tabela de movimentações no modal de movimentações

* Funcionalidade de movimentação funcionando

* Criação da view de solicitações

* Adicionados alertas na tela de estoque

* Finalizada tela de estoque e solicitações

* Criando migrations relacionadas as tabelas de food_inventory

* feat(foods): Criada a tela de gestão de estoque e de solicitações no modulo de merenda e modificando a versão do changelog

* Adicionando a caixa de seleção de status na tabela de estoque

* Adicionando verificações na tela de solicitações

* Adicionando verificações nas telas de estoque e solicitações

* fix: change routes

* ci: fix trigger

* fix

---------

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

* Feat/create grades release (#565)

* feat(enrollment): Criação da tela de lançamento de notas

* Fazendo o merge com a dev e atualizando o changelog

* fix: sonar lints

---------

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

* Feat/tag alimentos (#558)

* atualizado método de update

* consertando bug em atualizar datas

* criando página de refeições por semana

* criando página de refeições por semana

* fix github security issues

---------

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

* enable firebug

* add taghomolog

* fix rules

* fix: remove rules

* change controller

* rename files

* fix: change routes for foods module

* fix: change folder names for foodrequest

* Feat/individual record frequency correction (#567)

* feat/ round the frequency of value int

* feat/add field text (textarea)

* feat/add validation final_media and correction result

* fix(foods): Corrigindo resposividade de estoque e solicitações no modulo de merenda (#570)

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

* feito correção de cor de notificação (#566)

* consertado a responsividade na tela de listagem de refeições e adicionado migrations (#568)

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

* feito correção de fonte no textarea de Diário de Aula (#569)

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

* ci: adding sass container build

* Fix/teacher screen option code appears in city (#487)

* feito correção de retirar o <option> em cidade. Falta tirar aspas

* organizado arquivo para adentrar no novo padrão de código. A procura do erro no select de cidade, ver nos controlers

* feito alteação pra o select funcionar

* continuando mudança no form de instructor

* revertendo alterações

* revertendo informações

* Revert "feito correção de retirar o <option> em cidade. Falta tirar aspas"

This reverts commit dc6263751dc53e22b042351cffce470102067c74.

* depois de reverter commit, feito correção. ainda há erro. selects de cidade e estado estão interligados

* feito correção em selects de cidade, onde estes apresentavam comportamento de apagar e buscar cidade de forma que impedia que a seleção funcionasse corretamente

* feito alterações de formatação

* feito correção para agradar o sonar cloud

---------

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

* Revert "Fix/teacher screen option code appears in city (#487)" (#571)

This reverts commit ada24902767f7e53c65188a25be275cc7f3551e7.

* Fix/teacher screen option code appears in city (#572)

* feito correção de retirar o <option> em cidade. Falta tirar aspas

* organizado arquivo para adentrar no novo padrão de código. A procura do erro no select de cidade, ver nos controlers

* feito alteação pra o select funcionar

* continuando mudança no form de instructor

* revertendo alterações

* revertendo informações

* Revert "feito correção de retirar o <option> em cidade. Falta tirar aspas"

This reverts commit dc6263751dc53e22b042351cffce470102067c74.

* depois de reverter commit, feito correção. ainda há erro. selects de cidade e estado estão interligados

* feito correção em selects de cidade, onde estes apresentavam comportamento de apagar e buscar cidade de forma que impedia que a seleção funcionasse corretamente

* feito alterações de formatação

* feito correção para agradar o sonar cloud

* removind duplicate code

---------

Co-authored-by: Tori Calasans <tori.ti@ipti.org.br>

* Fix/missing fields warning (#475)

* iniciado correção

* feito correção das mensagens de erro em escola

---------

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

* fix calculaton

* adding migrations

* fix: sagres inconsistences

* feat: adding by concept grades

* fix delete action and form layout

* fix: remove sonar cloud error

* fix: clean code smells

* fix code smells

* reduce complexity

* fix: code smells'

* fix code smells on usecases

* fix: code smells

* fix loading error

* feat/refactor grades (#574)

* fix: refactor grades

* fix: save one grade struct

* adding ids for grades

* calculo de media finalizado

* check grades em action to calculate final media

* fix: calculate final media

* add recovery form

* feat: add recovery

* feat: recuperacao final finalizada

* adding unity recovery

* fix calculaton

* adding migrations

* feat: adding by concept grades

* fix delete action and form layout

* fix: remove sonar cloud error

* fix: clean code smells

* fix code smells

* reduce complexity

* fix: code smells'

* fix code smells on usecases

* fix: code smells

* fix loading error

* fix: adding cpf to search and graderelease

* update css

* change labels

* fix design issues

* fix: grade release

* fix status

* fix: recovery

* fix grades release

* consertado tela de update

* salvando vários ingredientes para cada prato

* mudanças no formulário

* consertado a rolagem no acordeão

* fix: initial import doesent require address, only on sedsp scenario

* mudado componente de menu

* fix(foods): Adicionando filtros nas unidades de medida a depender da comida selecionada na tela de estoque

* Corrigindo a classe helper utilizada nas telas de estoque e solicitações no modulo de merenda

* criando relatório

* change helper class

* Corrigindo erro nas unidades de medida

* adicionando usuário de nutricionista

* escondendo o botão de imprimir cardápio

* Feat/rename term consent image (#581)

* feat/add marked bf_participator, previous_stage_situation, deficiency

* feat/implementing marked in current_stage_situation and starting logic restrictions

* feat/ add restriction food

* feat/formated

* feat/delete food restriction

* feat/ correction response public transport

* feat/migration view sql

* feat/ correction consent form image

* Fix: sagres-generation (#577)

* Fix: sagres-generation

* Fix: file name path donwload

* Feat/new merge individual record frequency (#575)

* feat/ round the frequency of value int

* feat/add field text (textarea)

* feat/add validation final_media and correction result

* Feat/marked form registration (#579)

* feat/add marked bf_participator, previous_stage_situation, deficiency

* feat/implementing marked in current_stage_situation and starting logic restrictions

* feat/ add restriction food

* feat/formated

* feat/delete food restriction

* feat/ correction response public transport

* feat/migration view sql

---------

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

* Corrigindo o controller de merenda no módulo de foods

* Corrigido responsividade e colocado link de merenda no mobile

* mostrando dias da semana no mobile na tela de cadastro de cardapio

* Feat/sagres 2024 (#585)

* Feat: file Educacao.xsd 2024

* refactor: update strlen  and maxLength name disciplina to 2024

* Feat: added new value for modality

* Feat: add limit (1000 caracteres) for description for merenda

* Ref: O tamanho máximo foi ajustado para 1000 caracteres devido à restrição (descrição).

* Feat: add opção: Atendimento Educacional Especializado

* Ref: added to comply with sagres 2024 rules

* Feat: student cpf required for sagres 2024

* feat/modify_message_error_to_register_user (#584)

* feat/add min character in rules referents action create user and delete in javascript

* feat/message correction of error

* ungermed file

* Feat/unity periods (#425)

* Aidção do modal para alterar unidades das etapas

* Adição de validação no backend da consulta de unidades

* Regras do Javascript para verificar as datas

* Ajax para enviar as datas, sem a parte do PHP

* Aidção do modal para alterar unidades das etapas

* Ajuste na comparação de datas

* Finalizado crud unityperiods

* Finalizado vigencia das unidades no calendar

* minor fixes

* inserido tooltip nos eventos highlighted das vigências das unidades

* travamento do container flutuante de visualizar etapas e vigências no accordion;

replicação de datas agora só depende da quantidade de unidades

* Não mostrar RS e RF nas unidades do calendario

* Nova tela de parametros do município

* Alteração do visual da tela e pequenos erros

* Gif de loading e melhoria na tabela

* inserido etapas da escola e adequado tela de classroom para exibir apenas as etapas da escola;

* refactor: reverse controller merge

* Removido de vez o school_stages_concept_grades - substituído por school_stages;

rollback na funcionalidade de turma que exibe apenas as turmas da escola

* Ajustado notas e estrutura do relatório ata de notas

* Inserido situação 'RECUPERAÇÃO'

* Ajustes das notas na Ficha de Notas

* Unidades por conceito nas Fichas de notas

* Dias letivos e carga horária na Ficha de Notas

* Faltas na Ficha de Notas

* corrigido alguns bugs em aulas ministradas

* Finalizado ficha de notas

* Ficha de notas concluida

* fix sonar lint issues

---------

Co-authored-by: paulones <Ppcc8986>
Co-authored-by: Carlos Henrique Santos Silveira <109424074+ByteCarlos@users.noreply.github.com>
Co-authored-by: Carlos Henrique Santos Silveira <carlos.henrique@dcomp.ufs.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>

* fix required indicator

* fix/action update classroom fixed

* Revert "Feat/sagres 2024" (#595)

* Feat/no transfered students (#591)

* feat/add find all school in controler and modification pag transfer

* feat/ correction identation

* feat/ rename title

* feat/ correction field deficiency (#597)

* Fix: year of generation of the file changed to the one selected in the system (#600)

* Feat/add grades release concept grades (#603)

* fix(grades): corrigindo a tela de lançamento de notas de buzios

* feat(grades): Corrigindo o cálculo de média final na tela de lançamento de notas de buzios e adicionando notas por conceito em lançamento de notas

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

---------

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

* feat/add year to all reports (#596)

* feat/add year to all reports

* feat/corretion sonar lint

* feat/add year report

* docs: Criando a documentação da adr que descreve a atribuição de nome de pull request

* Fix/correction date attendance (#607)

* Fix: added validations and limitations for selecting the date of attendance

* Feat: add CDateTimeParser to match the database data type (yyyy-MM-dd)

* Fix: when entering a attendance, the page is no longer redirected to the index.

* Feat: added action to clear the entered date

* feat/create head instance not is buzios (#598)

* feat/create head instance not is buzios

* feat/correction sonar lint

* docs: Criando a documentação da adr que descreve a atribuição de nome de pull request

* chagen pullrequest template

* Feat/Add Delete Function To Attendances in Update Professional View (#604)

* first commit

* Method deleteAttendance updated to use a POST request instead a GET / ajax added to event on click

* task completed

* CHANGELOG updated

* layout and functionality approved, ready to request a pull

* fix a issue in default controller

* layout fixed

* feat/add value 5 in array scholarity (#606)

* feat/add value 5 in array scholarity

* feat/fields replicated (corrected)

* feat/ add changelog

---------

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

* Feat/add report card concept grades (#609)

* fix(grades): corrigindo a tela de lançamento de notas de buzios

* feat(grades): Corrigindo o cálculo de média final na tela de lançamento de notas de buzios e adicionando notas por conceito em lançamento de notas

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

* feat(reportCard): Adicionando notas por conceito no lançamento de notas de búzios

---------

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

* Feat/foodmenu report (#608)

* criada tabela de crdápio no relatorio de foodmenu

* criado folder reports no module foods

* criado FoodMenuServices e os usesCases

* mudando relatorio

* alterado _form em foodMenu

* adicionado a descrição das refeições no relatório de cardápio

* colocado ingredientes no relatório de cardápio

* buscando valores nutricionais das refeições

* adicionando calculos no relatório de cardápio

* finalizado formulário

* alterando formato da hora da refeição, cor de celulas na impressão e consertado sigla de carboidratos

* remove head.php

* mudado sigla de carboidrato

* sonarlint issues

* sonarlint issues

* sonarlint issues

---------

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

* Feat/sagres 2024 (#602)

* Feat: file Educacao.xsd 2024

* refactor: update strlen  and maxLength name disciplina to 2024

* Feat: added new value for modality

* Feat: add limit (1000 caracteres) for description for merenda

* Ref: O tamanho máximo foi ajustado para 1000 caracteres devido à restrição (descrição).

* Feat: add opção: Atendimento Educacional Especializado

* Ref: added to comply with sagres 2024 rules

* Feat: student cpf required for sagres 2024

* Feat: add break-word for restrictions

* Feat: migration 2024-02-01_adjust_sagres_2024

* feat/ removed in field input (*) (#605)

* feat/ removed in field input (*)

* feat/remove * disciplines

* feat/add changelog

---------

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

* Criando a documentação da adr que descreve a atribuição de nome de pull request

* pull dev

* Modificando a inconsistência em main.php

* Fix/import student data from sedsp (#613)

* Ref: code improvement

* Fix: Updating the student's documents and address is based on id.

* fix/individual-report (#582)

* fix/individual-report

* feat/sonarcloud issues fixed

* fix/adjustment in final grade view

* fix user year in report

* CHANGELOG updates

---------

Co-authored-by: AnotherOne07 <natsujunior07@gmail.com>

* Feat/course_plan_abilities (#615)

* feat/correction abilities couse plan

* feat/remove *

* feat/add changelog

---------

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

* 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

* :lipstick:feat/badge style updated

* :lipstick:feat/fix icon style and padding in button

* :card_file_box:raw/upload sql changes and CHANGELOG update

* :card_file_box:raw/upload sql changes and remove comments

* small change on placeholder in modal

* :label:fix/removing var declared variables

* :label: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)

* :bug: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>

---------

Co-authored-by: Gustavo Santos <gustavo.santos23703@gmail.com>
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: GabrielChagas14 <84946326+GabrielChagas14@users.noreply.github.com>
Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: Evellyn Jade <97754536+evellynreis@users.noreply.github.com>
Co-authored-by: Tori Calasans <107931809+Tori-IPTI@users.noreply.github.com>
Co-authored-by: Tori Calasans <tori.ti@ipti.org.br>
Co-authored-by: GabrielChagas14 <gmelo123455@gmail.com>
Co-authored-by: Nathan Santos <117388330+nathanipti@users.noreply.github.com>
Co-authored-by: Paulo Roberto da Costa Cardoso <paulones89@gmail.com>
Co-authored-by: Carlos Henrique Santos Silveira <109424074+ByteCarlos@users.noreply.github.com>
Co-authored-by: Carlos Henrique Santos Silveira <carlos.henrique@dcomp.ufs.br>
Co-authored-by: AnotherOne07 <93009549+AnotherOne07@users.noreply.github.com>
Co-authored-by: Tori Calasans <tori.ti@ipti.og.br>
Co-authored-by: AnotherOne07 <natsujunior07@gmail.com>
Co-authored-by: Lívia Martins <131170355+LiviaMartinsIPTI@users.noreply.github.com>
Co-authored-by: paulones <Ppcc8986>
Co-authored-by: Nathan Santos <ti.natan@ipti.org.br>
Co-authored-by: Nathan Santos <nathanaelsantos15@gmail.com>
---
 CHANGELOG.md                                  |  38 ++-
 app/components/DatePickerWidget.php           |   5 +-
 app/controllers/CensoController.php           |  45 ++-
 app/controllers/ClassesController.php         |  19 +-
 .../Validator/ClassroomValidation.php         |  20 +-
 .../SchoolIdentificationValidation.php        |   2 +-
 .../Validator/SchoolStructureValidation.php   |   2 +-
 app/libraries/Educacenso/Register10.php       |  17 +-
 app/libraries/Educacenso/Register20.php       |   5 +-
 app/libraries/Educacenso/Register50.php       |   2 +-
 app/libraries/Educacenso/Register60.php       |   5 +-
 app/messages/pt_br/default.php                |  12 +-
 ...5-21-update-classroom-modality-set-100.sql |   3 +
 .../2024-05-27_edcenso_2024/edcenso_alias     |  65 ++++
 .../2024-05-27_edcenso_2024/other_tables      |  23 ++
 app/models/SchoolStructure.php                |  21 +-
 app/models/StudentEnrollment.php              |   4 +
 .../controllers/DefaultController.php         |   6 +-
 .../dashboard/services/DashboardService.php   |   6 +-
 app/modules/dashboard/views/default/index.php |  48 ++-
 app/repository/ReportsRepository.php          |   3 +
 config.php                                    |   2 +-
 themes/default/views/classroom/_form.php      |   5 +-
 .../default/views/forms/StudentFileForm.php   | 312 +++++++++---------
 themes/default/views/school/_form.php         | 151 +++++++--
 themes/default/views/student/_form.php        |  18 +-
 26 files changed, 581 insertions(+), 258 deletions(-)
 create mode 100644 app/migrations/2024-05-21-update-classroom-modality-set-100/2024-05-21-update-classroom-modality-set-100.sql
 create mode 100644 app/migrations/2024-05-27_edcenso_2024/edcenso_alias
 create mode 100644 app/migrations/2024-05-27_edcenso_2024/other_tables

diff --git a/CHANGELOG.md b/CHANGELOG.md
index afd1590ce..21625f705 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,41 @@
-## [Versão 3.78.152]
+## [Versão 3.80.161]
+- Refatoradas variáveis para utilizar o post, através de uma função do Yii.
+- Modificada a ordem dos parâmetros da função getSchedulesFromMajorStage.
+- 
+## [Versão 3.80.160]
+- Correção na opção da data máxima da função renderDatePickerFinal.
+
+## [Versão 3.80.159]
+- Método actionValidate do CensoController refatorado, implementando váriaveis.
+- Processar instrutores, garantindo que cada instrutor seja validado apenas uma vez.
+
+## [Versão 3.80.158]
+- Alterado o botão Cancelar Matrícula por Excluir Matricula.
+
+## [Versão 3.80.157]
+- Inserido opção de situação de matrícula "AVANÇADO" no campo "Situação de Matrícula"
+- Adequado o sistema para o Educacenso 2024
+
+## [Versão 3.79.157]
+- Corrigida ficha de matricula do aluno ao imprimir.
+
+## [Versão 3.79.156]
+- Realizadas correções no módulo Sagres para evitar a contagem de CPFs de estudantes, evitando duplicações.
+
+## [Versão 3.79.156]
+- Permitido com que se adicione ou remova aulas no quadro de horário, mesmo quando houver preenchimento de frequência ou quadro de horário
+
+## [Versão 3.79.155]
+- Efetuadas correções para o chaveamento do professor com o seu usuário
+
+## [Versão 3.79.154]
+- Adicionada uma regra de validação para mostrar um erro caso tente cadastrar uma certidão inválida.
+
+## [Versão 3.79.153]
+## [Versão 3.79.152]
 - Realizadas correções no módulo Sagres para evitar a contagem de CPFs de estudantes duplicados.
 
-## [Versão 3.78.151]
+## [Versão 3.79.151]
 - Realizadas correções no módulo Sagres para evitar a contagem de CPFs de estudantes, evitando duplicações.
 
 ## [Versão 3.79.150]
diff --git a/app/components/DatePickerWidget.php b/app/components/DatePickerWidget.php
index 62a60c138..ac38cf626 100644
--- a/app/components/DatePickerWidget.php
+++ b/app/components/DatePickerWidget.php
@@ -41,6 +41,7 @@ public static function renderDatePicker($model, $attribute)
 
     public static function renderDatePickerFinal($model, $attribute)
     {
+        $year = (date('Y') + 1);
         return [
             'model' => $model,
             'attribute' => $attribute,
@@ -48,9 +49,9 @@ public static function renderDatePickerFinal($model, $attribute)
                 'dateFormat' => 'dd/mm/yy',
                 'changeYear' => true,
                 'changeMonth' => true,
-                'yearRange' => '1930:' . date('Y'),
+                'yearRange' => '1930:'. $year,
                 'showOn' => 'focus',
-                'maxDate' => 0,
+                'maxDate' => '31/12/'. ($year +1),
                 'monthNamesShort' => [
                     'Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
                     'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'
diff --git a/app/controllers/CensoController.php b/app/controllers/CensoController.php
index 18048b678..793d2d32d 100755
--- a/app/controllers/CensoController.php
+++ b/app/controllers/CensoController.php
@@ -378,7 +378,8 @@ public function validateSchoolStructure($collumn, $school)
             $collumn["water_supply_artesian_well"],
             $collumn["water_supply_well"],
             $collumn["water_supply_river"],
-            $collumn["water_supply_inexistent"]);
+            $collumn["water_supply_inexistent"],
+            $collumn["water_supply_car"]);
         $result = $ssv->supply($water_supplys);
         if (!$result["status"]) array_push($log, array("Suprimento de Agua" => $result["erro"]));
 
@@ -449,6 +450,7 @@ public function validateSchoolStructure($collumn, $school)
             $collumn["dependencies_yardzao"],
             $collumn["dependencies_vivarium"],
             $collumn["dependencies_vocational_education_workshop"],
+            $collumn["dependencies_garden_planting_agricultural"],
             $collumn["dependencies_none"]);
         $result = $ssv->supply($dependencies);
         if (!$result["status"]) array_push($log, array("Dependencias" => $result["erro"]));
@@ -458,6 +460,7 @@ public function validateSchoolStructure($collumn, $school)
             $collumn["acessability_tactile_floor"],
             $collumn["acessability_doors_80cm"],
             $collumn["acessability_ramps"],
+            $collumn["acessability_light_signaling"],
             $collumn["acessability_sound_signaling"],
             $collumn["acessability_tactile_singnaling"],
             $collumn["acessability_visual_signaling"],
@@ -486,6 +489,7 @@ public function validateSchoolStructure($collumn, $school)
             $collumn["equipments_toys_early"],
             $collumn["equipments_scientific_materials"],
             $collumn["equipments_equipment_amplification"],
+            $collumn["equipments_garden_planting_agricultural"],
             $collumn["equipments_musical_instruments"],
             $collumn["equipments_educational_games"],
             $collumn["equipments_material_cultural"],
@@ -493,6 +497,8 @@ public function validateSchoolStructure($collumn, $school)
             $collumn["equipments_material_teachingindian"],
             $collumn["equipments_material_teachingethnic"],
             $collumn["equipments_material_teachingrural"],
+            $collumn["equipments_material_teachingquilombola"],
+            $collumn["equipments_material_teachingspecial"],
             $collumn["instruments_inexistent"]);
         $result = $ssv->atLeastOne($instruments);
         if (!$result["status"]) array_push($log, array("Instrumentos, materiais socioculturais e/ou pedagogicos em uso na escola para o desenvolvimento de atividades de ensino aprendizagem" => $result["erro"]));
@@ -648,8 +654,8 @@ public function validateClassroom($column, $school)
         if (!$result['status']) array_push($log, array('stage' => $result['erro']));
 
         //campo 39
-        $result = $crv->isValidProfessionalEducation($column['course'], $column['edcenso_stage_vs_modality_fk']);
-        if (!$result['status']) array_push($log, array('course' => $result['erro']));
+        $result = $crv->isValidProfessionalEducation($column['modality'], $column['course'], $column['edcenso_stage_vs_modality_fk']);
+        if ( !$result['status']) array_push($log, array('course' => $result['erro']));
 
         //campos 40 a 65
 //        $disciplinesArray = array($column['discipline_chemistry'], $column['discipline_physics'], $column['discipline_mathematics'], $column['discipline_biology'], $column['discipline_science'],
@@ -1454,26 +1460,35 @@ public function actionValidate()
         $log['school']['validate']['identification'] = $this->validateSchool($schoolcolumn, $managerIdentificationColumn);
         $log['school']['validate']['structure'] = $this->validateSchoolStructure($schoolstructurecolumn, $schoolcolumn);
         $classrooms = Classroom::model()->findAllByAttributes(["school_inep_fk" => yii::app()->user->school, "school_year" => Yii::app()->user->year]);
+
+        $processedInstructors = [];
         foreach ($classrooms as $iclass => $classroom) {
             $log['classroom'][$iclass]['info'] = $classroom->attributes;
             $log['classroom'][$iclass]['validate']['identification'] = $this->validateClassroom($classroom, $schoolcolumn, $schoolstructure);
             foreach ($classroom->instructorTeachingDatas as $iteaching => $teachingData) {
-                $log['instructor'][$teachingData->instructor_fk]['info'] = $teachingData->instructorFk->attributes;
-                $log['instructor'][$teachingData->instructor_fk]['validate']['identification'][$iteaching] = $this->validateInstructor($teachingData->instructorFk->attributes, $teachingData->instructorFk->documents->attributes);
-                $log['instructor'][$teachingData->instructor_fk]['validate']['documents'][$iteaching] = $this->validateInstructorDocuments($teachingData->instructorFk->documents->attributes);
-                $log['instructor'][$teachingData->instructor_fk]['validate']['variabledata'][$iteaching]['id'] = $teachingData->classroomIdFk->id;
-                $log['instructor'][$teachingData->instructor_fk]['validate']['variabledata'][$iteaching]['turma'] = $teachingData->classroomIdFk->name;
-                $log['instructor'][$teachingData->instructor_fk]['validate']['variabledata'][$iteaching]['errors'] = $this->validateInstructorData($teachingData->attributes);
+                $instructorId = $teachingData->instructor_fk;
+                if (in_array($instructorId, $processedInstructors)) {
+                    continue;
+                }
+                $processedInstructors[] = $instructorId;
+                $log['instructor'][$instructorId]['info'] = $teachingData->instructorFk->attributes;
+                $log['instructor'][$instructorId]['validate']['identification'][$iteaching] = $this->validateInstructor($teachingData->instructorFk->attributes, $teachingData->instructorFk->documents->attributes);
+                $log['instructor'][$instructorId]['validate']['documents'][$iteaching] = $this->validateInstructorDocuments($teachingData->instructorFk->documents->attributes);
+                $log['instructor'][$instructorId]['validate']['variabledata'][$iteaching]['id'] = $teachingData->classroomIdFk->id;
+                $log['instructor'][$instructorId]['validate']['variabledata'][$iteaching]['turma'] = $teachingData->classroomIdFk->name;
+                $log['instructor'][$instructorId]['validate']['variabledata'][$iteaching]['errors'] = $this->validateInstructorData($teachingData->attributes);
             }
             foreach ($classroom->studentEnrollments as $ienrollment => $enrollment) {
-                $log['student'][$enrollment->student_fk]['info'] = $enrollment->studentFk->attributes;
-                $log['student'][$enrollment->student_fk]['validate']['identification'][$ienrollment] = $this->validateStudentIdentification($enrollment->studentFk->attributes, $enrollment->studentFk->documentsFk->attributes, $enrollment->classroomFk->attributes);
-                @$log['student'][$enrollment->student_fk]['validate']['documents'][$ienrollment] = $this->validateStudentDocumentsAddress($enrollment->studentFk->documentsFk->attributes, $enrollment->studentFk->attributes);
-                $log['student'][$enrollment->student_fk]['validate']['enrollment'][$ienrollment]['id'] = $enrollment->id;
-                $log['student'][$enrollment->student_fk]['validate']['enrollment'][$ienrollment]['turma'] = $enrollment->classroomFk->name;
-                $log['student'][$enrollment->student_fk]['validate']['enrollment'][$ienrollment]['errors'] = $this->validateEnrollment($enrollment->attributes);
+                $studentId = $enrollment->student_fk;
+                $log['student'][$studentId]['info'] = $enrollment->studentFk->attributes;
+                $log['student'][$studentId]['validate']['identification'][$ienrollment] = $this->validateStudentIdentification($enrollment->studentFk->attributes, $enrollment->studentFk->documentsFk->attributes, $enrollment->classroomFk->attributes);
+                @$log['student'][$studentId]['validate']['documents'][$ienrollment] = $this->validateStudentDocumentsAddress($enrollment->studentFk->documentsFk->attributes, $enrollment->studentFk->attributes);
+                $log['student'][$studentId]['validate']['enrollment'][$ienrollment]['id'] = $enrollment->id;
+                $log['student'][$studentId]['validate']['enrollment'][$ienrollment]['turma'] = $enrollment->classroomFk->name;
+                $log['student'][$studentId]['validate']['enrollment'][$ienrollment]['errors'] = $this->validateEnrollment($enrollment->attributes);
             }
         }
+
         $this->render('validate', ['log' => $log]);
     }
 
diff --git a/app/controllers/ClassesController.php b/app/controllers/ClassesController.php
index f564838e6..6ce7acbf6 100755
--- a/app/controllers/ClassesController.php
+++ b/app/controllers/ClassesController.php
@@ -106,11 +106,11 @@ public function actionClassContents()
      */
     public function actionGetClassContents()
     {
-        $classroomId = $_POST["classroom"];
+        $classroomId = Yii::app()->request->getPost('classroom');
         $isMinorEducation = TagUtils::isStageMinorEducation(Classroom::model()->findByPk($classroomId)->edcenso_stage_vs_modality_fk);
-        $month = $_POST["month"];
-        $year = $_POST["year"];
-        $disciplineId = $_POST["discipline"];
+        $month = Yii::app()->request->getPost('month');
+        $year = Yii::app()->request->getPost('year');
+        $disciplineId = Yii::app()->request->getPost('discipline');
 
         $students = $this->getStudentsByClassroom($classroomId);
 
@@ -188,15 +188,7 @@ public function actionGetClassContents()
         }
     }
 
-
-    /**
-     * Summary of getSchedulesFromMajorStage
-     * @param integer $classroomId
-     * @param integer $month
-     * @param integer $disciplineId
-     * @return Schedule[]
-     */
-    private function getSchedulesFromMajorStage($classroomId, $month, $disciplineId, $year)
+    private function getSchedulesFromMajorStage($classroomId, $month, $year, $disciplineId)
     {
         return Schedule::model()->findAll(
             "classroom_fk = :classroom_fk and month = :month and year = :year and discipline_fk = :discipline_fk and unavailable = 0 order by day, schedule",
@@ -280,7 +272,6 @@ private function updateStudentAnottations($schedule, $students)
     {
         $studentArray = [];
         foreach ($students as $student) {
-            
             $studentData = [
                 "id" => $student["id"],
                 "name" => $student["name"],
diff --git a/app/extensions/Validator/ClassroomValidation.php b/app/extensions/Validator/ClassroomValidation.php
index f27ff85c6..12fef9abd 100755
--- a/app/extensions/Validator/ClassroomValidation.php
+++ b/app/extensions/Validator/ClassroomValidation.php
@@ -413,18 +413,18 @@ function isValidStage($stage, $complementaryActivity, $mediation, $modality, $di
     }
 
     //campo 39
-    function isValidProfessionalEducation($professionalEducation, $stage)
+    function isValidProfessionalEducation($modality, $professionalEducation, $stage)
     {
-        $emptyProfessionalEducation = $this->isEmpty($professionalEducation);
+        // $emptyProfessionalEducation = $this->isEmpty($professionalEducation);
 
-        if (strlen($professionalEducation) > 8) {
-            return array('status' => false, 'erro' => 'O campo deve ter no maximo 8 caracteres');
-        }
+        // if (strlen($professionalEducation) > 8) {
+        //     return array('status' => false, 'erro' => 'O campo deve ter no maximo 8 caracteres');
+        // }
 
-        if ($emptyProfessionalEducation['status'] && in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 64, 74))) {
-            return array('status' => false, 'erro' => $this->replaceCodeModalities('O campo deve ser preenchido quando a etapa for 30, 31, 32, 33, 34, 39, 40, 64 ou 74'));
-        }
-        if (!$emptyProfessionalEducation['status'] && !in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 64, 74))) {
+        // if ($emptyProfessionalEducation['status'] && in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 64, 74))) {
+        //     return array('status' => false, 'erro' => $this->replaceCodeModalities('O campo deve ser preenchido quando a etapa for 30, 31, 32, 33, 34, 39, 40, 64 ou 74'));
+        // }
+        if ($modality == 4 && !in_array($stage, array(30, 31, 32, 33, 34, 39, 40, 73, 74, 64, 67, 68))) {
             return array('status' => false, 'erro' => $this->replaceCodeModalities('O campo nao pode ser preenchido quando a etapa for 30, 31, 32, 33, 34, 39, 40, 64 ou 74'));
         }
 
@@ -576,4 +576,4 @@ public function containsStudents($studentsEnrollment) {
     }
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/app/extensions/Validator/SchoolIdentificationValidation.php b/app/extensions/Validator/SchoolIdentificationValidation.php
index 7bd5c178a..6e5b6c625 100755
--- a/app/extensions/Validator/SchoolIdentificationValidation.php
+++ b/app/extensions/Validator/SchoolIdentificationValidation.php
@@ -399,7 +399,7 @@ public function checkPhoneNumbers($ddd, $phoneNumber, $otherPhoneNumber)
     //campo 26
     public function isEmailValid($email)
     {
-        if (strlen($email) > 50) {
+        if (strlen($email) > 100) {
             return array("status" => false, "erro" => "Email com tamanho invalido");
         }
 
diff --git a/app/extensions/Validator/SchoolStructureValidation.php b/app/extensions/Validator/SchoolStructureValidation.php
index a8a33d782..e5b01f6f9 100755
--- a/app/extensions/Validator/SchoolStructureValidation.php
+++ b/app/extensions/Validator/SchoolStructureValidation.php
@@ -98,7 +98,7 @@ public function supply($supply_locations)
             for ($i = 0; $i < ($len - 1); $i++) { //primeiros campos
                 if ($supply_locations[$i] == "1") {
                     return array("status" => false,
-                        "erro" => "Já que ultimo campo 1 não pode haver outros campos marcados como 1");
+                        "erro" => "Quando o campo de inexistência é marcado, nenhum outro deve estar.");
                 }
             }
         }
diff --git a/app/libraries/Educacenso/Register10.php b/app/libraries/Educacenso/Register10.php
index 3855d9460..1dc79143b 100644
--- a/app/libraries/Educacenso/Register10.php
+++ b/app/libraries/Educacenso/Register10.php
@@ -42,6 +42,7 @@ public static function export($year)
             $attributes['water_supply_artesian_well'] = '0';
             $attributes['water_supply_well'] = '0';
             $attributes['water_supply_river'] = '0';
+            $attributes['water_supply_car'] = '0';
         }
 
         if ($attributes['energy_supply_inexistent'] == '1') {
@@ -70,6 +71,7 @@ public static function export($year)
             $attributes['acessability_tactile_floor'] = '0';
             $attributes['acessability_doors_80cm'] = '0';
             $attributes['acessability_ramps'] = '0';
+            $attributes['acessability_light_signaling'] = '0';
             $attributes['acessability_sound_signaling'] = '0';
             $attributes['acessability_tactile_singnaling'] = '0';
             $attributes['acessability_visual_signaling'] = '0';
@@ -132,6 +134,9 @@ public static function export($year)
             $attributes['internet_access_broadband'] = '';
         }
 
+        if ($attributes['workers_garden_planting_agricultural'] == '0') {
+            $attributes['workers_garden_planting_agricultural'] = null;
+        }
         if ($attributes['workers_administrative_assistant'] == '0') {
             $attributes['workers_administrative_assistant'] = null;
         }
@@ -171,6 +176,9 @@ public static function export($year)
         if ($attributes['workers_monitors'] == '0') {
             $attributes['workers_monitors'] = null;
         }
+        if ($attributes['workers_braille'] == '0') {
+            $attributes['workers_braille'] = null;
+        }
 
         $attributes['native_education'] = 0;
         if ($attributes['native_education'] != 1) {
@@ -208,18 +216,19 @@ public static function export($year)
 
         $edcensoAliases = EdcensoAlias::model()->findAll('year = :year and register = 10 order by corder', [":year" => $year]);
         foreach ($edcensoAliases as $edcensoAlias) {
-            if ($edcensoAlias->corder == 43) {
+            if ($edcensoAlias->corder == 44) {
                 $register[$edcensoAlias->corder] =
                     $attributes["dependencies_prysical_disability_bathroom"] == 1 || $attributes["dependencies_child_bathroom"] == 1 ||
                     $attributes["dependencies_bathroom_workes"] == 1 || $attributes["dependencies_bathroom_with_shower"] == 1
                         ? 1 : 0;
-            } else if ($edcensoAlias->corder == 133) {
+            } else if ($edcensoAlias->corder == 138) {
                 $register[$edcensoAlias->corder] = null;
-                if ($attributes["workers_administrative_assistant"] == null && $attributes["workers_service_assistant"] == null && $attributes["workers_librarian"] == null
+                if ($attributes["workers_garden_planting_agricultural"] == null && $attributes["workers_administrative_assistant"] == null
+                    && $attributes["workers_service_assistant"] == null && $attributes["workers_librarian"] == null
                     && $attributes["workers_firefighter"] == null && $attributes["workers_coordinator_shift"] == null && $attributes["workers_speech_therapist"] == null
                     && $attributes["workers_nutritionist"] == null && $attributes["workers_psychologist"] == null && $attributes["workers_cooker"] == null
                     && $attributes["workers_support_professionals"] == null && $attributes["workers_school_secretary"] == null && $attributes["workers_security_guards"] == null
-                    && $attributes["workers_monitors"] == null) {
+                    && $attributes["workers_monitors"] == null && $attributes["workers_braille"] == null) {
                     $register[$edcensoAlias->corder] = 1;
                 }
             } else {
diff --git a/app/libraries/Educacenso/Register20.php b/app/libraries/Educacenso/Register20.php
index e7dfa8783..280c207db 100644
--- a/app/libraries/Educacenso/Register20.php
+++ b/app/libraries/Educacenso/Register20.php
@@ -68,8 +68,7 @@ public static function export($year)
         $classrooms = Classroom::model()->findAllByAttributes(['school_inep_fk' => yii::app()->user->school, 'school_year' => Yii::app()->user->year]);
 
         foreach ($classrooms as $iclass => $attributes) {
-//            COMENTÁRIO TEMPORÁRIO PARA CONSEGUIR INTEGRAR OS DADOS DE BOQUIM
-//            if (count($attributes->instructorTeachingDatas) >= 1 && count($attributes->studentEnrollments) >= 1) {
+            if (count($attributes->instructorTeachingDatas) >= 1 && count($attributes->studentEnrollments) >= 1) {
 
                 $register = [];
 
@@ -239,7 +238,7 @@ public static function export($year)
                 }
 
                 array_push($registers, implode('|', $register));
-//            }
+            }
         }
 
         return $registers;
diff --git a/app/libraries/Educacenso/Register50.php b/app/libraries/Educacenso/Register50.php
index 69fddbc2b..3cb955212 100644
--- a/app/libraries/Educacenso/Register50.php
+++ b/app/libraries/Educacenso/Register50.php
@@ -72,7 +72,7 @@ public static function export($year)
                     }
                 }
 
-                if ($classroom->pedagogical_mediation_type == "1" && ($teaching['role'] != '1' && $teaching['role'] != '2' && $teaching['role'] != '3' && $teaching['role'] != '4')) {
+                if ($classroom->pedagogical_mediation_type == "1" && ($teaching['role'] != '1' && $teaching['role'] != '2' && $teaching['role'] != '3' && $teaching['role'] != '4' && $teaching['role'] != '7' && $teaching['role'] != '8')) {
                     $teaching['role'] = "1";
                 } else if ($classroom->pedagogical_mediation_type == "3" && ($teaching['role'] != '4' && $teaching['role'] != '5')) {
                     $teaching['role'] = "4";
diff --git a/app/libraries/Educacenso/Register60.php b/app/libraries/Educacenso/Register60.php
index 0c5b6f651..c0a1c92b4 100644
--- a/app/libraries/Educacenso/Register60.php
+++ b/app/libraries/Educacenso/Register60.php
@@ -11,8 +11,7 @@ public static function export($year)
         $students = [];
 
         foreach ($classrooms as $iclass => $classroom) {
-//            COMENTÁRIO TEMPORÁRIO PARA CONSEGUIR MIGRAR OS DADOS DE BOQUIM
-//            if (count($classroom->instructorTeachingDatas) >= 1) {
+            if (count($classroom->instructorTeachingDatas) >= 1) {
                 foreach ($classroom->studentEnrollments as $ienrollment => $enrollment) {
                     if (!isset($students[$enrollment->student_fk])) {
                         $enrollment->studentFk->school_inep_id_fk = $school->inep_id;
@@ -24,7 +23,7 @@ public static function export($year)
                     $enrollment->school_inep_id_fk = $school->inep_id;
                     $students[$enrollment->student_fk]['enrollments'][$ienrollment][] = $enrollment->attributes;
                 }
-//            }
+            }
         }
 
         foreach ($students as $student) {
diff --git a/app/messages/pt_br/default.php b/app/messages/pt_br/default.php
index e369397eb..e398cbab0 100644
--- a/app/messages/pt_br/default.php
+++ b/app/messages/pt_br/default.php
@@ -127,6 +127,7 @@
     'Water Supply Artesian Well' => 'Poço Artesiano',
     'Water Supply Well' => 'Cacimba / Cisterna / Poço',
     'Water Supply River' => 'Fonte / Rio / Igarapé / Córrego',
+    'Water Supply Car' => 'Carro-Pipa',
     'Water Supply Inexistent' => 'Inexistente',
     'Energy Supply Public' => 'Rede Pública',
     'Energy Supply Generator' => 'Gerador movido a combustível fóssil',
@@ -168,11 +169,12 @@
     'Dependencies Uncovered Patio' => 'Pátio Descoberto',
     'Dependencies Student Accomodation' => 'Alojamento de Alunos',
     'Dependencies Instructor Accomodation' => 'Alojamento de Professores',
-    'Dependencies Green Area' => 'Área Verde',
+    'Dependencies Green Area' => 'Área de Vegetação ou Gramado',
     'Dependencies Laundry' => 'Lavanderia',
     'Dependencies Professional Specific Lab' => 'Laboratório Específico para a Educação Profissional',
     'Dependencies Vocational Education Workshop' => 'Salas de Oficinas da Educação Profissional',
     'Dependencies Recording And Editing Studio' => 'Estúdio de gravação e edição',
+    'Dependencies Garden Planting Agricultural' => 'Área de horta, plantio e/ou produção agrícola',
     'Dependencies None' => 'Nenhuma das Relacionadas',
     'Classroom Count' => 'Nº de Salas de Aula',
     'Used Classroom Count' => 'Nº de Salas de Aula em Uso',
@@ -233,7 +235,7 @@
     'Sociocultural Didactic Material None' => 'Não Utiliza',
     'Sociocultural Didactic Material Quilombola' => 'Quilombola',
     'Sociocultural Didactic Material Native' => 'Indígena',
-    'Native Education' => 'Educação Indígena',
+    'Native Education' => 'Escola Indígena',
     'Native Education Language Native' => 'Língua Indígena',
     'Native Education Language Portuguese' => 'Língua Portuguesa',
     'Edcenso Native Languages Fk' => 'Língua Indígena',
@@ -268,6 +270,7 @@
     'Tactile Floor' => 'Pisos Táteis',
     'Doors 80' => 'Portas com no Mínimo 80 cm',
     'Ramps' => 'Rampas',
+    'Light Signaling' => 'Sinalização Luminosa',
     'Sound Signaling' => 'Sinalização Sonora',
     'Tactile Signaling' => 'Sinalização Tátil',
     'Visual Signaling' => 'Sinalização Visual',
@@ -280,6 +283,7 @@
     'Toys Early' => 'Brinquedos para Educação Infantil',
     'Scientific Materials' => 'Materiais Científicos',
     'Equipment Amplification' => 'Equipamento para Amplifiacção e Difusão de Som',
+    'Garden Planting Agricultural Activities' => 'Atividades em Área de Horta, Plantio e/ou Produção Agrícola',
     'Musical Instruments' => 'Instrumentos Musicais',
     'Educational Games' => 'Jogos Educativos',
     'Equipments Material Cultural' => 'Material para Atividades Culturais',
@@ -288,6 +292,8 @@
     'Material Teaching Indian' => 'Materiais Pedagógicos para Educação Indígena',
     'Material Teaching Ethinic' => 'Materiais Pedagógicos para Educação das Relações Étinicos Raciais',
     'Material Teaching Rural' => 'Materiais Pedagógicos para Educação do Campo',
+    'Material Teaching Quilombola' => 'Materiais Pedagógicos para a Educação Escolar Quilombola',
+    'Material Teaching Special' => 'Materiais Pedagógicos para a Educação Especial',
     'Telecommunications' => 'Telecomunicações',
     'Internet Access Administrative' => 'Para Uso Administrativo',
     'Internet Access Educative' => 'Para Uso nos Processos de Ensino',
@@ -302,6 +308,7 @@
     'Internet Access Cable' => 'A Cabo',
     'Internet Access Wireless' => 'Wireless',
     'Internet Access Inexistent' => 'Inexistente',
+    'Garden Planting Agricultural' => 'Nº de Técnicos em Horta/Plantio/Agricultura',
     'Administrative Assistant' => 'Nº de Auxiliares Administrativos',
     'Service Assistant' => 'Nº de Auxiliares de Serviços Gerais',
     'Librarian' => 'Nº de Bibliotecários',
@@ -315,6 +322,7 @@
     'School Secretary' => 'Nº de Secretário(a)s',
     'Security Gaurds' => 'Nº de Seguranças',
     'Monitors' => 'Nº de Monitores',
+    'Braille' => 'Nº de Assistentes ou Revisores em Braille',
     'Organization of Education' => 'Organização do Ensino',
     'Series Year' => 'Séries Anuais',
     'Semester Periods' => 'Peródos Semestrais',
diff --git a/app/migrations/2024-05-21-update-classroom-modality-set-100/2024-05-21-update-classroom-modality-set-100.sql b/app/migrations/2024-05-21-update-classroom-modality-set-100/2024-05-21-update-classroom-modality-set-100.sql
new file mode 100644
index 000000000..356dff7dc
--- /dev/null
+++ b/app/migrations/2024-05-21-update-classroom-modality-set-100/2024-05-21-update-classroom-modality-set-100.sql
@@ -0,0 +1,3 @@
+UPDATE classroom
+SET modality = '100'
+WHERE modality = '4';
diff --git a/app/migrations/2024-05-27_edcenso_2024/edcenso_alias b/app/migrations/2024-05-27_edcenso_2024/edcenso_alias
new file mode 100644
index 000000000..356d57e82
--- /dev/null
+++ b/app/migrations/2024-05-27_edcenso_2024/edcenso_alias
@@ -0,0 +1,65 @@
+
+-- NÃO RODAR ISSO AQUI EM BOQUIM, POIS JÁ FOI FEITO ANTERIORMENTE
+INSERT INTO edcenso_alias (register,corder,attr,cdesc,`default`,stable,year)
+SELECT register,corder,attr,cdesc,`default`,stable,'2024' FROM edcenso_alias
+WHERE year = 2023;
+--
+
+update edcenso_alias set corder = (corder + 1) where corder >= 22 and register = 10 and year = 2024;
+
+insert into edcenso_alias values
+(10, 22, 'water_supply_car', 'Carro-pipa', null, null, 2024);
+
+update edcenso_alias set corder = (corder + 1) where corder >= 78 and register = 10 and year = 2024;
+
+insert into edcenso_alias values
+(10, 78, 'dependencies_garden_planting_agricultural', 'Área de horta, plantio e/ou produção agrícola', null, null, 2024);
+
+update edcenso_alias set corder = (corder + 1) where corder >= 85 and register = 10 and year = 2024;
+
+insert into edcenso_alias values
+(10, 85, 'acessability_light_signaling', 'Sinalização/alarme luminoso', null, null, 2024);
+
+update edcenso_alias set corder = (corder + 1) where corder >= 120 and register = 10 and year = 2024;
+
+insert into edcenso_alias values
+(10, 120, 'workers_garden_planting_agricultural', 'Agrônomos(as), horticultores(as), técnicos ou monitores(as) responsáveis pela gestão da área de horta, plantio e/ou produção agrícola', null, null, 2024);
+
+update edcenso_alias set corder = (corder + 1) where corder >= 137 and register = 10 and year = 2024;
+
+insert into edcenso_alias values
+(10, 137, 'workers_braille', 'Revisor de texto Braille, assistente vidente (assistente de revisão do texto em Braille)', null, null, 2024);
+
+update edcenso_alias set corder = (corder + 1) where corder >= 144 and register = 10 and year = 2024;
+
+insert into edcenso_alias values
+(10, 144, 'equipments_garden_planting_agricultural', 'Equipamentos e instrumentos para atividades em área de horta, plantio e/ou produção agrícola', null, null, 2024);
+
+update edcenso_alias set corder = (corder + 2) where corder >= 154 and register = 10 and year = 2024;
+
+insert into edcenso_alias values
+(10, 154, 'equipments_material_teachingquilombola', 'Materiais pedagógicos para a educação escolar quilombola', null, null, 2024);
+
+insert into edcenso_alias values
+(10, 155, 'equipments_material_teachingspecial', 'Materiais pedagógicos para a educação especial', null, null, 2024);
+
+insert into edcenso_alias values
+(10, 180, '', 'A escola desenvolve ações na área de educação ambiental?', 0, null, 2024);
+
+insert into edcenso_alias values
+(10, 181, '', 'Como conteúdo dos componentes/campos de experiências presentes no currículo', null, null, 2024);
+
+insert into edcenso_alias values
+(10, 182, '', 'Como um componente curricular especial, específico, flexível ou eletivo', null, null, 2024);
+
+insert into edcenso_alias values
+(10, 183, '', 'Como um eixo estruturante do currículo', null, null, 2024);
+
+insert into edcenso_alias values
+(10, 184, '', 'Em eventos', null, null, 2024);
+
+insert into edcenso_alias values
+(10, 185, '', 'Em projetos transversais ou interdisciplinares', null, null, 2024);
+
+insert into edcenso_alias values
+(10, 186, '', 'Nenhuma das opções listadas', null, null, 2024);
diff --git a/app/migrations/2024-05-27_edcenso_2024/other_tables b/app/migrations/2024-05-27_edcenso_2024/other_tables
new file mode 100644
index 000000000..e3df80217
--- /dev/null
+++ b/app/migrations/2024-05-27_edcenso_2024/other_tables
@@ -0,0 +1,23 @@
+ALTER TABLE `school_structure`
+ADD `water_supply_car` tinyint(1) NULL AFTER `water_supply_river`;
+
+ALTER TABLE `school_structure`
+ADD `dependencies_garden_planting_agricultural` tinyint(1) NULL AFTER `dependencies_recording_and_editing_studio`;
+
+ALTER TABLE `school_structure`
+ADD `acessability_light_signaling` tinyint(1) NULL AFTER `acessability_ramps`;
+
+ALTER TABLE `school_structure`
+ADD `workers_garden_planting_agricultural` smallint(6) NULL AFTER `bandwidth`;
+
+ALTER TABLE `school_structure`
+ADD `workers_braille` smallint(6) NULL AFTER `workers_monitors`;
+
+ALTER TABLE `school_structure`
+ADD `equipments_garden_planting_agricultural` tinyint(1) NULL AFTER `equipments_equipment_amplification`;
+
+ALTER TABLE `school_structure`
+ADD `equipments_material_teachingquilombola` tinyint(1) NULL AFTER `equipments_material_teachingrural`;
+
+ALTER TABLE `school_structure`
+ADD `equipments_material_teachingspecial` tinyint(1) NULL AFTER `equipments_material_teachingquilombola`;
\ No newline at end of file
diff --git a/app/models/SchoolStructure.php b/app/models/SchoolStructure.php
index 7ae27da52..dab8a4aab 100755
--- a/app/models/SchoolStructure.php
+++ b/app/models/SchoolStructure.php
@@ -28,6 +28,7 @@
  * @property integer $water_supply_artesian_well
  * @property integer $water_supply_well
  * @property integer $water_supply_river
+ * @property integer $water_supply_car
  * @property integer $water_supply_inexistent
  * @property integer $energy_supply_public
  * @property integer $energy_supply_generator
@@ -76,6 +77,7 @@
  * @property integer $dependencies_professional_specific_lab
  * @property integer $dependencies_vocational_education_workshop
  * @property integer $dependencies_recording_and_editing_studio
+ * @property integer $dependencies_garden_planting_agricultural
  * @property integer $dependencies_none
  * @property integer $classroom_count
  * @property integer $used_classroom_count
@@ -171,6 +173,7 @@ public function rules()
                 water_supply_artesian_well,
                 water_supply_well,
                 water_supply_river,
+                water_supply_car,
                 water_supply_inexistent,
                 energy_supply_public,
                 energy_supply_generator,
@@ -219,6 +222,7 @@ public function rules()
                 dependencies_professional_specific_lab,
                 dependencies_vocational_education_workshop,
                 dependencies_recording_and_editing_studio,
+                dependencies_garden_planting_agricultural,
                 dependencies_none,
                 classroom_count,
                 used_classroom_count,
@@ -286,6 +290,7 @@ classroom_count,
                 acessability_tactile_floor,
                 acessability_doors_80cm,
                 acessability_ramps,
+                acessability_light_signaling,
                 acessability_sound_signaling,
                 acessability_tactile_singnaling,
                 acessability_visual_signaling,
@@ -299,6 +304,7 @@ classroom_count,
                 equipments_toys_early,
                 equipments_scientific_materials,
                 equipments_equipment_amplification,
+                equipments_garden_planting_agricultural,
                 equipments_musical_instruments,
                 equipments_educational_games,
                 equipments_material_cultural,
@@ -307,6 +313,8 @@ classroom_count,
                 equipments_material_teachingindian,
                 equipments_material_teachingethnic,
                 equipments_material_teachingrural,
+                equipments_material_teachingquilombola,
+                equipments_material_teachingspecial,
                 internet_access_administrative,
                 internet_access_educative_process,
                 internet_access_student,
@@ -318,6 +326,7 @@ classroom_count,
                 internet_access_local_cable,
                 internet_access_local_wireless,
                 internet_access_local_inexistet,
+                workers_garden_planting_agricultural,
                 workers_administrative_assistant,
                 workers_service_assistant,
                 workers_librarian,
@@ -331,6 +340,7 @@ classroom_count,
                 workers_school_secretary,
                 workers_security_guards,
                 workers_monitors,
+                workers_braille,
                 org_teaching_series_year,
                 org_teaching_semester_periods,
                 org_teaching_elementary_cycle,
@@ -371,7 +381,7 @@ classroom_count,
             ),
             // The following rule is used by search().
             // @todo Please remove those attributes that should not be searched.
-            array('register_type, school_inep_id_fk, operation_location_building, operation_location_temple, operation_location_businness_room, operation_location_instructor_house, operation_location_other_school_room, operation_location_barracks, operation_location_socioeducative_unity, operation_location_prison_unity, operation_location_other, building_occupation_situation, shared_building_with_school, shared_school_inep_id_1, shared_school_inep_id_2, shared_school_inep_id_3, shared_school_inep_id_4, shared_school_inep_id_5, shared_school_inep_id_6, consumed_water_type, water_supply_public, water_supply_artesian_well, water_supply_well, water_supply_river, water_supply_inexistent, energy_supply_public, energy_supply_generator, energy_supply_other, energy_supply_inexistent, sewage_public, sewage_fossa, sewage_inexistent, garbage_destination_collect, garbage_destination_burn, garbage_destination_throw_away, garbage_destination_recycle, garbage_destination_bury, garbage_destination_other, dependencies_principal_room, dependencies_instructors_room, dependencies_secretary_room, dependencies_info_lab, dependencies_science_lab, dependencies_aee_room, dependencies_indoor_sports_court, dependencies_outdoor_sports_court, dependencies_kitchen, dependencies_library, dependencies_reading_room, dependencies_playground, dependencies_nursery, dependencies_outside_bathroom, dependencies_inside_bathroom, dependencies_child_bathroom, dependencies_prysical_disability_bathroom, dependencies_physical_disability_support, dependencies_bathroom_with_shower, dependencies_refectory, dependencies_storeroom, dependencies_warehouse, dependencies_auditorium, dependencies_covered_patio, dependencies_uncovered_patio, dependencies_student_accomodation, dependencies_instructor_accomodation, dependencies_green_area, dependencies_laundry, dependencies_professional_specific_lab, dependencies_vocational_education_workshop, dependencies_recording_and_editing_studio, dependencies_none, classroom_count, used_classroom_count, instruments_inexistent, equipments_material_professional_education, equipments_tv, equipments_vcr, equipments_dvd, equipments_satellite_dish, equipments_copier, equipments_overhead_projector, equipments_printer, equipments_stereo_system, equipments_data_show, equipments_fax, equipments_camera, equipments_computer, equipments_multifunctional_printer, equipments_inexistent, administrative_computers_count, student_computers_count, internet_access, bandwidth, employees_count, feeding, aee, complementary_activities, modalities_regular, modalities_especial, modalities_eja, modalities_professional, basic_education_cycle_organized, different_location, sociocultural_didactic_material_none, sociocultural_didactic_material_quilombola, sociocultural_didactic_material_native, native_education, native_education_language_native, native_education_language_portuguese, edcenso_native_languages_fk, brazil_literate, open_weekend, pedagogical_formation_by_alternance', 'safe', 'on' => 'search'),
+            array('register_type, school_inep_id_fk, operation_location_building, operation_location_temple, operation_location_businness_room, operation_location_instructor_house, operation_location_other_school_room, operation_location_barracks, operation_location_socioeducative_unity, operation_location_prison_unity, operation_location_other, building_occupation_situation, shared_building_with_school, shared_school_inep_id_1, shared_school_inep_id_2, shared_school_inep_id_3, shared_school_inep_id_4, shared_school_inep_id_5, shared_school_inep_id_6, consumed_water_type, water_supply_public, water_supply_artesian_well, water_supply_well, water_supply_river, water_supply_car, water_supply_inexistent, energy_supply_public, energy_supply_generator, energy_supply_other, energy_supply_inexistent, sewage_public, sewage_fossa, sewage_inexistent, garbage_destination_collect, garbage_destination_burn, garbage_destination_throw_away, garbage_destination_recycle, garbage_destination_bury, garbage_destination_other, dependencies_principal_room, dependencies_instructors_room, dependencies_secretary_room, dependencies_info_lab, dependencies_science_lab, dependencies_aee_room, dependencies_indoor_sports_court, dependencies_outdoor_sports_court, dependencies_kitchen, dependencies_library, dependencies_reading_room, dependencies_playground, dependencies_nursery, dependencies_outside_bathroom, dependencies_inside_bathroom, dependencies_child_bathroom, dependencies_prysical_disability_bathroom, dependencies_physical_disability_support, dependencies_bathroom_with_shower, dependencies_refectory, dependencies_storeroom, dependencies_warehouse, dependencies_auditorium, dependencies_covered_patio, dependencies_uncovered_patio, dependencies_student_accomodation, dependencies_instructor_accomodation, dependencies_green_area, dependencies_laundry, dependencies_professional_specific_lab, dependencies_vocational_education_workshop, dependencies_recording_and_editing_studio, dependencies_garden_planting_agricultural, dependencies_none, classroom_count, used_classroom_count, instruments_inexistent, equipments_material_professional_education, equipments_tv, equipments_vcr, equipments_dvd, equipments_satellite_dish, equipments_copier, equipments_overhead_projector, equipments_printer, equipments_stereo_system, equipments_data_show, equipments_fax, equipments_camera, equipments_computer, equipments_multifunctional_printer, equipments_inexistent, administrative_computers_count, student_computers_count, internet_access, bandwidth, employees_count, feeding, aee, complementary_activities, modalities_regular, modalities_especial, modalities_eja, modalities_professional, basic_education_cycle_organized, different_location, sociocultural_didactic_material_none, sociocultural_didactic_material_quilombola, sociocultural_didactic_material_native, native_education, native_education_language_native, native_education_language_portuguese, edcenso_native_languages_fk, brazil_literate, open_weekend, pedagogical_formation_by_alternance', 'safe', 'on' => 'search'),
         );
     }
 
@@ -415,6 +425,7 @@ public function attributeLabels()
             'water_supply_artesian_well' => Yii::t('default', 'Water Supply Artesian Well'),
             'water_supply_well' => Yii::t('default', 'Water Supply Well'),
             'water_supply_river' => Yii::t('default', 'Water Supply River'),
+            'water_supply_car' => Yii::t('default', 'Water Supply Car'),
             'water_supply_inexistent' => Yii::t('default', 'Water Supply Inexistent'),
             'energy_supply_public' => Yii::t('default', 'Energy Supply Public'),
             'energy_supply_generator' => Yii::t('default', 'Energy Supply Generator'),
@@ -461,6 +472,7 @@ public function attributeLabels()
             'dependencies_professional_specific_lab' => Yii::t('default', 'Dependencies Professional Specific Lab'),
             'dependencies_vocational_education_workshop' => Yii::t('default', 'Dependencies Vocational Education Workshop'),
             'dependencies_recording_and_editing_studio' => Yii::t('default', 'Dependencies Recording And Editing Studio'),
+            'dependencies_garden_planting_agricultural' => Yii::t('default', 'Dependencies Garden Planting Agricultural'),
             'dependencies_none' => Yii::t('default', 'Dependencies None'),
             'classroom_count' => Yii::t('default', 'Classroom Count'),
             'used_classroom_count' => Yii::t('default', 'Used Classroom Count'),
@@ -531,6 +543,7 @@ public function attributeLabels()
             'acessability_tactile_floor' => Yii::t('default', 'Tactile Floor'),
             'acessability_doors_80cm' => Yii::t('default', 'Doors 80'),
             'acessability_ramps' => Yii::t('default', 'Ramps'),
+            'acessability_light_signaling' => Yii::t('default', 'Light Signaling'),
             'acessability_sound_signaling' => Yii::t('default', 'Sound Signaling'),
             'acessability_tactile_singnaling' => Yii::t('default', 'Tactile Signaling'),
             'acessability_visual_signaling' => Yii::t('default', 'Visual Signaling'),
@@ -544,6 +557,7 @@ public function attributeLabels()
             'equipments_toys_early' => Yii::t('default', 'Toys Early'),
             'equipments_scientific_materials' => Yii::t('default', 'Scientific Materials'),
             'equipments_equipment_amplification' => Yii::t('default', 'Equipment Amplification'),
+            'equipments_garden_planting_agricultural' => Yii::t('default', 'Garden Planting Agricultural Activities'),
             'equipments_musical_instruments' => Yii::t('default', 'Musical Instruments'),
             'equipments_educational_games' => Yii::t('default', 'Educational Games'),
             'equipments_material_cultural' => Yii::t('default', 'Equipments Material Cultural'),
@@ -552,6 +566,8 @@ public function attributeLabels()
             'equipments_material_teachingindian' => Yii::t('default', 'Material Teaching Indian'),
             'equipments_material_teachingethnic' => Yii::t('default', 'Material Teaching Ethinic'),
             'equipments_material_teachingrural' => Yii::t('default', 'Material Teaching Rural'),
+            'equipments_material_teachingquilombola' => Yii::t('default', 'Material Teaching Quilombola'),
+            'equipments_material_teachingspecial' => Yii::t('default', 'Material Teaching Special'),
             'internet_access_administrative' => Yii::t('default', 'Internet Access Administrative'),
             'internet_access_educative_process' => Yii::t('default', 'Internet Access Educative'),
             'internet_access_student' => Yii::t('default', 'Internet Access Student'),
@@ -563,6 +579,7 @@ public function attributeLabels()
             'internet_access_local_cable' => Yii::t('default', 'Internet Access Cable'),
             'internet_access_local_wireless' => Yii::t('default', 'Internet Access Wireless'),
             'internet_access_local_inexistet' => Yii::t('default', 'Internet Access Inexistent'),
+            'workers_garden_planting_agricultural' => Yii::t('default', 'Garden Planting Agricultural'),
             'workers_administrative_assistant' => Yii::t('default', 'Administrative Assistant'),
             'workers_service_assistant' => Yii::t('default', 'Service Assistant'),
             'workers_librarian' => Yii::t('default', 'Librarian'),
@@ -576,6 +593,7 @@ public function attributeLabels()
             'workers_school_secretary' => Yii::t('default', 'School Secretary'),
             'workers_security_guards' => Yii::t('default', 'Security Gaurds'),
             'workers_monitors' => Yii::t('default', 'Monitors'),
+            'workers_braille' => Yii::t('default', 'Braille'),
             'org_teaching_series_year' => Yii::t('default', 'Series Year'),
             'org_teaching_semester_periods' => Yii::t('default', 'Semester Periods'),
             'org_teaching_elementary_cycle' => Yii::t('default', 'Elementary Cycle'),
@@ -690,6 +708,7 @@ public function search()
         $criteria->compare('dependencies_professional_specific_lab', $this->dependencies_professional_specific_lab);
         $criteria->compare('dependencies_vocational_education_workshop', $this->dependencies_vocational_education_workshop);
         $criteria->compare('dependencies_recording_and_editing_studio', $this->dependencies_recording_and_editing_studio);
+        $criteria->compare('dependencies_garden_planting_agricultural', $this->dependencies_garden_planting_agricultural);
         $criteria->compare('dependencies_none', $this->dependencies_none);
         $criteria->compare('classroom_count', $this->classroom_count);
         $criteria->compare('used_classroom_count', $this->used_classroom_count);
diff --git a/app/models/StudentEnrollment.php b/app/models/StudentEnrollment.php
index 7291102f0..fb16a29c8 100755
--- a/app/models/StudentEnrollment.php
+++ b/app/models/StudentEnrollment.php
@@ -81,6 +81,7 @@ class StudentEnrollment extends AltActiveRecord
     public const STATUS_CONCLUDED = "CONCLUINTE";
     public const STATUS_INDETERMINED = "INDETERMINADO";
     public const STATUS_DEATH = "OBITO";
+    public const STATUS_ADVANCED = "AVANÇADO";
 
     public $school_year;
     public $sedsp_sync;
@@ -590,6 +591,7 @@ public static function getListStatus(){
             "9" => StudentEnrollment::STATUS_CONCLUDED,
             "10" => StudentEnrollment::STATUS_INDETERMINED,
             "11" => StudentEnrollment::STATUS_DEATH,
+            "12" => StudentEnrollment::STATUS_ADVANCED
         ];
 
         return $status;
@@ -609,6 +611,7 @@ public function getCurrentStatus(){
             "9" => StudentEnrollment::STATUS_CONCLUDED,
             "10" => StudentEnrollment::STATUS_INDETERMINED,
             "11" => StudentEnrollment::STATUS_DEATH,
+            "12" => StudentEnrollment::STATUS_ADVANCED
         ];
 
         return $status[$this->status];
@@ -636,6 +639,7 @@ public static function getStatusId($status){
              StudentEnrollment::STATUS_CONCLUDED => "9" ,
              StudentEnrollment::STATUS_INDETERMINED => "10" ,
              StudentEnrollment::STATUS_DEATH => "11" ,
+             StudentEnrollment::STATUS_ADVANCED => "12"
         ];
 
         return $statusList[$status];
diff --git a/app/modules/dashboard/controllers/DefaultController.php b/app/modules/dashboard/controllers/DefaultController.php
index 476ebdd80..4f5b5e0a3 100644
--- a/app/modules/dashboard/controllers/DefaultController.php
+++ b/app/modules/dashboard/controllers/DefaultController.php
@@ -5,11 +5,11 @@ class DefaultController extends Controller
 	public function actionIndex()
 	{
 		$getToken = new GetToken();
-        $token = $getToken->exec('edacd1e1-74e0-4637-a2b8-780b9c244de0','22d50e93-debe-451b-9501-fed42c92df5e');
+        $token = $getToken->exec('edacd1e1-74e0-4637-a2b8-780b9c244de0','d89e1bae-dbc9-45fe-afb6-ab0d067603cc');
 		$this->render('index',  array(
             'token' => $token,
 			'embedUrl' =>'https://app.powerbi.com/reportEmbed',
-			'reportId' => '22d50e93-debe-451b-9501-fed42c92df5e'
+			'reportId' => 'd89e1bae-dbc9-45fe-afb6-ab0d067603cc'
         ));
 	}
-}
\ No newline at end of file
+}
diff --git a/app/modules/dashboard/services/DashboardService.php b/app/modules/dashboard/services/DashboardService.php
index 93b2d2ef5..32a57eed9 100644
--- a/app/modules/dashboard/services/DashboardService.php
+++ b/app/modules/dashboard/services/DashboardService.php
@@ -3,9 +3,9 @@ class DashboardService
 {
      public function getAccessToken() {
         $url = 'https://login.microsoftonline.com/common/oauth2/token';
-        $username = 'ti.pauloh@ipti.org.br';
-        $pss = '81260235Ph.';
-        $clientId = 'fdc41ef1-199b-475a-adfd-408fb1a53937';
+        $username = getenv('USER_NAME_POWER_BI');
+        $pss = getenv('PSS_POWER_BI');
+        $clientId = getenv('CLIENT_ID_POWER_BI');
 
         $headers = array(
             'Content-Type: application/x-www-form-urlencoded'
diff --git a/app/modules/dashboard/views/default/index.php b/app/modules/dashboard/views/default/index.php
index 2cc1f74b4..da62e1bb4 100644
--- a/app/modules/dashboard/views/default/index.php
+++ b/app/modules/dashboard/views/default/index.php
@@ -33,11 +33,47 @@
 			tokenType: models.TokenType.Embed,
 			accessToken: embedToken,
 			embedUrl: '<?= $embedUrl ?>',
-			id: '<?= $reportId ?>'
-		};
-		// Get a reference to the embedded dashboard HTML element 
-		const reportContainer = $('#reportContainer')[0];
-		// Embed the dashboard and display it within the div container. 
+			id: '<?= $reportId ?>',
+            settings: {
+                panes: {
+                    filters: {
+                        visible: false // Hide the filter pane
+                    },
+                    pageNavigation: {
+                        visible: true
+                    }
+                },
+                bars: {
+                    statusBar: {
+                        visible: true
+                    }
+                }
+            }
+        };
+        const reportContainer = document.getElementById('reportContainer');
+        const report = powerbi.embed(reportContainer, config);
+
+        const currentHost = window.location.hostname;
+
+        const filter = {
+            $schema: "http://powerbi.com/product/schema#basic",
+            target: {
+                table: "Accumulated_Data",
+                column: "Database_name"
+            },
+            operator: "In",
+            values: [currentHost]
+        };
+		// Embed the dashboard and display it within the div container.
 		powerbi.embed(reportContainer, config);
+        report.on('loaded', function() {
+            report.updateFilters(models.FiltersOperations.Add, [filter])
+                .then(function() {
+                    console.log('Filter applied');
+                })
+                .catch(function(errors) {
+                    console.error('Error applying filter:', errors);
+                });
 	});
-</script>
\ No newline at end of file
+})
+</script>
diff --git a/app/repository/ReportsRepository.php b/app/repository/ReportsRepository.php
index e1d62eaab..08ef71926 100644
--- a/app/repository/ReportsRepository.php
+++ b/app/repository/ReportsRepository.php
@@ -183,6 +183,7 @@ public function getNumberOfStudentsEnrolledPerPeriodAllSchools(CHttpRequest $req
                 WHEN 9 THEN 'Concluinte'
                 WHEN 10 THEN 'Indeterminado'
                 WHEN 11 THEN 'Obito'
+                WHEN 12 THEN 'Avançado'
                 ELSE ''
                 END AS status_descricao
                 FROM
@@ -232,6 +233,7 @@ public function getNumberOfStudentsEnrolledPerPeriodPerSchool(CHttpRequest $requ
                 WHEN 9 THEN 'Concluinte'
                 WHEN 10 THEN 'Indeterminado'
                 WHEN 11 THEN 'Obito'
+                WHEN 12 THEN 'Avançado'
                 ELSE ''
                 END AS status_descricao
                 FROM
@@ -282,6 +284,7 @@ public function getNumberOfStudentsEnrolledPerPeriodPerClassroom(CHttpRequest $r
                 WHEN 9 THEN 'Concluinte'
                 WHEN 10 THEN 'Indeterminado'
                 WHEN 11 THEN 'Obito'
+                WHEN 12 THEN 'Avançado'
                 ELSE ''
                 END AS status_descricao
                 FROM
diff --git a/config.php b/config.php
index 16693f16c..c4dbf5cb3 100644
--- a/config.php
+++ b/config.php
@@ -4,7 +4,7 @@
 $debug = getenv("YII_DEBUG");
 defined('YII_DEBUG') or define('YII_DEBUG', $debug);
 
-define("TAG_VERSION", '3.79.152');
+define("TAG_VERSION", '3.80.161');
 
 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>');
diff --git a/themes/default/views/classroom/_form.php b/themes/default/views/classroom/_form.php
index 2284624b5..2def925cd 100755
--- a/themes/default/views/classroom/_form.php
+++ b/themes/default/views/classroom/_form.php
@@ -167,8 +167,9 @@
                                     '1' => 'Ensino Regular',
                                     '2' => 'Educação Especial - Modalidade Substitutiva',
                                     '3' => 'Educação de Jovens e Adultos (EJA)',
-                                    '4' => 'Não se aplica',
-                                    '5' => 'Atendimento Educacional Especializado'
+                                    '4' => 'Educação Profissional',
+                                    '5' => 'Atendimento Educacional Especializado',
+                                    '100' => 'Não se aplica'
                                 ), array('prompt' => 'Selecione a Modalidade', 'class' => 'select-search-off t-field-select__input', 'style' => 'width: 100%'));
                                 ?>
                                 <?php echo $form->error($modelClassroom, 'modality'); ?>
diff --git a/themes/default/views/forms/StudentFileForm.php b/themes/default/views/forms/StudentFileForm.php
index e4cf6f553..d80997690 100755
--- a/themes/default/views/forms/StudentFileForm.php
+++ b/themes/default/views/forms/StudentFileForm.php
@@ -14,22 +14,16 @@
 
 ?>
 
-
 <div id="body-students-file-form" class="pageA4V">
-    <?php
-    $this->renderPartial('head');
-    $data = StudentEnrollment::getFileInformation($enrollment->id);
-    $birth_uf = $enrollment->studentFk->edcensoUfFk->acronym;
-    ?>
-    <br>
-    <div style="width: 100%; margin: 0 auto; text-align:center;margin-top: -15px;">
+    <div id="head">
         <?php
-        /* if ($_REQUEST['type'] == '3') {
-             echo '<div style=" height:100%;  border: 1px solid black; background-color: lightgray; margin-bottom: 5px;">'
-             . 'PROCESSO DE RECONHECIMENTO NO CMEB Nº 216.02\2013 - RESOLUÇÃO CMEB Nº 75\2014'
-             . '</div>';
-         }*/
+        $this->renderPartial('head');
+        $data = StudentEnrollment::getFileInformation($enrollment->id);
+        $birth_uf = $enrollment->studentFk->edcensoUfFk->acronym;
         ?>
+    </div>
+    <br>
+    <div style="width: 100%; margin: 0 auto; text-align:center;margin-top: -15px;">
         <div style=" height:100%;  border: 1px solid black; background-color: lightgray; margin-bottom: 5px;">
             <?php //echo $namereport
             ?>
@@ -39,6 +33,9 @@
         <span style="clear:both;display:block"></span>
         <div style="border:1px solid black; float:left; width: 2.5cm; height: 3cm; text-align:center;margin-right: 15px;"><br><br><span>F O T O<br>3 x 4</span></div>
         <table style="border: 1px solid black;">
+            <tr>
+                <th></th>
+            </tr>
             <tr>
                 <?php
                 if ($_REQUEST['type'] == '0') {
@@ -65,7 +62,6 @@
                     echo '<td colspan="3">O(A) ALUNO(A) REQUER SUA MATRÍCULA ';
                 ?>
                     NO_________ANO
-                    <!--<span class="class"></span>-->
                 <?php
                     echo ', DE ACORDO COM SITUAÇÃO APRESENTADA ABAIXO, A QUAL PEDE DEFERIMENTO.</td>';
                 } else {
@@ -123,10 +119,6 @@
     </div>
     <br>
 
-
-
-
-
     <table id="report-table" class="table table-bordered">
         <tr>
             <th style="text-align: center">BLOCO 1 - IDENTIFICAÇÃO E CADASTRO</th>
@@ -147,7 +139,7 @@
             <td>
                 <div class="span4"><b>03 - Naturalidade: <span class="nationality"><?= $data['nationality'] ?></span></b></div>
                 <div class="span4"><b>País: <span class="nationality"><?= $data['nation'] ?></span></b></div>
-                <span class="<?php echo $data['nationality'] !== 'Brasileira' ? 'hide':''; ?>">
+                <span class="<?php echo $data['nationality'] !== 'Brasileira' ? 'hide' : ''; ?>">
                     <div class="span12">
                         <b>UF: </b><span class="address_uf"><?= $data['birth_uf'] ?></span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <b>Município: </b>&nbsp;<span class="birth_city"><?= $data['birth_city'] ?></span>/<?php echo $birth_uf ?>
@@ -198,7 +190,7 @@
             <td>
                 <?php if ($data['cc'] == 1) { ?>
                     <div id="old_cc">
-                        <div class="span9"><b>08 - Certidão Civil de <span class="cc_type"><?= $data['cc_type'] ?></span></b></div>
+                        <div class="span9"><b>09 - Certidão Civil de <span class="cc_type"><?= $data['cc_type'] ?></span></b></div>
                         <br />
                         <div class="span2"><b>Nº: </b><span class="cc_number"><?= $data['cc_number'] ?></span></div>
                         <div class="span2"><b>Livro: </b><span class="cc_book"><?= $data['cc_book'] ?></span></div>
@@ -210,7 +202,7 @@
                     </div>
                 <?php } else { ?>
                     <div id="new_cc">
-                        <div class="span9"><b>09 - Certidão Civil:</b>
+                        <div class="span9"><b>10 - Certidão Civil:</b>
                         </div>
                         <br />
                         <div class="span9"><b>Nº:</b><span class="cc_new"><?= $data['cc_new'] ?></span></div>
@@ -221,20 +213,20 @@
         <tr>
             <td>
                 <div class="span4">
-                    <b>10 - RG: </b><span class="rg"><?= $data['rg'] ?></span>
+                    <b>11 - RG: </b><span class="rg"><?= $data['rg'] ?></span>
                 </div>
                 <div class="span4">
-                    <b>11 - CPF: </b><span class="cpf"><?= $data['cpf'] ?></span>
+                    <b>12 - CPF: </b><span class="cpf"><?= $data['cpf'] ?></span>
                 </div>
                 <div class="span4">
-                    <b>12 - CNS: </b><span class="cns"><?= $data['cns'] ?></span>
+                    <b>13 - CNS: </b><span class="cns"><?= $data['cns'] ?></span>
                 </div>
             </td>
         </tr>
         <tr>
             <td>
                 <div class="span12">
-                    <b>13 - Nome do responsável e parentesco: </b><span class="responsable_name"><?= $data['responsable_name'] ?></span>
+                    <b>14 - Nome do responsável e parentesco: </b><span class="responsable_name"><?= $data['responsable_name'] ?></span>
                 </div>
                 <div class="span4">
                     <b>RG: </b><span class="responsable_rg"><?= $data['responsable_rg'] ?></span>
@@ -249,31 +241,28 @@
         </tr>
         <tr>
             <td>
-                <div class="span10"><b>14 - Grau de escolaridade do responsável:</b>
+                <div class="span10"><b>15 - Grau de escolaridade do responsável:</b>
                     <br><span class="responsable_scholarity"><?= $data['responsable_scholarity'] ?></span>
-                    </<div>
+                    </t<div>
             </td>
         </tr>
         <tr>
             <td>
-                <div class="span10"><b>15 - Profissão do responsável: </b>
+                <div class="span10"><b>16 - Profissão do responsável: </b>
                     <br><span class="responsable_job"><?= $data['responsable_job'] ?></span>
                 </div>
             </td>
         </tr>
     </table>
 
-
-
-
-    <table style="margin-top:10px;" id="report-table" class="table table-bordered">
+    <table id="report-table" class="table table-bordered">
         <tr>
             <th style="text-align: center">CARACTERIZAÇÃO</th>
         </tr>
         <?php if (GLOGALGROUP != 1) { ?>
             <tr>
                 <td>
-                    <div class="span12"><b>16 - Matrícula do aluno: </b></div>
+                    <div class="span12"><b>17 - Matrícula do aluno: </b></div>
                     <br>
                     <div class="span3"><b>Ano letivo: </b><span><?= $enrollment->classroomFk->school_year ?></span></div>
                     <div class="span4"><b>Série: </b><span><?= $enrollment->edcensoStageVsModalityFk->name ?></span></div>
@@ -289,7 +278,7 @@
         <?php } ?>
         <tr>
             <td>
-                <div class="span10"><b>17 - Documentos(s) que habilita(m) matrícula no segmento: </b>
+                <div class="span10"><b>18 - Documentos(s) que habilita(m) matrícula no segmento: </b>
                     <!--CORRIGIR AQUI--->
                     <!--<div class="received_documents"></div>-->
                     <br>
@@ -300,13 +289,13 @@
         </tr>
         <tr>
             <td>
-                <div class="span9"><b>18 - Data de ingresso nesta escola: <span style="font-size:12px;" class="school_admission_date"><?= $data['school_admission_date'] ?></span></b>
+                <div class="span9"><b>19 - Data de ingresso nesta escola: <span style="font-size:12px;" class="school_admission_date"><?= $data['school_admission_date'] ?></span></b>
                 </div>
             </td>
         </tr>
         <tr>
             <td>
-                <div class="span9"><b>19 - Situação do aluno na série/etapa: </b>
+                <div class="span9"><b>20 - Situação do aluno na série/etapa: </b>
                     <br>
                     <div style="margin-right: -20px;">
                         <?php
@@ -329,140 +318,141 @@
         </tr>
         <tr>
             <td>
-                <div class="span10"><b>20 - Situação do Aluno no ano Anterior: </b></div>
-                <br>
-                <div class="span3 padding-5" style="margin-right: -20px;">
-                    <b><?= ($enrollment->previous_stage_situation == 0) ? '☑' : '☐' ?></b> Não Frequentou
-                    <br><b><?= ($enrollment->previous_stage_situation == 1) ? '☑' : '☐' ?></b> Reprovado
-                </div>
-                <div class="span4 padding-5" style="margin-right: -20px;">
-                    <b><?= ($enrollment->previous_stage_situation == 2) ? '☑' : '☐' ?></b> Afastado por transferência
-                    <br><b><?= ($enrollment->previous_stage_situation == 4) ? '☑' : '☐' ?></b> Matrícula final em Educação Infantil
-                </div>
-                <div class="span3 padding-5">
-                    <b><?= ($enrollment->previous_stage_situation == 3) ? '☑' : '☐' ?></b> Afastado por abandono
-                    <br><b><?= ($enrollment->previous_stage_situation == 5) ? '☑' : '☐' ?></b> Promovido
+                <div class="span9"><b>21 - Situação do Aluno no ano Anterior: </b>
+                    <br>
+                    <div class="padding-5" style="margin-right: -20px;">
+                        <b><?= ($enrollment->previous_stage_situation == 0) ? '☑' : '☐' ?></b> Não Frequentou
+                        <br><b><?= ($enrollment->previous_stage_situation == 1) ? '☑' : '☐' ?></b> Reprovado
+                    </div>
+                    <div class="padding-5" style="margin-right: -20px;">
+                        <b><?= ($enrollment->previous_stage_situation == 2) ? '☑' : '☐' ?></b> Afastado por transferência
+                        <br><b><?= ($enrollment->previous_stage_situation == 4) ? '☑' : '☐' ?></b> Matrícula final em Educação Infantil
+                    </div>
+                    <div class="padding-5">
+                        <b><?= ($enrollment->previous_stage_situation == 3) ? '☑' : '☐' ?></b> Afastado por abandono
+                        <br><b><?= ($enrollment->previous_stage_situation == 5) ? '☑' : '☐' ?></b> Promovido
+                    </div>
                 </div>
             </td>
         </tr>
+    </table>
 
-        <!--<tr>
-            <td>
-                <div class="span10"><b>17 - Situação do aluno no ano anterior: </b>
-                    <br/>
+    <div id="no-break" style="margin: 0px">
+        <table id="report-table" class="table table-bordered">
+            <tr>
+                <th></th>
+            </tr>
+            <tr>
+                <td>
+                    <div class="span12"><b>22 - Portador de Necessidades Especiais? </b></div>
                     <br>
-                    <!--<br><span class="previous_stage_situation"></span>
-                </div>
-            </td>
-        </tr>-->
-        <tr>
-            <td>
-                <div class="span12"><b>21 - Portador de Necessidades Especiais? </b></div>
-                <br>
-                <div class="span2"><b><?= ($data['deficiency'] != 'Não') ? '☑' : '☐' ?></b> Sim</div>
-                <div class="span2"><b><?= ($data['deficiency'] == 'Não') ? '☑' : '☐' ?></b> Não</div>
-                <div class="span8" style="margin-bottom:8px;"><b>Tipo: </b>
-                    <span><?= ($data['deficiency'] != 'Não') ? $data['deficiency'] : '';?></span>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="span12"><b>22 - Participa do Programa Bolsa Família? </b></div>
-                <!-- <br><span class="bf_participator"><?= $data['bf_participator'] ?></span> -->
-                <div class="span4"><b><?= ($data['bf_participator'] == 'Sim') ? '☑' : '☐' ?></b> Bolsa Família</div>
-                <div class="span4"><b>☐</b> PETI</div>
-                <div class="span4"><b>☐</b> Pro Jovem</div>
-                <br>
-                <div class="span12 margin-15"><b>Outro: </b>____________________________________________________</div>
+                    <div class="span2"><b><?= ($data['deficiency'] != 'Não') ? '☑' : '☐' ?></b> Sim</div>
+                    <div class="span2"><b><?= ($data['deficiency'] == 'Não') ? '☑' : '☐' ?></b> Não</div>
+                    <div class="span8" style="margin-bottom:8px;"><b>Tipo: </b>
+                        <span><?= ($data['deficiency'] != 'Não') ? $data['deficiency'] : ''; ?></span>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="span12"><b>23 - Participa do Programa Bolsa Família? </b></div>
+                    <!-- <br><span class="bf_participator"><?= $data['bf_participator'] ?></span> -->
+                    <div class="span4"><b><?= ($data['bf_participator'] == 'Sim') ? '☑' : '☐' ?></b> Bolsa Família</div>
+                    <div class="span4"><b>☐</b> PETI</div>
+                    <div class="span4"><b>☐</b> Pro Jovem</div>
+                    <br>
+                    <div class="span12 margin-15"><b>Outro: </b>____________________________________________________</div>
 
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="span10"><b>23 - Utiliza transporte escolar? </b>
-                    <span class="public_transport">
-                        <?= ($enrollment->public_transport == '0') ? 'Não' : 'Sim' ?>
-                    </span>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="span10"><b>24 - Restrição alimentar ou alergia a: </b>
-                    <?php
-                    $result = '';
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="span10"><b>24 - Utiliza transporte escolar? </b>
+                        <span class="public_transport">
+                            <?= ($enrollment->public_transport == '0') ? 'Não' : 'Sim' ?>
+                        </span>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="span10"><b>25 - Restrição alimentar ou alergia a: </b>
+                        <?php
+                        $result = '';
 
-                    if ($data['celiac'] == '1') {
-                        $result .= 'Doença celíaca';
-                    }
+                        if ($data['celiac'] == '1') {
+                            $result .= 'Doença celíaca';
+                        }
 
-                    if ($data['diabetes'] == '1') {
-                        $result .= ($result ? ', ' : '') . 'Diabetes';
-                    }
+                        if ($data['diabetes'] == '1') {
+                            $result .= ($result ? ', ' : '') . 'Diabetes';
+                        }
 
-                    if ($data['hypertension'] == '1') {
-                        $result .= ($result ? ', ' : '') . 'Hipertensão';
-                    }
+                        if ($data['hypertension'] == '1') {
+                            $result .= ($result ? ', ' : '') . 'Hipertensão';
+                        }
 
-                    if ($data['iron_deficiency_anemia'] == '1') {
-                        $result .= ($result ? ', ' : '') . 'Anemia ferropriva';
-                    }
+                        if ($data['iron_deficiency_anemia'] == '1') {
+                            $result .= ($result ? ', ' : '') . 'Anemia ferropriva';
+                        }
 
-                    if ($data['sickle_cell_anemia'] == '1') {
-                        $result .= ($result ? ', ' : '') . 'Anemia falciforme';
-                    }
+                        if ($data['sickle_cell_anemia'] == '1') {
+                            $result .= ($result ? ', ' : '') . 'Anemia falciforme';
+                        }
 
-                    if ($data['lactose_intolerance'] == '1') {
-                        $result .= ($result ? ', ' : '') . 'Intolerância à lactose';
-                    }
+                        if ($data['lactose_intolerance'] == '1') {
+                            $result .= ($result ? ', ' : '') . 'Intolerância à lactose';
+                        }
 
-                    if ($data['malnutrition'] == '1') {
-                        $result .= ($result ? ', ' : '') . 'Desnutrição';
-                    }
+                        if ($data['malnutrition'] == '1') {
+                            $result .= ($result ? ', ' : '') . 'Desnutrição';
+                        }
 
-                    if ($data['obesity'] == '1') {
-                        $result .= ($result ? ', ' : '') . 'Obesidade';
-                    }
+                        if ($data['obesity'] == '1') {
+                            $result .= ($result ? ', ' : '') . 'Obesidade';
+                        }
 
-                    if (!empty($data['others'])) {
-                        $result .= ($result ? ', ' : '') . $data['others'];
-                    }
+                        if (!empty($data['others'])) {
+                            $result .= ($result ? ', ' : '') . $data['others'];
+                        }
 
-                    echo $result;
-                    ?>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="span12"><b>24 - Portador de algum tipo de transtorno? </b></div>
-                <br>
-                <div style="margin-left: 10px;">
-                    <div class="padding-5"><b><?= ($data['tdah'] == '1') ? '☑' : '☐' ?></b> Transtorno do déficit de atenção com hiperatividade (TDAH)</div>
-                    <div class="padding-5"><b><?= ($data['depressao'] == '1') ? '☑' : '☐' ?></b> Transtorno depressivo (depressão)</div>
-                    <div class="padding-5"><b><?= ($data['tab'] == '1') ? '☑' : '☐' ?></b> Transtorno bipolar (TAB)</div>
-                    <div class="padding-5"><b><?= ($data['toc'] == '1') ? '☑' : '☐' ?></b> Transtorno obsessivo compulsivo (TOC)</div>
-                    <div class="padding-5"><b><?= ($data['tag'] == '1') ? '☑' : '☐' ?></b> Transtorno de ansiedade generalizada (TAG)</div>
-                    <div class="padding-5"><b><?= ($data['tod'] == '1') ? '☑' : '☐' ?></b> Distúrbio desafiador e de oposição (TOD)</div>
-                    <div class="padding-5"><b><?= ($data['tcne'] == '1') ? '☑' : '☐' ?></b> Transtorno de conduta não especificado</div>
-                    <div class="padding-5"><b>Outros transtornos de conduta: </b><?= ($data['disorder_others'])?></div>
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <div class="span12"><b>25 - Autorização do Termo de Consentimento da Imagem? </b></div>
-                <br>
-                <div class="span2"><b><?= ($data['consent_form'] == '1') ? '☑' : '☐' ?></b> Sim</div>
-                <div class="span2"><b><?= ($data['consent_form'] == '0') ? '☑' : '☐' ?></b> Não</div>
-            </td>
-        </tr>
-    </table>
+                        echo $result;
+                        ?>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="span9"><b>26 - Portador de algum tipo de transtorno? </b>
+                        <br>
+                        <div class="padding-5"><b><?= ($data['tdah'] == '1') ? '☑' : '☐' ?></b> Transtorno do déficit de atenção com hiperatividade (TDAH)</div>
+                        <div class="padding-5"><b><?= ($data['depressao'] == '1') ? '☑' : '☐' ?></b> Transtorno depressivo (depressão)</div>
+                        <div class="padding-5"><b><?= ($data['tab'] == '1') ? '☑' : '☐' ?></b> Transtorno bipolar (TAB)</div>
+                        <div class="padding-5"><b><?= ($data['toc'] == '1') ? '☑' : '☐' ?></b> Transtorno obsessivo compulsivo (TOC)</div>
+                        <div class="padding-5"><b><?= ($data['tag'] == '1') ? '☑' : '☐' ?></b> Transtorno de ansiedade generalizada (TAG)</div>
+                        <div class="padding-5"><b><?= ($data['tod'] == '1') ? '☑' : '☐' ?></b> Distúrbio desafiador e de oposição (TOD)</div>
+                        <div class="padding-5"><b><?= ($data['tcne'] == '1') ? '☑' : '☐' ?></b> Transtorno de conduta não especificado</div>
+                        <div class="padding-5"><b>Outros transtornos de conduta: </b><?= ($data['disorder_others']) ?></div>
+                    </div>
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    <div class="span12"><b>27 - Autorização do Termo de Consentimento da Imagem? </b></div>
+                    <br>
+                    <div class="span2"><b><?= ($data['consent_form'] == '1') ? '☑' : '☐' ?></b> Sim</div>
+                    <div class="span2"><b><?= ($data['consent_form'] == '0') ? '☑' : '☐' ?></b> Não</div>
+                </td>
+            </tr>
+        </table>
+    </div>
 </div>
 
-
 <style>
+    .table-bordered {
+        margin: 0px;
+    }
+
     .container-report {
         width: 980px;
         margin: auto;
@@ -524,7 +514,6 @@
 
     .table-border {
         width: 100%;
-        page-break-inside: auto
     }
 
     @media screen {
@@ -550,6 +539,21 @@
     }
 
     @media print {
+
+        #head {
+            display: flex;
+            flex-direction: column;
+            text-align: center;
+            align-items: center;
+        }
+        .table-bordered {
+            margin: 0 0 20px;
+        }
+
+        #no-break {
+            page-break-inside: avoid;
+        }
+
         .pageA4V {
             width: 960px;
             height: 1200px;
@@ -617,10 +621,6 @@
             background-color: #C6D9F1 !important;
         }
 
-        #body-students-file-form {
-            page-break-after: always;
-        }
-
         .titleBig {
             border-right: 1px solid black !important;
         }
diff --git a/themes/default/views/school/_form.php b/themes/default/views/school/_form.php
index 5e437ff7d..dc7c6cd81 100644
--- a/themes/default/views/school/_form.php
+++ b/themes/default/views/school/_form.php
@@ -730,8 +730,9 @@
                                     array(
                                         null => 'Selecione a localização', 1 => 'Área de assentamento',
                                         2 => 'Terra indígena',
-                                        3 => 'Área onde se localiza a comunidade remanescente de quilombos',
-                                        7 => 'A escola não está em área diferenciada'
+                                        3 => 'Comunidade quilombola',
+                                        7 => 'A escola não está em área diferenciada',
+                                        8 => 'Área onde se localizam povos e comunidades tradicionais'
                                     ),
                                     array('class' => 'select-search-off t-field-select__input select2-container')
                                 ); ?>
@@ -1088,6 +1089,27 @@
                     </div>
                     <div class="row">
                         <div class="column is-two-fifths clearleft">
+                            <div class="t-field-text">
+                                <?php echo $form->label(
+                                    $modelSchoolStructure,
+                                    'workers_garden_planting_agricultural',
+                                    array('class' => 't-field-text__label')
+                                ); ?>
+                                <?php echo $form->textField(
+                                    $modelSchoolStructure,
+                                    'workers_garden_planting_agricultural',
+                                    array(
+                                        'placeholder' => 'Digite o Número de Técnicos em Horta/Plantio/Agricultura',
+                                        'class' => 't-field-text__input'
+                                    )
+                                ); ?>
+                                <?php echo $form->error(
+                                    $modelSchoolStructure,
+                                    'workers_garden_planting_agricultural'
+                                ); ?>
+                            </div>
+                        </div>
+                        <div class="column clearleft--on-mobile is-two-fifths">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1108,7 +1130,9 @@
                                 ); ?>
                             </div>
                         </div>
-                        <div class="column clearleft--on-mobile is-two-fifths">
+                    </div>
+                    <div class="row">
+                        <div class="column is-two-fifths clearleft">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1131,9 +1155,7 @@
                                 ); ?>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="column is-two-fifths clearleft">
+                        <div class="column clearleft--on-mobile is-two-fifths">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1156,7 +1178,9 @@
                                 ); ?>
                             </div>
                         </div>
-                        <div class="column clearleft--on-mobile is-two-fifths">
+                    </div>
+                    <div class="row">
+                        <div class="column is-two-fifths clearleft">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1177,9 +1201,7 @@
                                 ); ?>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="column is-two-fifths clearleft">
+                        <div class="column clearleft--on-mobile is-two-fifths">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1200,7 +1222,9 @@
                                 ); ?>
                             </div>
                         </div>
-                        <div class="column clearleft--on-mobile is-two-fifths">
+                    </div>
+                    <div class="row">
+                        <div class="column is-two-fifths clearleft">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1221,9 +1245,7 @@
                                 ); ?>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="column is-two-fifths clearleft">
+                        <div class="column clearleft--on-mobile is-two-fifths">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1244,7 +1266,9 @@
                                 ); ?>
                             </div>
                         </div>
-                        <div class="column clearleft--on-mobile is-two-fifths">
+                    </div>
+                    <div class="row">
+                        <div class="column is-two-fifths clearleft">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1265,9 +1289,7 @@
                                 ); ?>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="column is-two-fifths clearleft">
+                        <div class="column clearleft--on-mobile is-two-fifths">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1288,7 +1310,9 @@
                                 ); ?>
                             </div>
                         </div>
-                        <div class="column clearleft--on-mobile is-two-fifths">
+                    </div>
+                    <div class="row">
+                        <div class="column is-two-fifths clearleft">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1309,9 +1333,7 @@
                                 ); ?>
                             </div>
                         </div>
-                    </div>
-                    <div class="row">
-                        <div class="column is-two-fifths clearleft">
+                        <div class="column clearleft--on-mobile is-two-fifths">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1332,7 +1354,9 @@
                                 ); ?>
                             </div>
                         </div>
-                        <div class="column clearleft--on-mobile is-two-fifths">
+                    </div>
+                    <div class="row">
+                        <div class="column is-two-fifths clearleft">
                             <div class="t-field-text">
                                 <?php echo $form->label(
                                     $modelSchoolStructure,
@@ -1353,6 +1377,27 @@
                                 ); ?>
                             </div>
                         </div>
+                        <div class="column clearleft--on-mobile is-two-fifths">
+                            <div class="t-field-text">
+                                <?php echo $form->label(
+                                    $modelSchoolStructure,
+                                    'workers_braille',
+                                    array('class' => 't-field-text__label')
+                                ); ?>
+                                <?php echo $form->textField(
+                                    $modelSchoolStructure,
+                                    'workers_braille',
+                                    array(
+                                        'placeholder' => 'Digite o Número de Assistentes ou Revisores em Braille',
+                                        'class' => 't-field-text__input'
+                                    )
+                                ); ?>
+                                <?php echo $form->error(
+                                    $modelSchoolStructure,
+                                    'workers_braille'
+                                ); ?>
+                            </div>
+                        </div>
                     </div>
 
                     <div>
@@ -1677,6 +1722,16 @@
                                         <?php echo SchoolStructure::model()->attributeLabels()['dependencies_recording_and_editing_studio']; ?>
                                     </label>
                                 </div>
+                                <div class="t-field-checkbox">
+                                    <?php echo $form->checkBox(
+                                        $modelSchoolStructure,
+                                        'dependencies_garden_planting_agricultural',
+                                        array('value' => 1, 'uncheckValue' => 0)
+                                    ); ?>
+                                    <label class="t-field-checkbox">
+                                        <?php echo SchoolStructure::model()->attributeLabels()['dependencies_garden_planting_agricultural']; ?>
+                                    </label>
+                                </div>
                                 <div class="t-field-checkbox">
                                     <?php echo $form->checkBox(
                                         $modelSchoolStructure,
@@ -1920,6 +1975,16 @@
                                         <?php echo SchoolStructure::model()->attributeLabels()['water_supply_river']; ?>
                                     </label>
                                 </div>
+                                <div class="t-field-checkbox">
+                                    <?php echo $form->checkBox(
+                                        $modelSchoolStructure,
+                                        'water_supply_car',
+                                        array('value' => 1, 'uncheckValue' => 0)
+                                    ); ?>
+                                    <label class="t-field-checkbox">
+                                        <?php echo SchoolStructure::model()->attributeLabels()['water_supply_car']; ?>
+                                    </label>
+                                </div>
                                 <div class="t-field-checkbox">
                                     <?php echo $form->checkBox(
                                         $modelSchoolStructure,
@@ -2308,6 +2373,16 @@
                                     <?php echo SchoolStructure::model()->attributeLabels()['acessability_ramps']; ?>
                                 </label>
                             </div>
+                            <div class="t-field-checkbox">
+                                <?php echo $form->checkBox(
+                                    $modelSchoolStructure,
+                                    'acessability_light_signaling',
+                                    array('value' => 1, 'uncheckValue' => 0)
+                                ); ?>
+                                <label class="t-field-checkbox">
+                                    <?php echo SchoolStructure::model()->attributeLabels()['acessability_light_signaling']; ?>
+                                </label>
+                            </div>
                             <div class="t-field-checkbox">
                                 <?php echo $form->checkBox(
                                     $modelSchoolStructure,
@@ -3580,6 +3655,16 @@
                                         <?php echo SchoolStructure::model()->attributeLabels()['equipments_equipment_amplification']; ?>
                                     </label>
                                 </div>
+                                <div class="t-field-checkbox">
+                                    <?php echo $form->checkBox(
+                                        $modelSchoolStructure,
+                                        'equipments_garden_planting_agricultural',
+                                        array('value' => 1, 'uncheckValue' => 0)
+                                    ); ?>
+                                    <label class="t-field-checkbox">
+                                        <?php echo SchoolStructure::model()->attributeLabels()['equipments_garden_planting_agricultural']; ?>
+                                    </label>
+                                </div>
                                 <div class="t-field-checkbox">
                                     <?php echo $form->checkBox(
                                         $modelSchoolStructure,
@@ -3670,6 +3755,26 @@
                                         <?php echo SchoolStructure::model()->attributeLabels()['equipments_material_teachingrural']; ?>
                                     </label>
                                 </div>
+                                <div class="t-field-checkbox">
+                                    <?php echo $form->checkBox(
+                                        $modelSchoolStructure,
+                                        'equipments_material_teachingquilombola',
+                                        array('value' => 1, 'uncheckValue' => 0)
+                                    ); ?>
+                                    <label class="t-field-checkbox">
+                                        <?php echo SchoolStructure::model()->attributeLabels()['equipments_material_teachingquilombola']; ?>
+                                    </label>
+                                </div>
+                                <div class="t-field-checkbox">
+                                    <?php echo $form->checkBox(
+                                        $modelSchoolStructure,
+                                        'equipments_material_teachingspecial',
+                                        array('value' => 1, 'uncheckValue' => 0)
+                                    ); ?>
+                                    <label class="t-field-checkbox">
+                                        <?php echo SchoolStructure::model()->attributeLabels()['equipments_material_teachingspecial']; ?>
+                                    </label>
+                                </div>
                                 <div class="t-field-checkbox">
                                     <?php echo $form->checkBox(
                                         $modelSchoolStructure,
diff --git a/themes/default/views/student/_form.php b/themes/default/views/student/_form.php
index 5957d5718..fc86b56ab 100755
--- a/themes/default/views/student/_form.php
+++ b/themes/default/views/student/_form.php
@@ -1663,9 +1663,10 @@ class="t-field-checkbox__label"><?php echo Yii::t('default', 'Required Resources
                                     array(
                                         null => 'Selecione a localização',
                                         7 => 'Não reside em área de localização diferenciada',
-                                        3 => 'Área onde se localiza comunidade remanescente de quilombos',
+                                        1 => 'Área de assentamento',
                                         2 => 'Terra indígena',
-                                        1 => 'Área de assentamento'
+                                        3 => 'Comunidade quilombola',
+                                        8 => 'Área onde se localizam povos e comunidades tradicionais'
                                     ),
                                     array("class" => "select-search-on t-field-select__input select2-container")
                                 ); ?>
@@ -2153,6 +2154,9 @@ class="t-field-checkbox__label"><?php echo Yii::t('default', 'Type of Specialize
                                                             case "11":
                                                                 echo "<label class='t-badge-critical'>Falecido</label>";
                                                                 break;
+                                                            case "12":
+                                                                echo "<label class='t-badge-success'>Avançado</label>";
+                                                                break;
                                                             default:
                                                                 echo "";
                                                         }
@@ -2290,9 +2294,13 @@ class="accordion-label"><?php echo $me->classroomFk->school_year ?></label>
                                                 </div>
                                                 <?php if ($me->classroomFk->school_year >= Yii::app()->user->year) { ?>
                                                     <div class="row">
-                                                        <a href='#' id="delete-enrollment" class="t-link-button--warning"
-                                                            enrollment="<?= $me->id ?>">Cancelar
-                                                            Matrícula</a>
+                                                        <a
+                                                            href='#'
+                                                            id="delete-enrollment"
+                                                            class="t-link-button--warning"
+                                                            enrollment="<?= $me->id ?>"
+                                                            >Excluir Matrícula
+                                                        </a>
                                                     </div>
                                                 <?php } ?>
                                             </div>