Skip to content

Commit

Permalink
Release/3.80.161 (#743)
Browse files Browse the repository at this point in the history 
* 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 dc62637.

* 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 ada2490.

* 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 dc62637.

* 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

* 💄feat/badge style updated

* 💄feat/fix icon style and padding in button

* 🗃️raw/upload sql changes and CHANGELOG update

* 🗃️raw/upload sql changes and remove comments

* small change on placeholder in modal

* 🏷️fix/removing var declared variables

* 🏷️fix/removing sonarlint issues

---------

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

* main.css

* Feat calendar surpassing year (#619)

* primeiro commit da branch

* feito parcialmente calendário

* retirado função de disponibilizar calendário

* update do calendar_fk das turmas

* adequado vigencia das unidades

* calendario supostamente finalizado

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

* refatorado quadro de horário com ano passando

* reinserido schedule

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

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

* Adequado selects em aulas ministradas e frequencia

* Adição dos calendarios no cadastro das turmas

* alterado sql

* Merge

* fix sonarcloud

---------

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

* Criando a action de save no controller de farmer register

* fix merge

* Criando a tabela de visualização de agricultores

* Criado as telas de relacionadas a agricultor

* fix/variable declared incorrectly in function scope

* Adicionando a school_fk e o status em food_request

* conectando com o firebase

* Realizando integração com o firebase

* Corrigindo erros do sonarlint

* Corrigindo errors sonarlint

* Corrigindo erros do sonarlint

* Corrigindo issues alertados pelo sonarlint

* Corrigindo issues

* Feat/change food measurement (#635)

* create migration

* adicionando input de quantidade

* mudando componente de cardápio

* alterado food_measurement

* change reports

* mudado componente de cardápio

* alterado food_measurement

* alterado food_measurement

* alterado food_measurement

* alterado food_measurement

* sonarlint issues

* resolve conflicts

* sonarlint issues

* main.css

* mudado componente de cardápio

---------

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

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

* 🐛fix/minor fundamental conditional fixed

* :docs:docs/CHANGELOG updated

* fix/function parameter fixed

---------

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

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

* Feat: case added for class 22 and multi alias

* Feat: added changelog

* Feat: added version in config

* Feat: added case 2 for class

---------

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

* Fix: gestor not edit calendar (#640)

* Fix: gestor not edit calendar

* Feat: added version in changelog e config

* Feat: added menu for calendário para professor

* Feat: added acess for admin

---------

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

* fix/poco_dantas (#643)

* fix/ add cep formated

* fix/ add changelog

---------

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

* rename food folders

* fix: rename foodrequest folder

* fix file rename

* consertado redirecionamento em Foodmenu

* fix: rename folder

* fix: delete file

* Feat/warning missing content (#639)

* Apresentação de duas listas na pagina inicial

* Apresentação dos primeiros warns e estrutura contada

* Mais warnings avaliados

* Alertando todos os problemas pedidos

* Limite de quantidade de warns e ajustes

* inserido painel de cadastros pendentes 100%

* inserindo validação pra gestor escolar

* updating name branch

* ajeitado painel de cadastros pendentes

* bug phps

* bug phps

* renomeado pra maiusculos novamente

* renomeado pra maiusculos novamente

* renomeado pra maiusculos novamente

* corrigido incongruências de case sensitive

* corrigido incongruências de case sensitive

* retirado conflito de foodmenu.php

* config e changelog

---------

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

* Fix/frequency_75 (#644)

* fix/ add property frequency in use case

* fix/add function get and set

* fix/modify controller

* fix/add changelog

---------

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

* Fix/scholarity sql column removed (#645)

* Fix/scholarity sql column removed

* Feat: added new version in changelog and config

---------

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

* Fix/merenda escolar (#648)

* first commit

* first commit

* Ajustes visuais na tela de cadastro de cardápio

* Ajustes visuais na tela de cadastro de cardápio

* change foodmenu

---------

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

* Fixing tag version number

* Fixing changelog

* Feat/food notice (#650)

* finalizado crud de edital

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

* update migration

* github issues

* sonnar issues

* atualizado versão do sistema

* ignore case

* corrigindo viewlunch

* rename file

* rename file

* fix: creating notice button and fixing delete notice redirection

* consertado o redirecionamento na actionDelete

* fix folders

* fix some sonarcloud issues

* sonarlint issues

* sonarlint issues

* sonarlint issues

---------

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

* Fix/no_notes (#651)

* fix/sets status to one

* fix/ add changelog

---------

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

* Fix/corrections and improvements (#655)

* Feat: added limit for not accessing future month

* Fix: correction in attribute id_school

* Fix: added inepId for inconsistencys

* Fix: removed integer $inep_id

* Fix: added filter for auth assignment

* Feat: added new version in changelog and config

---------

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

* Fix: added food Enabled (#654)

* Fix: added food Enabled

* Feat: added migration

* Feat/boquim integration (#652)

* sqls para rodar nos bancos velhos de boquim

* testado import de vanda 100%

* ORGANIZADO SQLS

* minor fix

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

* aprimorado o readme

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

* update logs

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

---------

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

* Feat/instructor frequency (#657)

* sqls para rodar nos bancos velhos de boquim

* testado import de vanda 100%

* ORGANIZADO SQLS

* minor fix

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

* aprimorado o readme

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

* update logs

* Frequência do professor

* fix update log

---------

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

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

* Feat: added professional for different schools

* Fix: remove unique for cpf_professional

* Feat: added new version in changelog and config

* Feat: added new version in changelog and config

* ci: add release sql

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

* Feat: added msg for inconsistency sagres

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

* Fix: corretion in uninitialized value

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

* Fix: manager authorized for school pdf

* Fix: set id student inconsistency sagres

* Feat: added new version in changelog and config

* Fix de teste da falta de curricular matrix e notas

* logs

* Icon font version update

* Feat: added new version in changelog and config

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

* Feat: added professional for different schools

* Fix: remove unique for cpf_professional

* Feat: added new version in changelog and config

* Feat: added new version in changelog and config

* Fix: correction in find professional

* Fix: correction in inep_id (#664)

* Fix: correction in inep_id

* Feat: added new version in changelog and config

---------

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

* Fix: correction in description class (#668)

* Fix: correction in description class

* Feat: added new version for changelog and config

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

* Feat/food notice (#647)

* finalizado crud de edital

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

* update migration

* github issues

* sonnar issues

* atualizado versão do sistema

* ignore case

* corrigindo viewlunch

* rename file

* rename file

* fix: creating notice button and fixing delete notice redirection

* consertado o redirecionamento na actionDelete

* fix folders

* fix some sonarcloud issues

* sonarlint issues

* sonarlint issues

* sonarlint issues

---------

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

* Feat/create farmer register (#653)

* Pegando as informações do firebase

* realizando o merge com a dev e modificando o changelog

* Corrigindo o controller farmerregister

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

* Conectando o update do agricultor com o firebase

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

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

* Corrigindo issues

* corrigindo code smells

---------

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

* corrigido bug produzido em 15/03/2024

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

* add lunch unities

* mudado versão do sistema

* Feat/school management signature (#675)

* Feat: added school management signature

* Feat: added new version for changelog and config

---------

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

* Fix/date corrections (#673)

* Fix: correction in the student date field

* Fix: correction in the school initial_date field

* Fix: correction in the Instructor birthday_date field

* Feat: added validation for duplicate cpfs

* Feat: added function for validate cpf

* Feat: added new version form changelog e config

* Feat: only takes active schools

* Fix: corrections for dates

* Fix: correction in js validation for initial_date

* Feat: added limit for date initial_date

---------

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

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

* alterado _initialization_instructor

* fix instructor frequency

* fix instructor frequency

* mudado versão do sistema

* refatorado _initialization_instructor.js

---------

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

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

* Fix: Reordered parameters in getSchedulesFromMajorStage method

* Feat: added new version in changelog and config

---------

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

* fix: remove jquery

* Fix/sagres componentes curriculares (#691)

* Fix? added new inconsistencys for empty components curriculares

* Feat: added new version for changelog and config

* Icon font version update

* add bytecodes

* Fix/class turn (#683)

* Fix: correction in class id

* Feat: added new version for changelog and config

---------

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

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

* first commit

* models adjustment and module configs

* create view finished

* create action finished/ update function already working

* pendingPlans added

* ref/module adjusted

* table finished, just missing the action to validate

* new inputs added

* function adjusted

* minor adjustment

* request added

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

* feat/create button to enable edition

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

* feat/observation field added to form

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

* docs/CHANGELOG e config.php updated

* fix/update description in select itens

* fix/sanitize html appends and sonarlint issues

* fix/sonarlint and change description

* feat/icons inserted

* fix/icon styles

---------

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

* Fix/datepicker pt br (#693)

* Feat: added class DatePickerWidget

* Fix: added new renderDatePicker

* Fix: added new renderDatePicker for school

* Fix: added new renderDatePicker for student

* Feat: added new version for changelog and config

---------

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

* Fix/inconsistency lunch (#679)

* fix: added new id for lunch inconsistencys

* Feat: added property for class model

* Feat: added min caractres for restrictions lunch

* Feat: added msg for error

* Feat: added new version for changelog and config

* Feat: added migration

---------

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

* Fix/food module (#672)

* fix merenda

* alterando menuCOmponent

* mudado componente de menu

* mudando componente de cardápio

* mudado componente de cardápio

* mudando FoodMenuReport

* mudando componente de cardápio

* change componente de menu

* corrigido componente de cardápio

* change menuComponent.js

* alterada versão do tag

* fix inventory

* alterado _initialization.js

---------

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

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

* fix/select now shows food values

* fix:modal updated and necessary API routes created

* fix/lunch meal controller adjusted

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

* fix/change in render partial params

* fix/some forms are already working

* fix/form and action finished

* fix/remove unnecessary comments

* CHANGELOG updated

* fix/sonarlint fixes

* fix(lunch): Corrigindo comando sql da migration

---------

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

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

* fix/stock

* atualizado versão do tag

* refatorada a função de concatName

---------

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

* Fix/instructor frequency (#689)

* alterado _initialization_instructor

* fix instructor frequency

* fix instructor frequency

* mudado versão do sistema

* refatorado _initialization_instructor.js

* fix/intructor_frequency

* fix/intructor_frequency

* corrigindo frequency_instructor

---------

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

* add 2024-29-04_remove_duplicate_lunch_unity

* Fix/food inventory (#707)

* fix food inventory

* sonarlint issues

* atualizando versão

---------

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

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

* feat/create table student_disorder

* feat/modify StudentFileForm disorder

* feat/add field disorder in form student

* feat/add model student disorder

* feat/add echo model StudentDisorder in form student

* feat/migration

* feat/modify controller student action update and create

* feat/add margin

* feat/add column of nationality

* feat/add constraint

* feat/save studentDisorder

* feat/modify label others

* feat/modify field deficiency

* feat/add margin

* feat/modify label

* Fix/counting faults (#674)

* Fix: added filter for schedule year

* Fix: correction in sql for get number faults

* Fix: remove selection for s.year

* Feat: added new version in changelog and config

* Fix: added filter for edcenso_stage_vs_modality_fk to get faults

* Fix: added set 0 for null days

* Fix: count falts

---------

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

* fix: delete user

* fix/courseplan start date field fixed

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

* fix/add nation to report

* fix/report file and studentfile view updated

* fix/adjust in report view

* CHANGELOG updated

* raw/studentfile view updated

---------

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

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

* fix/hide property removed from table

* CHANGELOG & config.php updated

* fix/sticky property added to student name column

* minor changes

* fix/add sticky property to empty cells

---------

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

* fix/reports-correction (#708)

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

* fix/add option select...

* fix/add assignment of option outside of condition

* fix/add changelog

---------

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

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

* Refactor: Enhanced UI and adjusted student data iteration

* Refactor: Optimized updateStudentAnottations function for better data handling

* Refactor: Enhanced updateStudentAnottations function for better data organization

* Feat: added new verson in changelog and config

---------

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

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

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

* fix/string format converter removed

* docs/CHANGELOG and version file updated

* fix/view sql file fixed

* Fix: correction of the modality options

---------

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

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

* Feat: added migration

* Feat: added new version for changelog and config

---------

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

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

* fix/correction rule instructor educacenso

* fix/ add changelog

---------

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

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

* Fix: correction in id student identification

* Feat: added new version for changelog and config

---------

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

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

* feat/ add date final form school

* feat/identation html

* feat/add click reset js

* feat/update reset js

* feat/add changelog

---------

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

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

* feat/update model

* feat/update function validateCivilRegister, and message added error

* add changelog

---------

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

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

* Refactor user creation and school assignment logic

* Feat: added new version for changlog and config

* Feat: added visibility should be explicitly declared

---------

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

* Feat/timesheet overwrite past days (#704)

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

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

* changelog

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

---------

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

* change power bi module

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

* fix/create migration update modality classroom

* fix/update form, and added option education professional

* fix/update form

* fix/correction function isValidProfessionalEducation

* revert instance

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

* fix/ refatoring html

* fix/correction form

* fix/add margin css print

* correction merge

* fix/correction sonarlint css and add div head

* fix/correction table th, and modify indice 21

* fix/add changelog

---------

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

* Feat/edcenso 2024 (#730)

* Adaptação para o educacenso 2024

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

* changelog

* Update config.php

---------

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

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

* fix/edit name link, of delete enrollment

* add changelog

---------

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

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

* fix/refactoring actionvalidate in class censo controller

* fix/implementing processed instructor

* fix/add changelog

---------

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

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

* fix/correction option max date, function renderDatePickerFinal

* fix/add changelog

* correction render date picker final

---------

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

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

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

* fix/add changelog

---------

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

---------

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>
  • Loading branch information
@igorgoncalves @Gusta-Santos
@GabrielChagas14 @gabriel-IPTI @evellynreis @Tori-IPTI @nathanipti @paulones @ByteCarlos @AnotherOne07 @LiviaMartinsIPTI @NathanaelSantos
19 people authored Jun 6, 2024
1 parent 08b4e43 commit bbda9ea
Show file tree
Hide file tree
Showing 26 changed files with 581 additions and 258 deletions.
38 changes: 36 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
5 changes: 3 additions & 2 deletions app/components/DatePickerWidget.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,17 @@ public static function renderDatePicker($model, $attribute)

public static function renderDatePickerFinal($model, $attribute)
{
$year = (date('Y') + 1);
return [
'model' => $model,
'attribute' => $attribute,
'options' => [
'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'
Expand Down
45 changes: 30 additions & 15 deletions app/controllers/CensoController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]));

Expand Down Expand Up @@ -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"]));
Expand All @@ -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"],
Expand Down Expand Up @@ -486,13 +489,16 @@ 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"],
$collumn["equipments_material_sports"],
$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"]));
Expand Down Expand Up @@ -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'],
Expand Down Expand Up @@ -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]);
}

Expand Down
19 changes: 5 additions & 14 deletions app/controllers/ClassesController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -280,7 +272,6 @@ private function updateStudentAnottations($schedule, $students)
{
$studentArray = [];
foreach ($students as $student) {

$studentData = [
"id" => $student["id"],
"name" => $student["name"],
Expand Down
20 changes: 10 additions & 10 deletions app/extensions/Validator/ClassroomValidation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}

Expand Down Expand Up @@ -576,4 +576,4 @@ public function containsStudents($studentsEnrollment) {
}
}

?>
?>
2 changes: 1 addition & 1 deletion app/extensions/Validator/SchoolIdentificationValidation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}

Expand Down
2 changes: 1 addition & 1 deletion app/extensions/Validator/SchoolStructureValidation.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}
}
}
Expand Down
17 changes: 13 additions & 4 deletions app/libraries/Educacenso/Register10.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down Expand Up @@ -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';
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 2 additions & 3 deletions app/libraries/Educacenso/Register20.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];

Expand Down Expand Up @@ -239,7 +238,7 @@ public static function export($year)
}

array_push($registers, implode('|', $register));
// }
}
}

return $registers;
Expand Down
Loading

0 comments on commit bbda9ea

Please sign in to comment.