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

[2.7] Portabilis patch 10/07/2022 #864

Merged
merged 67 commits into from
Jul 10, 2022
Merged
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
cd95fbd
Adiciona null safe operator
jrbarros Mar 30, 2022
ce84c3b
Corrige função para obter componentes da turma multiseriada
robertfsousa Jun 15, 2022
d21a048
Melhora o retorno da série
robertfsousa Jun 15, 2022
5e13a9e
Remove parametro default
robertfsousa Jun 15, 2022
0a3b7c1
Expande correção para outros envios
robertfsousa Jun 17, 2022
7593247
Verifica se contém dados e faz limpeza dos dados antes de inserir
jrbarros Jun 24, 2022
3ad29c0
Atualiza municípios 2022
robertfsousa Jun 27, 2022
a69cae7
Remove comentário
robertfsousa Jun 27, 2022
0490ff0
Adiciona verificação de código ibge unico
robertfsousa Jun 27, 2022
c16dbdb
Atualiza comentários
robertfsousa Jun 27, 2022
a686fbe
Atualiza diretório
robertfsousa Jun 28, 2022
29472dc
Atualiza municipios com a tabela 2022
robertfsousa Jun 29, 2022
9b5499d
Inicia a variável com 0
jrbarros Jun 29, 2022
7fe0953
Revert "Remove a inserção do prototype"
edersoares Jun 29, 2022
f07e84a
Utiliza CDN para importar a lib Prototype.js
edersoares Jun 29, 2022
6087377
Retorna 0 quando a falta é vazia
jrbarros Jun 29, 2022
8071cec
Adiciona mensagem de confirmação ao desenturmar
robertfsousa Jun 29, 2022
fe60d87
Trata dados de array depois das validaçoes
Bonot Jun 29, 2022
751ec63
Remove validaçao chamada duas vezes
Bonot Jun 29, 2022
0846c06
Valida campos com opçoes "Nenhum" em um unico lugar
Bonot Jun 29, 2022
585b97f
Remove validaçoes duplicadas
Bonot Jun 29, 2022
c209675
Utiliza constantes para melhorar leitura
Bonot Jun 29, 2022
c62c3c3
Remove arquivos nao utilizados
Bonot Jun 29, 2022
63f17e5
Corrige validaçao do campo de Equipamentos para acesso a internet
Bonot Jun 29, 2022
4bf2b44
Corrige bug ao apagar informaçao do tipo de atendimento do aluno
Bonot Jun 29, 2022
1a5d4f8
Middleware para evitar ação padrão
edersoares Jun 30, 2022
83b8902
Configura o Laravel Sanctum
edersoares Jun 30, 2022
2034b41
Extende o usuário padrão
edersoares Jun 30, 2022
05bbc9c
Fabrica um usuário admin
edersoares Jun 30, 2022
426f38e
Corrige exibição do turno
robertfsousa Jul 5, 2022
f973efa
Merge pull request #8948 from portabilis/issue-1673
robertfsousa Jul 5, 2022
1fcd25e
Style code
robertfsousa Jul 5, 2022
a40a04d
Altera tipo de coluna do orgao regional
Bonot Jul 6, 2022
54390ff
Merge pull request #8966 from portabilis/issue-1719
Bonot Jul 6, 2022
c1df1cb
Style code
Bonot Jul 6, 2022
96b4786
Merge pull request #8955 from portabilis/issue-1657
robertfsousa Jul 6, 2022
ed0cf28
Grava codigo regional em caixa alta
Bonot Jul 6, 2022
e382f65
Merge pull request #8967 from portabilis/issue-1719
Bonot Jul 6, 2022
f2272a4
Merge pull request #8935 from portabilis/issue-1640
robertfsousa Jul 6, 2022
8144083
Verifica se campo é array antes de validar
Bonot Jul 6, 2022
eed8916
Corrige exportação das áreas de conhecimento dos curso superiores
Bonot Jul 6, 2022
fa293c5
Corrige a visualização do turno
robertfsousa Jul 6, 2022
345e865
Cria factores do menu
jrbarros Jul 7, 2022
116a2ea
Adiciona nova factory que da acesso a menu e permisões
jrbarros Jul 7, 2022
4695311
Adiciona validaçao ao campo de rede local
Bonot Jul 7, 2022
c5563b7
Remove processo fixo
jrbarros Jul 7, 2022
2c9a99b
Merge pull request #8965 from portabilis/issue-1706
robertfsousa Jul 7, 2022
a9d0fb3
Corrige valor default do match
robertfsousa Jul 7, 2022
40ea192
Merge pull request #8970 from portabilis/fix-match
robertfsousa Jul 7, 2022
a843e06
Update database/factories/MenuFactory.php
jrbarros Jul 8, 2022
23546b2
Merge pull request #8969 from portabilis/menu-factory
jrbarros Jul 8, 2022
4e6af05
Style code
jrbarros Jul 8, 2022
73c1f50
Merge pull request #8953 from portabilis/honeybadger_p57201_faults_86…
jrbarros Jul 8, 2022
c291a1d
Merge pull request #8944 from portabilis/honybadger_projects_57201_fa…
jrbarros Jul 8, 2022
06dc942
Merge pull request #8957 from portabilis/fix-bug-cadastro-tipo-atendi…
Bonot Jul 8, 2022
7499652
Merge pull request #8968 from portabilis/issue-1711
Bonot Jul 8, 2022
9183d9e
Merge pull request #8956 from portabilis/issue-1487
Bonot Jul 8, 2022
11b23cb
Style code
Bonot Jul 8, 2022
87d3671
Merge pull request #8820 from portabilis/honeybadger-batchEnrollmentC…
jrbarros Jul 8, 2022
e6d5ae3
Merge branch 'main' into community-patch-2022-06-27
edersoares Jul 10, 2022
16a9f90
Merge pull request #8959 from portabilis/sanctum
edersoares Jul 10, 2022
11242f1
Merge pull request #8960 from portabilis/user
edersoares Jul 10, 2022
2b00283
Style code
edersoares Jul 10, 2022
79a7e41
Merge pull request #8947 from portabilis/community-patch-2022-06-27
edersoares Jul 10, 2022
a19c816
Merge branch 'main' into community-patch-2022-07-10
edersoares Jul 10, 2022
d924b0d
Merge pull request #8972 from portabilis/community-patch-2022-07-10
edersoares Jul 10, 2022
9560798
Version
edersoares Jul 10, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Corrige valor default do match
  • Loading branch information
robertfsousa committed Jul 7, 2022
commit a9d0fb3019ab25f5ad0a449e69a93b1c3c654692
4 changes: 3 additions & 1 deletion ieducar/intranet/educar_matricula_det.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,8 @@ public function Gerar()
if ($enturmacao['turno_id']) {
$nomesTurnos[] = match ((int)$enturmacao['turno_id']) {
clsPmieducarTurma::TURNO_MATUTINO => 'Matutino',
clsPmieducarTurma::TURNO_VESPERTINO => 'Vespertino'
clsPmieducarTurma::TURNO_VESPERTINO => 'Vespertino',
default => null
};
}
}
Expand All @@ -212,6 +213,7 @@ public function Gerar()
clsPmieducarTurma::TURNO_VESPERTINO => 'Vespertino',
clsPmieducarTurma::TURNO_NOTURNO => 'Noturno',
clsPmieducarTurma::TURNO_INTEGRAL => 'Integral',
default => null
};
} else {
$nomesTurnos = implode('<br />', $nomesTurnos);
Expand Down