-
Notifications
You must be signed in to change notification settings - Fork 4
Commit 2b15f0f
Fix/censo2024 (#769)
* 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>
* Adicionando o código do professor na listagem da tabela (#746)
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
* Adicionando o código na exibição da tabela de turmas (#747)
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>
* Adicionando o código na exibição da tabela de alunos (#748)
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>
* retirado regra velha de registros com numeros defasados
* enviando apenas matriculas de alunos cujo status esteja 1 (matriculado)
* permitido que se exporte matrículas com status NULL
* resolvido bug de inep_id de instructor_documents_and_address vazio SOBRESCREVENDO o inep_id preenchido (ou não) de instructor_identification.
* inserido validadores de modalidade não aplicável
* impedido que se envie registro 30 de aluno de turma sem professor
* inserido erro no validador
* resolvido bug em equipamento de educação profissional
* resolvido problema de def multipla
---------
Co-authored-by: Tori Calasans <107931809+Tori-IPTI@users.noreply.github.com>
Co-authored-by: Igor Gonçalves <igor_goncalves@live.com>
Co-authored-by: Tori Calasans <tori.ti@ipti.org.br>
Co-authored-by: gabriel-IPTI <ti.gabriel@ipti.org.br>
Co-authored-by: GabrielChagas14 <gmelo123455@gmail.com>
Co-authored-by: GabrielChagas14 <84946326+GabrielChagas14@users.noreply.github.com>
Co-authored-by: TI GUSTAVO <ti.gustavo@ipti.org.br>
Co-authored-by: Gustavo Santos <gustavo.santos23703@gmail.com>
Co-authored-by: Evellyn Jade <97754536+evellynreis@users.noreply.github.com>
Co-authored-by: Nathan Santos <117388330+nathanipti@users.noreply.github.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>1 parent 2546766 commit 2b15f0fCopy full SHA for 2b15f0f
File tree
Expand file treeCollapse file tree
3 files changed
+14
-26
lines changedFilter options
- app/libraries/Educacenso
- js/student/form
- themes/default/views/student
Expand file treeCollapse file tree
3 files changed
+14
-26
lines changedapp/libraries/Educacenso/Register30.php
Copy file name to clipboardExpand all lines: app/libraries/Educacenso/Register30.php+13Lines changed: 13 additions & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
207 | 207 |
| |
208 | 208 |
| |
209 | 209 |
| |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
210 | 223 |
| |
211 | 224 |
| |
212 | 225 |
| |
|
js/student/form/validations.js
Copy file name to clipboardExpand all lines: js/student/form/validations.js+1-20Lines changed: 1 addition & 20 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
330 | 330 |
| |
331 | 331 |
| |
332 | 332 |
| |
333 |
| - | |
334 | 333 |
| |
335 | 334 |
| |
336 | 335 |
| |
| |||
356 | 355 |
| |
357 | 356 |
| |
358 | 357 |
| |
359 |
| - | |
360 |
| - | |
361 | 358 |
| |
362 | 359 |
| |
363 | 360 |
| |
| |||
380 | 377 |
| |
381 | 378 |
| |
382 | 379 |
| |
383 |
| - | |
384 |
| - | |
385 | 380 |
| |
386 | 381 |
| |
387 | 382 |
| |
| |||
713 | 708 |
| |
714 | 709 |
| |
715 | 710 |
| |
716 |
| - | |
717 |
| - | |
718 |
| - | |
719 |
| - | |
720 |
| - | |
721 |
| - | |
722 |
| - | |
723 |
| - | |
724 |
| - | |
725 |
| - | |
726 |
| - | |
727 |
| - | |
728 |
| - | |
729 |
| - | |
730 | 711 |
| |
731 | 712 |
| |
732 | 713 |
| |
| |||
1230 | 1211 |
| |
1231 | 1212 |
| |
1232 | 1213 |
| |
1233 |
| - | |
| 1214 | + | |
1234 | 1215 |
| |
1235 | 1216 |
| |
1236 | 1217 |
| |
|
themes/default/views/student/_form.php
Copy file name to clipboardExpand all lines: themes/default/views/student/_form.php-6Lines changed: 0 additions & 6 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
462 | 462 |
| |
463 | 463 |
| |
464 | 464 |
| |
465 |
| - | |
466 |
| - | |
467 |
| - | |
468 |
| - | |
469 |
| - | |
470 |
| - | |
471 | 465 |
| |
472 | 466 |
| |
473 | 467 |
| |
|
0 commit comments