Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portabilis patch 20/04/2023 #906

Merged
merged 509 commits into from Apr 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
509 commits
Select commit Hold shift + click to select a range
64da285
Organiza `phpunit.xml` para PHPUnit 10
edineivaldameri Mar 16, 2023
82e2337
Style code
edineivaldameri Mar 16, 2023
1495057
Ajusta lógica para previnir itens vazios
jrbarros Mar 16, 2023
f7e87a4
Ajusta lógica para previnir itens vazios na criação
jrbarros Mar 16, 2023
8a68df4
Merge pull request #9436 from portabilis/fix_hora_falta
jrbarros Mar 16, 2023
4b63fe2
Remove arquivos que criavam a tabela `modules.docente_licenciatura`
edineivaldameri Mar 17, 2023
8c32d80
Remove vínculo com a tabela `modules.docente_licenciatura`
edineivaldameri Mar 17, 2023
0ba84af
Remove arquivos relacionados a tabela `modules.docente_licenciatura`
edineivaldameri Mar 17, 2023
95251fa
Adiciona migration para remoção da tabela `modules.docente_licenciatura`
edineivaldameri Mar 17, 2023
2cb6660
Style code main
edineivaldameri Mar 17, 2023
40858dd
Adiciona validação para laudo médico para transtornos
robertfsousa Mar 17, 2023
be5b28f
Incrementa versão dos assets
robertfsousa Mar 17, 2023
f759e80
Adiciona filtro por nome da deficiência ou transtorno
robertfsousa Mar 17, 2023
345b5d3
Merge pull request #9438 from portabilis/fix-migration
edineivaldameri Mar 17, 2023
280cad1
Adiciona migration para remover a table `modules.falta_geral_max`
edineivaldameri Mar 17, 2023
0f10085
Adiciona migration para remover a table `modules.falta_geral_min`
edineivaldameri Mar 17, 2023
f3255b2
Merge pull request #9439 from portabilis/add-laudo-medico
robertfsousa Mar 20, 2023
9365445
Remove arquivos que criavam a tabela `modules.uniforme_aluno`
edineivaldameri Mar 20, 2023
4bba067
Remove classe `clsModulesUniformeAluno`
edineivaldameri Mar 20, 2023
b6d5525
Adiciona migration para remoção da tabela `modules.uniforme_aluno`
edineivaldameri Mar 20, 2023
31a35c4
Merge pull request #8802 from portabilis/enrollment-promotion-async
jrbarros Mar 20, 2023
212a1cd
Merge branch 'main' into php82
jrbarros Mar 20, 2023
549c76b
Atualiza versão do componser.lock
jrbarros Mar 20, 2023
f5e7059
Remove linha que atribuía valor inválido ao select
edineivaldameri Mar 20, 2023
91e2d66
Incrementa versão dos assets
edineivaldameri Mar 20, 2023
c6870ff
Style code main
edineivaldameri Mar 20, 2023
b8b727c
Remove migration que criava a tabela `pmieducar.disciplina_topico`
edineivaldameri Mar 20, 2023
ef078b1
Adiciona migration para remover a tabela `pmieducar.disciplina_topico`
edineivaldameri Mar 20, 2023
b629bb7
Adiciona builder para LegacySchoolClassStage
robertfsousa Mar 21, 2023
b41f165
Renomeia relacionamento de module para stageType
robertfsousa Mar 21, 2023
d669dfd
Adiciona novo builder no model LegacySchoolClassStage
robertfsousa Mar 21, 2023
7d9c872
Adiciona endpoint para os nomes das etapas
robertfsousa Mar 21, 2023
7a419e5
Merge pull request #9443 from portabilis/issue-2975
edineivaldameri Mar 21, 2023
53079a7
Merge pull request #9441 from portabilis/issue-2977
edineivaldameri Mar 21, 2023
6fbc294
Merge pull request #9440 from portabilis/issue-2976
edineivaldameri Mar 21, 2023
4168a4a
Merge pull request #9432 from portabilis/issue-2913
edineivaldameri Mar 21, 2023
b1a0241
Adiciona extenções do PHP na imagem de testes
jrbarros Mar 21, 2023
58c8795
Merge pull request #9442 from portabilis/issue-2985
edineivaldameri Mar 21, 2023
0d8c4b2
Adiciona middleware auth sanctum
robertfsousa Mar 21, 2023
874d27a
Merge pull request #9431 from portabilis/issue-2926
robertfsousa Mar 22, 2023
25ac6b2
Altera parâmetro que recebe a etapa
edineivaldameri Mar 22, 2023
141d967
Merge pull request #9427 from portabilis/issue-2938
edineivaldameri Mar 22, 2023
be48578
Merge pull request #9444 from portabilis/issue-2988
edineivaldameri Mar 22, 2023
530faf6
Remove as migrations que criavam a tabela `pmieducar.material_didatico`
edineivaldameri Mar 23, 2023
edead06
Remove as migrations que criavam a tabela `pmieducar.material_tipo`
edineivaldameri Mar 23, 2023
1e98968
Remove o arquivo ajax vínculado a tabela `pmieducar.material_tipo`
edineivaldameri Mar 23, 2023
c965218
Adiciona migration para remover a tabela `pmieducar.material_tipo`
edineivaldameri Mar 23, 2023
bfddc76
Adiciona migration para remover a tabela `pmieducar.material_didatico`
edineivaldameri Mar 23, 2023
2e1e914
Style code da `main`
edineivaldameri Mar 23, 2023
af8e784
Altera ordem de execução das migrations
edineivaldameri Mar 23, 2023
724bdc8
Remove as migrations de criação da tabela `matricula_excessao`
edineivaldameri Mar 23, 2023
73d1449
Adiciona migration para remover a tabela `matricula_excessao`
edineivaldameri Mar 23, 2023
2c1cc4f
Corrige contagem de alunos no exportador
robertfsousa Mar 24, 2023
dd13b84
Merge pull request #9448 from portabilis/fix-exporter-student
robertfsousa Mar 24, 2023
d0b2c36
Adiciona migration para remover a tabela `pmieducar.quantidade_reserv…
edineivaldameri Mar 24, 2023
ec39cec
Remove a migration que criava a tabela `pmieducar.quantidade_reserva_…
edineivaldameri Mar 24, 2023
d40cf7d
Merge pull request #9445 from portabilis/honeybadger-94635575
edineivaldameri Mar 24, 2023
e5c6ac9
Merge pull request #9437 from portabilis/issue-2973
edineivaldameri Mar 24, 2023
69245f8
Adiciona migration para remover a tabela `public.users`
edineivaldameri Mar 24, 2023
8dce165
Remove parâmetro utilizado para a coluna `idocup`
edineivaldameri Mar 24, 2023
0e179d6
Merge pull request #9451 from portabilis/fix-idocup
edineivaldameri Mar 24, 2023
22b1766
Merge branch 'main' into issue-2541
edineivaldameri Mar 24, 2023
22a3064
Altera `faker->name` por `faker->name()`
edineivaldameri Mar 16, 2023
21d0ce1
Altera `faker->dateTime` por `faker->dateTime()`
edineivaldameri Mar 16, 2023
7f43a41
Altera `faker->firstName` por `faker->firstName()`
edineivaldameri Mar 16, 2023
2941979
Altera o método `company` para `company()`
edineivaldameri Mar 16, 2023
f7e4214
Altera o método `address` para `address()`
edineivaldameri Mar 16, 2023
aeff102
Altera o método `lastName` para `lastName()`
edineivaldameri Mar 16, 2023
155d332
Altera o método `city` para `city()`
edineivaldameri Mar 16, 2023
bb3217d
Remove migrations que criavam a tabela `pmieducar.faltas`
edineivaldameri Mar 24, 2023
31c1fa0
Remove menção a tabela `pmieducar.falta_aluno`
edineivaldameri Mar 24, 2023
13de4aa
Remove as migartions que criavam a tabela `pmieducar.falta_aluno`
edineivaldameri Mar 24, 2023
d40f357
Adiciona migrations para remover a tabela `pmieducar.falta_aluno`
edineivaldameri Mar 24, 2023
22e2660
Adiciona migrations para remover a tabela `pmieducar.faltas`
edineivaldameri Mar 24, 2023
8beac95
Remove funções que não são utilizadas
edineivaldameri Mar 24, 2023
e11a54e
Altera local de execução dos testes
edineivaldameri Mar 24, 2023
f607ef2
Merge pull request #9455 from portabilis/ubuntu-latest
edineivaldameri Mar 27, 2023
4aabbaf
Adiciona migration para organizar a tabela `modules.area_conhecimento`
edineivaldameri Mar 27, 2023
8ef98d1
Adiciona migration para organizar a tabela `modules.area_conhecimento`
edineivaldameri Mar 27, 2023
b92fe2d
Adiciona nome de chave estrangeira
edineivaldameri Mar 27, 2023
4bfb7cb
Adiciona migration para organizar a tabela `modules.componente_curric…
edineivaldameri Mar 27, 2023
6f4801d
Adiciona migration para organizar a tabela `modules.educacenso_cod_al…
edineivaldameri Mar 27, 2023
fea6171
Altera model da tabela `modules.educacenso_cod_aluno` para o novo for…
edineivaldameri Mar 27, 2023
376a71d
Adiciona schema ao nome das tabelas
edineivaldameri Mar 27, 2023
a4dcf28
Corrige nomenclatura da chave
edineivaldameri Mar 27, 2023
5235979
Adiciona migration para organizar a tabela `modules.educacenso_cod_do…
edineivaldameri Mar 27, 2023
97cee65
Altera model da tabela modules.educacenso_cod_docente para o novo for…
edineivaldameri Mar 27, 2023
9c0b46c
Adiciona migration para organizar a tabela `modules.educacenso_cod_es…
edineivaldameri Mar 27, 2023
01a6cd4
Altera model da tabela `modules.educacenso_cod_escola` para o novo fo…
edineivaldameri Mar 27, 2023
34b386b
Adiciona migration para organizar a tabela `modules.educacenso_cod_tu…
edineivaldameri Mar 27, 2023
ff161c4
ltera model da tabela `modules.educacenso_cod_turma` para o novo form…
edineivaldameri Mar 27, 2023
3b64c9e
Merge pull request #9452 from portabilis/faker
edineivaldameri Mar 28, 2023
d6a6fa4
Organiza teste para novo comportamento da classe
edineivaldameri Mar 28, 2023
e207f55
Merge branch 'main' into issue-2541
edineivaldameri Mar 28, 2023
c14e7dc
Move os $dates para $casts
edineivaldameri Mar 15, 2023
5045294
Merge pull request #9462 from portabilis/casts
edineivaldameri Mar 28, 2023
82aeeca
Merge pull request #9453 from portabilis/issue-3014
edineivaldameri Mar 28, 2023
406a2a7
Remove parâmetro duplicado
edineivaldameri Mar 28, 2023
a4744a2
Merge pull request #9454 from portabilis/dead-code
edineivaldameri Mar 29, 2023
150828a
Merge pull request #9458 from portabilis/issue-3029
edineivaldameri Mar 29, 2023
c88ce55
Merge pull request #9460 from portabilis/issue-3031
edineivaldameri Mar 29, 2023
1e05d7b
Merge pull request #9461 from portabilis/issue-3032
edineivaldameri Mar 29, 2023
c338e06
Merge branch 'main' into issue-2541
edineivaldameri Mar 29, 2023
5212d1c
Adiciona calculo da variável v_total_faltas
robertfsousa Mar 29, 2023
cbb376b
Merge pull request #9463 from portabilis/fix-frequencia-por-componente
robertfsousa Mar 29, 2023
762329b
Merge pull request #9459 from portabilis/issue-3030
edineivaldameri Mar 30, 2023
50f1dfc
Merge pull request #9457 from portabilis/issue-3027
edineivaldameri Mar 30, 2023
5b320b8
Altera posição do menu de Configurações do Sistema
edineivaldameri Mar 31, 2023
be43dd6
Style code
edineivaldameri Mar 31, 2023
0406b39
Corrige validação quando nacionalidade estrangeiro
robertfsousa Mar 31, 2023
22b8dae
Remove padrao de cpf com zeros quando obrigar cpf
robertfsousa Mar 31, 2023
b629637
Merge pull request #9466 from portabilis/fix-menu
edineivaldameri Mar 31, 2023
7c5b024
Incrementa versão dos assets
robertfsousa Mar 31, 2023
2ce3df5
Corrige apresentação caso o usuário tenha sido excluído
edineivaldameri Mar 31, 2023
c07c43e
Valida quando o cpf é numérico
robertfsousa Mar 31, 2023
1f612dc
Corrige função que formata o CPF
edineivaldameri Mar 31, 2023
209367e
Altera versão dos assets
edineivaldameri Mar 31, 2023
f770e3d
Verifica existência do usuário de criação para manter integridade
edineivaldameri Mar 31, 2023
fef7fef
Merge pull request #9468 from portabilis/honeybadger-94810807
robertfsousa Apr 3, 2023
dd5642d
Merge pull request #9470 from portabilis/honeybadger-94875360
robertfsousa Apr 3, 2023
542807d
Merge pull request #9469 from portabilis/fix-cpf-search
robertfsousa Apr 3, 2023
a5c0075
Merge pull request #9467 from portabilis/fix-cpf-validation
robertfsousa Apr 3, 2023
4d6bbd8
Ignora erros no serviço
robertfsousa Apr 4, 2023
008da46
Merge pull request #9435 from portabilis/issue-2541
edineivaldameri Apr 4, 2023
5cedd53
Atualiza uso do `DB::select`
edineivaldameri Apr 4, 2023
7be26c5
Merge branch 'main' into issue-527
edineivaldameri Apr 4, 2023
d263ef1
Merge pull request #9472 from portabilis/fix-db-select
edineivaldameri Apr 4, 2023
be324ec
Merge pull request #9446 from portabilis/issue-3003
edineivaldameri Apr 4, 2023
0218237
Merge pull request #9449 from portabilis/issue-3012
edineivaldameri Apr 4, 2023
b039762
Corrige validação do ano inválido
robertfsousa Apr 4, 2023
e6898c9
Corrige tamanho do array de componentes
robertfsousa Apr 4, 2023
7cdd7c9
Merge pull request #9474 from portabilis/honeybadger-94972902
robertfsousa Apr 5, 2023
1d3e0b8
Corrige key da forma de organização de turma
robertfsousa Apr 5, 2023
824c59d
Merge pull request #9475 from portabilis/honeybadger-94994220
robertfsousa Apr 5, 2023
169018b
Adiciona cast para boolean
robertfsousa Apr 5, 2023
e57e53a
Merge pull request #9476 from portabilis/honeybadger-94996180
robertfsousa Apr 5, 2023
40754f8
Reutiliza o usuário ao invés de criar um novo
edersoares Apr 5, 2023
162d98d
Reutiliza a instituição ao invés de criar uma nova
edersoares Apr 5, 2023
160423d
Corrige retorno da API
edineivaldameri Apr 6, 2023
611a18d
Altera versão dos assets
edineivaldameri Apr 6, 2023
a63a87b
Utiliza factories dentro de função anônima
edersoares Apr 6, 2023
6158dc3
Merge pull request #9477 from portabilis/issue-3077
edineivaldameri Apr 6, 2023
5458a7e
Remove `static`
edersoares Apr 6, 2023
d5b6b77
Factories com registros únicos `current`
edersoares Apr 6, 2023
8cb53b1
Merge branch 'main' into enhanment-report-api
edineivaldameri Apr 6, 2023
7f6b151
Cria escola com nome pré-definido
edersoares Apr 7, 2023
7cbd2de
Version
edersoares Apr 10, 2023
3706e68
Merge pull request #9450 from portabilis/issue-3013
edineivaldameri Apr 10, 2023
c93767c
Merge branch 'main' into factory
edersoares Apr 10, 2023
54e5d91
Corrige depreciação de método não estático
edersoares Apr 10, 2023
d43188c
Adiciona verificação de retorno vazio
robertfsousa Apr 10, 2023
ceda684
Melhora mensagem de erro
edersoares Apr 10, 2023
f9a6b51
Ajusta factories
edersoares Apr 10, 2023
07a5340
Ajusta busca para remoção de caracteres indesejados
edineivaldameri Apr 10, 2023
1bd2469
Merge pull request #9447 from portabilis/issue-3006
edineivaldameri Apr 10, 2023
36d9ac6
Merge pull request #9478 from portabilis/honeybadger-95140389
edineivaldameri Apr 10, 2023
ed19b57
Merge pull request #9456 from portabilis/issue-3020
edineivaldameri Apr 10, 2023
f8ef914
Remove teste de vínculo da pessoa física
edersoares Apr 10, 2023
1fa9667
Merge branch 'main' into php82
edineivaldameri Apr 10, 2023
20ccf00
Organiza tabela pmieducar.sequencia_serie
robertfsousa Apr 11, 2023
5a10a00
Cria model, factory, builder e testes para a tabela pmieducar.sequenc…
robertfsousa Apr 11, 2023
aabdfd3
Refatora para uso do model LegacySequenceGrade
robertfsousa Apr 11, 2023
47d75a5
Remove classe legada
robertfsousa Apr 11, 2023
59cf850
Merge pull request #9292 from portabilis/php82
edineivaldameri Apr 11, 2023
1eddd9f
Altera parâmetros da rota para usar o id
robertfsousa Apr 11, 2023
796a017
Valida apenas quando for tipo deficiência
robertfsousa Apr 11, 2023
d942b9e
Merge pull request #9482 from portabilis/issue-3091
robertfsousa Apr 11, 2023
4c75682
Organiza factory para criação de pessoa física sem pai e mãe por padrão
edineivaldameri Apr 11, 2023
ad95553
Organiza teste para validação da existência de pai
edineivaldameri Apr 11, 2023
43c83e1
Merge pull request #9479 from portabilis/factory
edersoares Apr 11, 2023
ec83468
Adiciona migration para desabilitar a exportação do Educacenso
edineivaldameri Apr 11, 2023
0afb357
Altera ano da mensagem informativa
edineivaldameri Apr 11, 2023
0d827aa
Incrementa versão dos assets
edineivaldameri Apr 11, 2023
1d09fbe
Merge pull request #9483 from portabilis/issue-3098
edineivaldameri Apr 12, 2023
51839df
Merge pull request #9471 from portabilis/fix-promotion-job
robertfsousa Apr 13, 2023
c82b5c6
Adiciona relacionamentos a série
edineivaldameri Apr 13, 2023
c9c72ae
Renomeia parâmetros
edineivaldameri Apr 13, 2023
d767a29
Merge branch 'main' into fix_get_falta
jrbarros Apr 14, 2023
452207d
Merge pull request #9377 from portabilis/fix_get_falta
jrbarros Apr 14, 2023
fa5f86a
Merge pull request #9484 from portabilis/ch
edineivaldameri Apr 14, 2023
606f4df
Merge pull request #8609 from portabilis/issue-527
edineivaldameri Apr 14, 2023
58f5de5
Merge branch 'main' into enhanment-report-api
edineivaldameri Apr 14, 2023
2e1eb8d
Corrige teste após renomeação de relacionamento
edineivaldameri Apr 14, 2023
686aef2
Migra o arquivo `phpunit.xml`
edersoares Apr 16, 2023
116daf9
Adiciona modo `current` para regras de cargos
edersoares Apr 10, 2023
5e38bbd
Usa modo `current`
edersoares Apr 10, 2023
c8888fc
Cria escola como se fosse via interface
edersoares Apr 10, 2023
6baea0a
Reaproveita estrutura para curso
edersoares Apr 10, 2023
0e84883
Melhora criação de servidor
edersoares Apr 10, 2023
9110191
Cenário para criação do ensino fundamental
edersoares Apr 10, 2023
d99645a
Corrige factory de curso
edersoares Apr 10, 2023
2779ee9
Ajusta factories
edersoares Apr 11, 2023
0813c80
Melhora descrição dos tipos
edersoares Apr 11, 2023
d5883b6
Factories
edersoares Apr 11, 2023
94c9071
Model para a tabela `pmieducar.sequencia_serie`
edersoares Apr 11, 2023
f16e0fc
Cria sequência de enturmação
edersoares Apr 11, 2023
1620634
Melhora factory que cria pessoa física
edersoares Apr 11, 2023
3d83709
Melhora criação de alunos
edersoares Apr 11, 2023
80f3832
Melhora criação de matrículas
edersoares Apr 11, 2023
c1b0cfb
Melhora criação de enturmações
edersoares Apr 11, 2023
898786a
Melhorias
edersoares Apr 11, 2023
71023d3
Etapas do ano letivo
edersoares Apr 11, 2023
b6b9f08
Cria o estado civil
edersoares Apr 16, 2023
d6ab986
Remove o gênero de dados pré-populados
edersoares Apr 17, 2023
4c07ff7
Corrige o valor de transporte
edersoares Apr 17, 2023
84fb29c
Remove cast
edersoares Apr 17, 2023
4777b80
Remove import
edersoares Apr 17, 2023
f8abb4b
Merge pull request #9485 from portabilis/factory
edersoares Apr 17, 2023
914d271
Merge branch 'main' into issue-2753
robertfsousa Apr 17, 2023
5c3b9a5
Adiciona builder para a LegacyEnrollment
robertfsousa Apr 17, 2023
43734c0
Corrige service de reclassificação da turma
robertfsousa Apr 17, 2023
953570f
Adiciona try/catch para prevenção de erros
robertfsousa Apr 17, 2023
40ec550
Corrige valor do sequencial fechamento
robertfsousa Apr 17, 2023
37ed92d
Adiciona model ReportsCount, sua migration, factory e test Eloquent
edineivaldameri Apr 17, 2023
73e541b
Adiciona event ReportIssued e seu Listener
edineivaldameri Apr 17, 2023
83ae4a2
Registra o event ReportIssued e seu Listener
edineivaldameri Apr 17, 2023
ba19497
Dispara o event ReportIssued ao emitir um relatório
edineivaldameri Apr 17, 2023
ebca452
Valida retorno antes da contagem
edineivaldameri Apr 18, 2023
e7fd222
Update app/Listeners/ReportIssuedListener.php
edineivaldameri Apr 18, 2023
88813ca
Implementa teste para garantir o funcionamento da contagem
edineivaldameri Apr 18, 2023
97465e6
Implementa teste para garantir o funcionamento da contagem
edineivaldameri Apr 18, 2023
db72fbe
Adiciona comportamento no teste, como existente na API
edineivaldameri Apr 18, 2023
c749df8
Merge pull request #9487 from portabilis/honeybadger-95341861
edineivaldameri Apr 18, 2023
b2e1f73
Merge pull request #9486 from portabilis/issue-3128
edineivaldameri Apr 18, 2023
3b2e9e8
Merge pull request #9473 from portabilis/honeybadger-94970185
edineivaldameri Apr 18, 2023
baeaf17
Corrige apresentação dos dados para evitar erros
edineivaldameri Apr 18, 2023
31f92fe
Adiciona Attribute ao model
edineivaldameri Apr 18, 2023
2f6d19d
Altera utilização do model da view pelo model da tabela
edineivaldameri Apr 18, 2023
d79da5d
Corrige local da reordenação da turma
robertfsousa Apr 19, 2023
621a2b5
Corrige e melhora queries de obter o sequencial fechamento
robertfsousa Apr 19, 2023
815230d
Move local da chamada da função
robertfsousa Apr 19, 2023
a406bb7
Adiciona novo filtro para enturmações válidas
robertfsousa Apr 19, 2023
a632f8a
Ajusta query da funcao existeMatriculaTurma
robertfsousa Apr 19, 2023
a28cea5
Adiciona mensagem de validação
edineivaldameri Apr 20, 2023
cfc9c1c
Merge pull request #9488 from portabilis/honeybadger-95373041
edineivaldameri Apr 20, 2023
fe9792e
Merge pull request #9481 from portabilis/issue-3087
edineivaldameri Apr 20, 2023
47684bb
Merge pull request #9426 from portabilis/issue-2936
edineivaldameri Apr 20, 2023
63875f7
Update app/Models/Builders/LegacyEnrollmentBuilder.php
robertfsousa Apr 20, 2023
ee15705
Update ieducar/intranet/educar_matricula_cad.php
robertfsousa Apr 20, 2023
887a928
Merge branch 'main' into enhanment-report-api
edineivaldameri Apr 20, 2023
a638df2
Merge pull request #9490 from portabilis/honeybadger-95393248
edineivaldameri Apr 20, 2023
9de0781
Adiciona cast a factory
edineivaldameri Apr 20, 2023
f040e6e
Style code
edineivaldameri Apr 20, 2023
733a6df
Merge branch 'main' into enhanment-report-api
edineivaldameri Apr 20, 2023
2021ff0
Merge pull request #9360 from portabilis/enhanment-report-api
edineivaldameri Apr 20, 2023
3e3135a
Merge pull request #9420 from portabilis/issue-2753
edineivaldameri Apr 20, 2023
11d68d6
Merge branch 'main' into 2.8
edersoares Apr 20, 2023
afce53d
Merge pull request #9491 from portabilis/community-patch-2023-04-20
edersoares Apr 20, 2023
a7f6fee
Version
edersoares Apr 20, 2023
2128da1
Style code
edersoares Apr 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 5 additions & 2 deletions .github/workflows/tests.yml
Expand Up @@ -17,7 +17,7 @@ jobs:

if: '! github.event.pull_request.draft'

runs-on: self-hosted
runs-on: ubuntu-latest
env:
APP_URL: http://localhost:8000
APP_ENV: testing
Expand Down Expand Up @@ -54,7 +54,10 @@ jobs:

- uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
php-version: '8.2'
extensions: bcmath, gd, pdo, pcntl, pdo_pgsql, pgsql, zip
env:
update: true

- name: Get composer cache directory
id: composer-cache
Expand Down
21 changes: 21 additions & 0 deletions app/Events/ReportIssued.php
@@ -0,0 +1,21 @@
<?php

namespace App\Events;

use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;

class ReportIssued
{
use Dispatchable;
use InteractsWithSockets;
use SerializesModels;

public function __construct(
public string $render,
public string $template,
public bool $success
) {
}
}
13 changes: 13 additions & 0 deletions app/Exceptions/Educacenso/InvalidFileDate.php
@@ -0,0 +1,13 @@
<?php

namespace App\Exceptions\Educacenso;

use RuntimeException;

class InvalidFileDate extends RuntimeException implements ImportException
{
public function __construct()
{
parent::__construct('Ocorreu um erro na validação do ano do arquivo importado!');
}
}
20 changes: 20 additions & 0 deletions app/Http/Controllers/Api/CourseController.php
@@ -0,0 +1,20 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use App\Models\LegacyCourse;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;

class CourseController extends ResourceController
{
public int $process = 566;

public function index(LegacyCourse $course, Request $request): JsonResource
{
$this->skipAuthorization();

return $this->all($course, $request);
}
}
16 changes: 16 additions & 0 deletions app/Http/Controllers/Api/DisciplineController.php
@@ -0,0 +1,16 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use App\Models\View\Discipline;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;

class DisciplineController extends ResourceController
{
public function index(Discipline $discipline, Request $request): JsonResource
{
return $this->all($discipline, $request);
}
}
20 changes: 20 additions & 0 deletions app/Http/Controllers/Api/GradeController.php
@@ -0,0 +1,20 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use App\Models\LegacyGrade;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;

class GradeController extends ResourceController
{
public int $process = 583;

public function index(LegacyGrade $grade, Request $request): JsonResource
{
$this->skipAuthorization();

return $this->all($grade, $request);
}
}
20 changes: 20 additions & 0 deletions app/Http/Controllers/Api/InstitutionController.php
@@ -0,0 +1,20 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use App\Models\LegacyInstitution;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;

class InstitutionController extends ResourceController
{
public int $process = 753;

public function index(LegacyInstitution $institution, Request $request): JsonResource
{
$this->skipAuthorization();

return $this->all($institution, $request);
}
}
26 changes: 26 additions & 0 deletions app/Http/Controllers/Api/RegistrationController.php
@@ -0,0 +1,26 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use App\Models\LegacyRegistration;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;

class RegistrationController extends ResourceController
{
public int $process = 578;

public function index(LegacyRegistration $registration, Request $request): JsonResource
{
$this->skipAuthorization();

return $this->all($registration, $request);
}

public function filter(Builder $builder, Request $request): void
{
$builder->orderByName()->filter($request->all());
}
}
15 changes: 12 additions & 3 deletions app/Http/Controllers/Api/SchoolClassController.php
Expand Up @@ -2,19 +2,28 @@

namespace App\Http\Controllers\Api;

use App\Http\Controllers\Controller;
use App\Http\Controllers\ResourceController;
use App\Models\LegacySchoolClass;
use App\Services\SchoolClass\SchoolClassService;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;

class SchoolClassController extends Controller
class SchoolClassController extends ResourceController
{
public int $process = 586;

public function index(LegacySchoolClass $schoolClass, Request $request): JsonResource
{
$this->skipAuthorization();

return $this->all($schoolClass, $request);
}

public function getCalendars(Request $request, SchoolClassService $schoolClassService)
{
if (request()->get('ref_cod_turma')) {
return $schoolClassService->getCalendars([request()->get('ref_cod_turma')]);
}

$schoolClass = LegacySchoolClass::query()
->where('ano', $request->get('ano'))
->whereHas('course', function ($courseQuery) {
Expand Down
26 changes: 26 additions & 0 deletions app/Http/Controllers/Api/SchoolController.php
@@ -0,0 +1,26 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use App\Models\LegacySchool;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;

class SchoolController extends ResourceController
{
public int $process = 561;

public function index(LegacySchool $school, Request $request): JsonResource
{
$this->skipAuthorization();

return $this->all($school, $request);
}

public function filter(Builder $builder, Request $request): void
{
$builder->orderByName()->filter($request->all());
}
}
16 changes: 16 additions & 0 deletions app/Http/Controllers/Api/SituationController.php
@@ -0,0 +1,16 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use iEducar\Modules\Enrollments\Model\EnrollmentStatusFilter;

class SituationController extends ResourceController
{
public function index(): array
{
return [
'data' => EnrollmentStatusFilter::getDescriptiveValues()
];
}
}
52 changes: 52 additions & 0 deletions app/Http/Controllers/Api/StageController.php
@@ -0,0 +1,52 @@
<?php

namespace App\Http\Controllers\Api;

use App\Http\Controllers\ResourceController;
use App\Models\LegacyAcademicYearStage;
use App\Models\LegacyCourse;
use App\Models\LegacySchoolClassStage;
use Illuminate\Http\Request;

class StageController extends ResourceController
{
public function index(Request $request): array
{
$course = LegacyCourse::query()->active()->findOrFail($request->get('course'), ['padrao_ano_escolar']);

if ($course->isStandardCalendar) {
return [
'data' => LegacyAcademicYearStage::query()
->filter([
'school' => $request->get('school'),
'year_eq' => $request->get('year')
])
->with(['stageType:cod_modulo,nm_tipo'])
->whereHas('stageType', static fn ($q) => $q->active())
->orderBySequencial()
->get([
'sequencial',
'ref_cod_modulo'
])->mapWithKeys(static function ($academicYearStage) {
return [$academicYearStage->sequencial => $academicYearStage->sequencial . 'º ' . mb_strtoupper($academicYearStage->stageType->nm_tipo)];
})
];
}

return [
'data' => LegacySchoolClassStage::query()
->filter([
'school-class' => $request->get('school-class')
])
->with(['stageType:cod_modulo,nm_tipo'])
->whereHas('stageType', static fn ($q) => $q->active())
->orderBySequencial()
->get([
'sequencial',
'ref_cod_modulo'
])->mapWithKeys(static function ($schoolClassStage) {
return [$schoolClassStage->sequencial => $schoolClassStage->sequencial . 'º ' . mb_strtoupper($schoolClassStage->stageType->nm_tipo)];
})
];
}
}
95 changes: 95 additions & 0 deletions app/Http/Controllers/EnrollmentsPromotionController.php
@@ -0,0 +1,95 @@
<?php

namespace App\Http\Controllers;

use App\Jobs\EnrollmentsPromotionJob;
use App\Models\NotificationType;
use App\Services\NotificationService;
use Illuminate\Bus\Batch;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Bus;
use Illuminate\Support\Facades\DB;

class EnrollmentsPromotionController extends Controller
{
public function processEnrollmentsPromotionJobs(Request $request)
{
$data = $this->getResquetData($request);

$enrollmentsIds = $this->loadEnrollmentsByFilter($data);

$userId = $request->user()->id;
$databaseConnection = DB::getDefaultConnection();

$jobs = [];
foreach ($enrollmentsIds as $item) {
$jobs[] = new EnrollmentsPromotionJob($userId, $item, $databaseConnection);
}

if (empty($jobs)) {
return response()->json([
'message' => 'Não foi possível encontrar matrículas com os parâmetros enviados',
'status' => 'notice'
]);
}

$message = 'Processo de atualização de matrículas finalizado. Total de itens processados: ';
Bus::batch($jobs)
->finally(function (Batch $batch) use ($userId, $message) {
$message .= $batch->totalJobs . ' matrícula(s)';
(new NotificationService())->createByUser($userId, $message, '', NotificationType::OTHER);
})
->dispatch();

return response()->json([
'message' => 'Matrículas enviadas para atualização. O processo de demorar alguns minutos, aguarde a notificação antes de realizar a mesma atualização.',
'status' => 'success'
]);
}

private function loadEnrollmentsByFilter(array $data): array
{
$sql = $this->getEnrollmentsByFilterSql();

$dbInformation = DB::select($sql, $data);

return array_map(fn ($item) => $item->cod_matricula, $dbInformation);
}

private function getEnrollmentsByFilterSql(): string
{
return 'SELECT m.cod_matricula FROM pmieducar.matricula AS m
INNER JOIN pmieducar.matricula_turma AS mt ON m.cod_matricula = mt.ref_cod_matricula
INNER JOIN pmieducar.serie as s on m.ref_ref_cod_serie = s.cod_serie
INNER JOIN modules.regra_avaliacao_serie_ano as ra on ra.serie_id = s.cod_serie and ra.ano_letivo = m.ano
INNER JOIN pmieducar.aluno ON aluno.cod_aluno = m.ref_cod_aluno
WHERE m.ano = :ano
AND m.ativo = 1
AND mt.ref_cod_matricula = m.cod_matricula
AND mt.ativo = 1
AND (CASE WHEN :matricula = 0 THEN true else :matricula = m.cod_matricula END)
AND (CASE WHEN :escolaId = 0 THEN true else :escolaId = m.ref_ref_cod_escola END)
AND (CASE WHEN :cursoId = 0 THEN true else :cursoId = m.ref_cod_curso END)
AND (CASE WHEN :serieId = 0 THEN true else :serieId = m.ref_ref_cod_serie END)
AND (CASE WHEN :turmaId = 0 THEN true else :turmaId = mt.ref_cod_turma END)
AND (CASE WHEN :matriculaSituacao = 10 THEN true
WHEN :matriculaSituacao = 9 THEN m.aprovado NOT IN (4,6) ELSE :turmaId = m.aprovado END)
AND (CASE WHEN :regraDeAvaliacao = 0 THEN true ELSE :regraDeAvaliacao = ra.regra_avaliacao_id END)
ORDER BY ref_cod_matricula
';
}

private function getResquetData(Request $request): array
{
return [
'ano' => (int) $request->input('ano'),
'escolaId' => (int) $request->input('escola', 0),
'cursoId' => (int) $request->input('curso', 0),
'serieId' => (int) $request->input('serie', 0),
'turmaId' => (int) $request->input('turma', 0),
'matricula' => (int) $request->input('matricula', 0),
'matriculaSituacao' => (int) $request->input('situacaoMatricula', 10),
'regraDeAvaliacao' => (int) $request->input('regras_avaliacao_id', 0),
];
}
}
2 changes: 1 addition & 1 deletion app/Http/Controllers/PersonLogUnificationController.php
Expand Up @@ -28,7 +28,7 @@ public function index(Request $request)
$individualQuery->where('cpf', str_replace(['.', '-'], '', $cpf));
});
});
});
})->latest();

return view('unification.person.index', ['unifications' => $unificationsQuery->paginate(20)]);
}
Expand Down