From 978d5e8fdff3e690bfa1cda96630c26acd90bec8 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Wed, 22 May 2019 16:00:47 -0300 Subject: [PATCH 01/22] Adiciona nova coluna em custom labels --- ...2_111739_adiciona_coluna_custom_labels.php | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php diff --git a/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php b/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php new file mode 100644 index 0000000000..ca4c73d515 --- /dev/null +++ b/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php @@ -0,0 +1,49 @@ +getDefaults(); + $defaults['report.termo_resultado_final'] = ''; + + return $defaults; + } + + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + $setting = DB::table('pmieducar.configuracoes_gerais') + ->select('ref_cod_instituicao', 'custom_labels') + ->where('active_on_ieducar', 1) + ->first(); + + if (empty($setting)) { + return; + } + + $customLabels = json_decode($setting->custom_labels, true); + $customLabels = is_array($customLabels) ? array_filter($customLabels) : []; + + $newCustomLabels = array_merge($this->getDefaultCustomLabels(), $customLabels); + $newCustomLabels = json_encode($newCustomLabels); + + DB::unprepared( + " + UPDATE pmieducar.configuracoes_gerais + SET custom_labels = '{$newCustomLabels}' + WHERE ref_cod_instituicao = {$setting->ref_cod_instituicao} + " + ); + } +} From 257c0da7c60ad36d8d210a51e52eccf429eb9d76 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Thu, 23 May 2019 11:29:24 -0300 Subject: [PATCH 02/22] Ajusta migration custom labels --- .../2019_05_22_111739_adiciona_coluna_custom_labels.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php b/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php index ca4c73d515..6000e9d7c8 100644 --- a/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php +++ b/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php @@ -2,16 +2,15 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Support\Facades\DB; -require_once 'Portabilis/Utils/CustomLabel.php'; class AdicionaColunaCustomLabels extends Migration { private function getDefaultCustomLabels() { - $customLabel = new CustomLabel(); - $defaults = $customLabel->getDefaults(); - $defaults['report.termo_resultado_final'] = ''; + $customLabel = new CustomLabel(); + $defaults = $customLabel->getDefaults(); + $defaults['report.termo_resultado_final'] = ''; return $defaults; } From d8ebf30018b9a8a9645c49eb7eb1b9b4bf047da9 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Mon, 27 May 2019 17:17:26 -0300 Subject: [PATCH 03/22] =?UTF-8?q?Ajusta=20final=20do=20arquivo=20de=20expo?= =?UTF-8?q?rta=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/modules/Api/Views/EducacensoExportController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/modules/Api/Views/EducacensoExportController.php b/ieducar/modules/Api/Views/EducacensoExportController.php index a636bb43c9..d0ca8de425 100644 --- a/ieducar/modules/Api/Views/EducacensoExportController.php +++ b/ieducar/modules/Api/Views/EducacensoExportController.php @@ -630,7 +630,7 @@ protected function precisaDeAuxilioEmProvaPorDeficiencia($deficiencias) protected function exportaDadosRegistro99() { - return "99|\n"; + return "99|"; } protected function exportaDadosRegistro89($escolaId) From ffbed6f2f1745232e009d2ee803fb796eefb7800 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Tue, 28 May 2019 13:53:28 -0300 Subject: [PATCH 04/22] =?UTF-8?q?Ajusta=20condi=C3=A7=C3=A3o=20para=20inse?= =?UTF-8?q?rir=20registro99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/Views/EducacensoExportController.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/ieducar/modules/Api/Views/EducacensoExportController.php b/ieducar/modules/Api/Views/EducacensoExportController.php index d0ca8de425..7656822828 100644 --- a/ieducar/modules/Api/Views/EducacensoExportController.php +++ b/ieducar/modules/Api/Views/EducacensoExportController.php @@ -144,17 +144,15 @@ protected function exportaDadosCensoPorEscola($escolaId, $ano, $data_ini, $data_ $this->ref_cod_instituicao = $obj_permissoes->getInstituicao($this->pessoa_logada); $continuaExportacao = true; $export = $this->exportaDadosRegistro00($escolaId, $ano, $continuaExportacao); - if (!$continuaExportacao) { - return $export; + if ($continuaExportacao) { + $export .= $this->exportaDadosRegistro10($escolaId, $ano); + $export .= $this->exportaDadosRegistro20($escolaId, $ano); + $export .= $this->exportaDadosRegistro30($escolaId, $ano); + $export .= $this->exportaDadosRegistro40($escolaId); + $export .= $this->exportaDadosRegistro50($escolaId, $ano); + $export .= $this->exportaDadosRegistro60($escolaId, $ano); } - $export .= $this->exportaDadosRegistro10($escolaId, $ano); - $export .= $this->exportaDadosRegistro20($escolaId, $ano); - $export .= $this->exportaDadosRegistro30($escolaId, $ano); - $export .= $this->exportaDadosRegistro40($escolaId); - $export .= $this->exportaDadosRegistro50($escolaId, $ano); - $export .= $this->exportaDadosRegistro60($escolaId, $ano); - $export .= $this->exportaDadosRegistro99(); return $export; } From 836ee5466fe2f7210d264497eb45877c14882a3d Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Tue, 28 May 2019 16:24:00 -0300 Subject: [PATCH 05/22] Altera data da migration para rodar na ordem correta --- ...ls.php => 2019_05_28_111739_adiciona_coluna_custom_labels.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename database/migrations/{2019_05_22_111739_adiciona_coluna_custom_labels.php => 2019_05_28_111739_adiciona_coluna_custom_labels.php} (100%) diff --git a/database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php b/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php similarity index 100% rename from database/migrations/2019_05_22_111739_adiciona_coluna_custom_labels.php rename to database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php From d8cdb40520bb85ba8c73ee5e50ad6196a1b69783 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Wed, 29 May 2019 10:42:49 -0300 Subject: [PATCH 06/22] Altera nome da label --- .../2019_05_28_111739_adiciona_coluna_custom_labels.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php b/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php index 6000e9d7c8..25d94abb74 100644 --- a/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php +++ b/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php @@ -10,7 +10,7 @@ private function getDefaultCustomLabels() { $customLabel = new CustomLabel(); $defaults = $customLabel->getDefaults(); - $defaults['report.termo_resultado_final'] = ''; + $defaults['report.termo_recuperacao_final'] = ''; return $defaults; } From 60f72d8b456b3fbcfa10d64d14ae3e78202dc7d4 Mon Sep 17 00:00:00 2001 From: bonot Date: Thu, 30 May 2019 18:14:20 -0300 Subject: [PATCH 07/22] =?UTF-8?q?Corrige=20exporta=C3=A7=C3=A3o=20do=20ine?= =?UTF-8?q?p=20de=20pais=20de=20origem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/EducacensoRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Repositories/EducacensoRepository.php b/app/Repositories/EducacensoRepository.php index 5298da726d..7b931a1f5d 100644 --- a/app/Repositories/EducacensoRepository.php +++ b/app/Repositories/EducacensoRepository.php @@ -650,7 +650,7 @@ public function getCommonDataForRecord30($arrayPersonId, $schoolId) CASE WHEN fisica.sexo = 'M' THEN 1 ELSE 2 END AS "sexo", fisica_raca.ref_cod_raca AS "raca", fisica.nacionalidade AS "nacionalidade", - CASE WHEN fisica.nacionalidade = 3 THEN fisica.idpais_estrangeiro ELSE 76 END AS "paisNacionalidade", + CASE WHEN fisica.nacionalidade = 3 THEN pais.cod_ibge ELSE 76 END AS "paisNacionalidade", fisica.idmun_nascimento AS "municipioNascimento", CASE WHEN true = (SELECT true FROM cadastro.fisica_deficiencia WHERE fisica_deficiencia.ref_idpes = fisica.idpes LIMIT 1) THEN 1 From 11f9cb2752ee59e236348dc284a2e6c4f06eb6b7 Mon Sep 17 00:00:00 2001 From: bonot Date: Sun, 2 Jun 2019 21:41:06 -0300 Subject: [PATCH 08/22] =?UTF-8?q?Adia=20data=20de=20exporta=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/modules/Educacenso/Assets/Javascripts/Educacenso.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ieducar/modules/Educacenso/Assets/Javascripts/Educacenso.js b/ieducar/modules/Educacenso/Assets/Javascripts/Educacenso.js index 5430faf2fc..fa5189ef74 100644 --- a/ieducar/modules/Educacenso/Assets/Javascripts/Educacenso.js +++ b/ieducar/modules/Educacenso/Assets/Javascripts/Educacenso.js @@ -44,10 +44,10 @@ $j(document).ready(function(){ ''+ ''+ From 8fa8e9b39d08b37fd8a1ae52cba59955b05c5875 Mon Sep 17 00:00:00 2001 From: bonot Date: Sun, 2 Jun 2019 22:14:21 -0300 Subject: [PATCH 09/22] =?UTF-8?q?Corrige=20c=C3=B3digo=20inep=20da=20escol?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/EducacensoRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Repositories/EducacensoRepository.php b/app/Repositories/EducacensoRepository.php index 7b931a1f5d..4b53d20df3 100644 --- a/app/Repositories/EducacensoRepository.php +++ b/app/Repositories/EducacensoRepository.php @@ -538,7 +538,7 @@ public function getDataForRecord60($school, $year) { $sql = <<<'SQL' SELECT '60' AS registro, - educacenso_cod_escola.cod_escola "inepEscola", + educacenso_cod_escola.cod_escola_inep "inepEscola", aluno.ref_idpes "codigoPessoa", educacenso_cod_aluno.cod_aluno_inep "inepAluno", turma.cod_turma "codigoTurma", From 5c6117cd80851e719a12b32875c038e249250542 Mon Sep 17 00:00:00 2001 From: bonot Date: Sun, 2 Jun 2019 22:14:40 -0300 Subject: [PATCH 10/22] =?UTF-8?q?Exporta=20email=20da=20pessoa=20em=20letr?= =?UTF-8?q?as=20mai=C3=BAsculas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Modules/Educacenso/Data/Registro30.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Modules/Educacenso/Data/Registro30.php b/src/Modules/Educacenso/Data/Registro30.php index d8e6820552..345dee85a5 100644 --- a/src/Modules/Educacenso/Data/Registro30.php +++ b/src/Modules/Educacenso/Data/Registro30.php @@ -44,6 +44,7 @@ public function getData($schoolId) $arrayEmployeeId = $this->getArrayEmployeeId(); $employeeData = $this->repository->getEmployeeDataForRecord30($arrayEmployeeId); foreach ($employeeData as $data) { + $data->email = strtoupper($data->email); $this->model = $this->modelArray[$data->codigoPessoa]; $this->hydrateModel($data); $this->modelArray[$data->codigoPessoa] = $this->model; From b8405863a7da42a9f320eeb7ded5cdee35f6ae7f Mon Sep 17 00:00:00 2001 From: bonot Date: Sun, 2 Jun 2019 22:55:10 -0300 Subject: [PATCH 11/22] =?UTF-8?q?Corrige=20c=C3=B3digos=20do=20educacenso?= =?UTF-8?q?=20em=20ra=C3=A7a=20e=20munic=C3=ADpio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/EducacensoRepository.php | 6 ++++-- .../Educacenso/Analysis/Register30CommonDataAnalysis.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Repositories/EducacensoRepository.php b/app/Repositories/EducacensoRepository.php index 4b53d20df3..39a4958f85 100644 --- a/app/Repositories/EducacensoRepository.php +++ b/app/Repositories/EducacensoRepository.php @@ -648,10 +648,10 @@ public function getCommonDataForRecord30($arrayPersonId, $schoolId) pessoa_mae.nome AS "filiacao1", pessoa_pai.nome AS "filiacao2", CASE WHEN fisica.sexo = 'M' THEN 1 ELSE 2 END AS "sexo", - fisica_raca.ref_cod_raca AS "raca", + raca.raca_educacenso AS "raca", fisica.nacionalidade AS "nacionalidade", CASE WHEN fisica.nacionalidade = 3 THEN pais.cod_ibge ELSE 76 END AS "paisNacionalidade", - fisica.idmun_nascimento AS "municipioNascimento", + municipio_nascimento.cod_ibge AS "municipioNascimento", CASE WHEN true = (SELECT true FROM cadastro.fisica_deficiencia WHERE fisica_deficiencia.ref_idpes = fisica.idpes LIMIT 1) THEN 1 ELSE 0 END @@ -679,10 +679,12 @@ public function getCommonDataForRecord30($arrayPersonId, $schoolId) FROM cadastro.fisica JOIN cadastro.pessoa ON pessoa.idpes = fisica.idpes LEFT JOIN cadastro.fisica_raca ON fisica_raca.ref_idpes = fisica.idpes + LEFT JOIN cadastro.raca ON (raca.cod_raca = fisica_raca.ref_cod_raca) LEFT JOIN cadastro.pessoa as pessoa_mae ON fisica.idpes_mae = pessoa_mae.idpes LEFT JOIN cadastro.pessoa as pessoa_pai ON fisica.idpes_pai = pessoa_pai.idpes + LEFT JOIN public.municipio municipio_nascimento ON municipio_nascimento.idmun = fisica.idmun_nascimento LEFT JOIN cadastro.endereco_pessoa ON endereco_pessoa.idpes = pessoa.idpes LEFT JOIN public.logradouro ON logradouro.idlog = endereco_pessoa.idlog LEFT JOIN public.municipio ON municipio.idmun = logradouro.idmun diff --git a/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php b/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php index 4c3b35bd9a..f9b97f9625 100644 --- a/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php +++ b/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php @@ -119,7 +119,7 @@ public function run() ]; } - if (!$data->raca) { + if (is_null($data->raca)) { $this->messages[] = [ 'text' => "Dados para formular o registro 30 da escola {$data->nomeEscola} não encontrados. Verifique se a raça da pessoa {$data->nomePessoa} foi informado.", 'path' => '(Pessoas > Cadastros > Pessoas físicas > Editar > Campo: Raça)', From 5d62b0e1ff5646aa9514c27e1a89f23642cf3f8e Mon Sep 17 00:00:00 2001 From: bonot Date: Sun, 2 Jun 2019 23:43:42 -0300 Subject: [PATCH 12/22] =?UTF-8?q?Corrige=20op=C3=A7=C3=A3o=20Nenhum=20dos?= =?UTF-8?q?=20recursos=20para=20provas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Repositories/EducacensoRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Repositories/EducacensoRepository.php b/app/Repositories/EducacensoRepository.php index 39a4958f85..0718835cd4 100644 --- a/app/Repositories/EducacensoRepository.php +++ b/app/Repositories/EducacensoRepository.php @@ -801,7 +801,7 @@ public function getStudentDataForRecord30($arrayStudentId) (ARRAY[12] <@ aluno.recursos_prova_inep)::INT "recursoLinguaPortuguesaSegundaLingua", (ARRAY[13] <@ aluno.recursos_prova_inep)::INT "recursoVideoLibras", (ARRAY[9] <@ aluno.recursos_prova_inep)::INT "recursoBraile", - (aluno.recursos_prova_inep IS NOT NULL)::INT "recursoNenhum", + (ARRAY[14] <@ aluno.recursos_prova_inep)::INT "recursoNenhum", fisica.nis_pis_pasep AS "nis", documento.certidao_nascimento AS "certidaoNascimento", aluno.justificativa_falta_documentacao AS "justificativaFaltaDocumentacao" From d0b515664501f6d5abdc73de1efc31a8b710d818 Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Mon, 3 Jun 2019 11:15:53 -0300 Subject: [PATCH 13/22] =?UTF-8?q?Corrige=20bug=20na=20exporta=C3=A7=C3=A3o?= =?UTF-8?q?=20do=20campo=20Nenhuma=20depend=C3=AAncia=20relacionada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/Educacenso/Registro10.php | 4 ++-- ieducar/modules/Api/Views/EducacensoAnaliseController.php | 2 +- src/Modules/Educacenso/Data/Registro10.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Models/Educacenso/Registro10.php b/app/Models/Educacenso/Registro10.php index 12e4f4152c..cd21dbb560 100644 --- a/app/Models/Educacenso/Registro10.php +++ b/app/Models/Educacenso/Registro10.php @@ -855,9 +855,9 @@ public function recursosAcessibilidadeInexistenteEOutrosCamposPreenchidos() /** * @return bool */ - public function existeDependencia() + public function naoPossuiDependencias() { - return !empty(array_filter( + return empty(array_filter( [ array_filter($this->salasGerais), array_filter($this->salasFuncionais), diff --git a/ieducar/modules/Api/Views/EducacensoAnaliseController.php b/ieducar/modules/Api/Views/EducacensoAnaliseController.php index f24e00ec4c..e716ed1750 100644 --- a/ieducar/modules/Api/Views/EducacensoAnaliseController.php +++ b/ieducar/modules/Api/Views/EducacensoAnaliseController.php @@ -465,7 +465,7 @@ protected function analisaEducacensoRegistro10() ]; } - if ($escola->possuiDependencias == 1 && !$escola->existeDependencia()) { + if ($escola->possuiDependencias == 1 && $escola->naoPossuiDependencias()) { $mensagem[] = [ 'text' => "Dados para formular o registro 10 da escola {$escola->nomeEscola} não encontrados. Verificamos que a escola possui dependências, portanto é necessário informar pelo menos uma dependência.", 'path' => '(Escola > Cadastros > Escolas > Editar > Aba: Dependências > Campos: Salas gerais, Sala funcionais, Banheiros, Laboratórios, Salas de atividades, Dormitórios e Áreas externas)', diff --git a/src/Modules/Educacenso/Data/Registro10.php b/src/Modules/Educacenso/Data/Registro10.php index e76a9aa1cf..4eec538d52 100644 --- a/src/Modules/Educacenso/Data/Registro10.php +++ b/src/Modules/Educacenso/Data/Registro10.php @@ -106,7 +106,7 @@ public function getExportFormatData($escola) $data->salasGeraisSalaProfessores() ?: 0, // 71 $data->salasAtividadesRecursosAee() ?: 0, // 72 $data->salasGeraisSalaSecretaria() ?: 0, // 73 - $data->existeDependencia() ?: 0, // 74 + $data->naoPossuiDependencias() ?: 0, // 74 $data->recursosAcessibilidadeCorrimao() ?: 0, // 75 $data->recursosAcessibilidadeElevador() ?: 0, // 76 $data->recursosAcessibilidadePisosTateis() ?: 0, // 77 From 30809e5ae43aab35315dc681d6c0d78272c53899 Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Mon, 3 Jun 2019 11:25:39 -0300 Subject: [PATCH 14/22] =?UTF-8?q?Corrige=20l=C3=B3gica=20que=20trata=20val?= =?UTF-8?q?ores=20dos=20campos=20dos=20ve=C3=ADculos=20de=20transporte=20n?= =?UTF-8?q?o=20registro=2060?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Modules/Educacenso/ExportRule/VeiculoTransporte.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/Educacenso/ExportRule/VeiculoTransporte.php b/src/Modules/Educacenso/ExportRule/VeiculoTransporte.php index df10f37d80..0e96f14d5e 100644 --- a/src/Modules/Educacenso/ExportRule/VeiculoTransporte.php +++ b/src/Modules/Educacenso/ExportRule/VeiculoTransporte.php @@ -13,7 +13,7 @@ class VeiculoTransporte implements EducacensoExportRule */ public static function handle(RegistroEducacenso $registro60): RegistroEducacenso { - if (is_null($registro60->transportePublico)) { + if (empty($registro60->transportePublico)) { $registro60->veiculoTransporteBicicleta = null; $registro60->veiculoTransporteMicroonibus = null; $registro60->veiculoTransporteOnibus = null; From aee8d38e74a4f7ed4c40ca4ada9e3c72ef6c2f7a Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Mon, 3 Jun 2019 16:54:38 -0300 Subject: [PATCH 15/22] Altera valor default da label para Exame final --- .../2019_05_28_111739_adiciona_coluna_custom_labels.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php b/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php index 25d94abb74..0e17aabc08 100644 --- a/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php +++ b/database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php @@ -10,7 +10,7 @@ private function getDefaultCustomLabels() { $customLabel = new CustomLabel(); $defaults = $customLabel->getDefaults(); - $defaults['report.termo_recuperacao_final'] = ''; + $defaults['report.termo_recuperacao_final'] = 'Exame final'; return $defaults; } From 385d0206608fd059926ebb3a6697b47065af24e4 Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Tue, 4 Jun 2019 14:26:50 -0300 Subject: [PATCH 16/22] Remove regra que anula CPF caso a pessoa seja estrangeira --- src/Modules/Educacenso/ExportRule/RegrasGeraisRegistro30.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Modules/Educacenso/ExportRule/RegrasGeraisRegistro30.php b/src/Modules/Educacenso/ExportRule/RegrasGeraisRegistro30.php index cc7eaeca2d..658ced5598 100644 --- a/src/Modules/Educacenso/ExportRule/RegrasGeraisRegistro30.php +++ b/src/Modules/Educacenso/ExportRule/RegrasGeraisRegistro30.php @@ -17,10 +17,6 @@ class RegrasGeraisRegistro30 implements EducacensoExportRule */ public static function handle(RegistroEducacenso $registro30): RegistroEducacenso { - if ($registro30->nacionalidade == Nacionalidade::ESTRANGEIRA) { - $registro30->cpf = null; - } - if ($registro30->nacionalidade == Nacionalidade::ESTRANGEIRA || $registro30->nacionalidade == Nacionalidade::NATURALIZADO_BRASILEIRO) { $registro30->municipioNascimento = null; } From bfd42a384a9b11c6dc103be4d6c9849b9e4dca6c Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Tue, 4 Jun 2019 15:55:30 -0300 Subject: [PATCH 17/22] =?UTF-8?q?Ajusta=20vers=C3=A3o=20dos=20assets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/assets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/assets.php b/config/assets.php index e999d9c3ec..df239f2b8d 100644 --- a/config/assets.php +++ b/config/assets.php @@ -14,7 +14,7 @@ | */ - 'version' => '0.0.20', + 'version' => '0.0.21', /* |-------------------------------------------------------------------------- From 529fe7f3b2e55f86ce4f384cd2009c401ef6acda Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Wed, 5 Jun 2019 09:30:14 -0300 Subject: [PATCH 18/22] =?UTF-8?q?Trata=20erro=20em=20campos=20array=20na?= =?UTF-8?q?=20importa=C3=A7=C3=A3o=20do=20arquivo=20do=20censo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../intranet/educar_importacao_educacenso.php | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/ieducar/intranet/educar_importacao_educacenso.php b/ieducar/intranet/educar_importacao_educacenso.php index 07464bc109..3d2f616c7b 100644 --- a/ieducar/intranet/educar_importacao_educacenso.php +++ b/ieducar/intranet/educar_importacao_educacenso.php @@ -430,6 +430,9 @@ function importaRegistro10($dadosRegistro){ foreach ($fields as $key => $value) { if(property_exists($objEscola, $key)){ + if ($this->isPostgresArray($value)) { + $value = $this->cleanPostgresArray($value); + } $objEscola->{$key} = $value; } } @@ -441,6 +444,20 @@ function importaRegistro10($dadosRegistro){ } + private function isPostgresArray($value) + { + if (substr($value, 0, 1) == '{' && substr($value, -1) == '}') { + return true; + } + + return false; + } + + private function cleanPostgresArray($value) + { + return str_replace(['{','}'], '', $value); + } + function importaRegistro20($dadosRegistro){ $inepEscola = $dadosRegistro[2-1]; @@ -1757,6 +1774,9 @@ function atualizaCamposEscolaRegistro00( foreach ($fields as $key => $value){ if(property_exists($escola, $key)){ + if ($this->isPostgresArray($value)) { + $value = $this->cleanPostgresArray($value); + } $escola->{$key} = $value; } } From 5255912539cfb525a68250c091089c022f306a82 Mon Sep 17 00:00:00 2001 From: bonot Date: Wed, 5 Jun 2019 10:45:24 -0300 Subject: [PATCH 19/22] =?UTF-8?q?Exige=20munic=C3=ADpio=20de=20nascimento?= =?UTF-8?q?=20apenas=20para=20alunos=20brasileiros?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Educacenso/Analysis/Register30CommonDataAnalysis.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php b/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php index 4c3b35bd9a..eb1bf75b34 100644 --- a/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php +++ b/src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php @@ -155,7 +155,7 @@ public function run() ]; } - if (!$data->municipioNascimento && $data->nacionalidade != Nacionalidade::ESTRANGEIRA) { + if (!$data->municipioNascimento && $data->nacionalidade == Nacionalidade::BRASILEIRA) { $this->messages[] = [ 'text' => "Dados para formular o registro 30 da escola {$data->nomeEscola} não encontrados. Verifique se a naturalidade da pessoa {$data->nomePessoa} foi informada.", 'path' => '(Pessoas > Cadastros > Pessoas físicas > Editar > Campo: Naturalidade)', From da30c795fb1d90d9b655a33ea9505505ddded751 Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Thu, 6 Jun 2019 17:51:15 -0300 Subject: [PATCH 20/22] =?UTF-8?q?Trata=20erros=20em=20casos=20de=20turmas?= =?UTF-8?q?=20sem=20componentes=20curriculares=20na=20an=C3=A1lise=20do=20?= =?UTF-8?q?registro=2020?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Api/Views/EducacensoAnaliseController.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ieducar/modules/Api/Views/EducacensoAnaliseController.php b/ieducar/modules/Api/Views/EducacensoAnaliseController.php index e716ed1750..274c054be2 100644 --- a/ieducar/modules/Api/Views/EducacensoAnaliseController.php +++ b/ieducar/modules/Api/Views/EducacensoAnaliseController.php @@ -935,7 +935,17 @@ protected function analisaEducacensoRegistro20() ]; } - $componentes = $turma->componentes(); + try { + $componentes = $turma->componentes(); + } catch (Throwable $exception) { + $mensagem[] = [ + 'text' => "Dados para formular o registro 20 da escola {$turma->nomeEscola} não encontrados. Verifique se alguma disciplina da turma {$nomeTurma} foi informada", + 'path' => '(Escola > Cadastros > Turmas > Editar > Aba: Dados gerais > Seção: Componentes curriculares definidos em séries da escola)', + 'linkPath' => "/intranet/educar_turma_cad.php?cod_turma={$turma->codTurma}", + 'fail' => true + ]; + continue; + } if (empty($componentes)) { $mensagem[] = [ From fe7eb9fec028ea42fbfd960321d07dc808ebf005 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sat, 8 Jun 2019 13:31:46 -0300 Subject: [PATCH 21/22] =?UTF-8?q?Atualiza=20as=20depend=C3=AAncias?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.lock | 205 +++++++++++++++++++++++++------------------------- 1 file changed, 103 insertions(+), 102 deletions(-) diff --git a/composer.lock b/composer.lock index 230a141264..07bc96bc51 100644 --- a/composer.lock +++ b/composer.lock @@ -507,21 +507,24 @@ }, { "name": "doctrine/lexer", - "version": "v1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8", + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "^4.5" + }, "type": "library", "extra": { "branch-alias": { @@ -529,8 +532,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" } }, "notification-url": "https://packagist.org/downloads/", @@ -551,13 +554,16 @@ "email": "schmittjoh@gmail.com" } ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", "keywords": [ + "annotations", + "docblock", "lexer", - "parser" + "parser", + "php" ], - "time": "2014-09-09T13:34:57+00:00" + "time": "2019-06-08T11:03:04+00:00" }, { "name": "dragonmantank/cron-expression", @@ -1214,16 +1220,16 @@ }, { "name": "kylekatarnls/update-helper", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/kylekatarnls/update-helper.git", - "reference": "fbfa94c0f196d4718ce3c1032e9c4b34140e69d3" + "reference": "b34a46d7f5ec1795b4a15ac9d46b884377262df9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/fbfa94c0f196d4718ce3c1032e9c4b34140e69d3", - "reference": "fbfa94c0f196d4718ce3c1032e9c4b34140e69d3", + "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/b34a46d7f5ec1795b4a15ac9d46b884377262df9", + "reference": "b34a46d7f5ec1795b4a15ac9d46b884377262df9", "shasum": "" }, "require": { @@ -1255,7 +1261,7 @@ } ], "description": "Update helper", - "time": "2019-05-30T21:26:08+00:00" + "time": "2019-06-05T08:34:23+00:00" }, { "name": "laravel/framework", @@ -2032,16 +2038,16 @@ }, { "name": "nesbot/carbon", - "version": "1.38.2", + "version": "1.38.4", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "7621621f76c99f01318313f576baea22edd86367" + "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7621621f76c99f01318313f576baea22edd86367", - "reference": "7621621f76c99f01318313f576baea22edd86367", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8dd4172bfe1784952c4d58c4db725d183b1c23ad", + "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad", "shasum": "" }, "require": { @@ -2089,7 +2095,7 @@ "datetime", "time" ], - "time": "2019-05-30T22:56:55+00:00" + "time": "2019-06-03T15:41:40+00:00" }, { "name": "nexmo/client", @@ -2192,16 +2198,16 @@ }, { "name": "opis/closure", - "version": "3.2.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "09b4389715a7eec100176ea58286649181753508" + "reference": "f846725591203098246276b2e7b9e8b7814c4965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/09b4389715a7eec100176ea58286649181753508", - "reference": "09b4389715a7eec100176ea58286649181753508", + "url": "https://api.github.com/repos/opis/closure/zipball/f846725591203098246276b2e7b9e8b7814c4965", + "reference": "f846725591203098246276b2e7b9e8b7814c4965", "shasum": "" }, "require": { @@ -2209,12 +2215,12 @@ }, "require-dev": { "jeremeamia/superclosure": "^2.0", - "phpunit/phpunit": "^4.0|^5.0|^6.0|^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2.x-dev" + "dev-master": "3.3.x-dev" } }, "autoload": { @@ -2249,7 +2255,7 @@ "serialization", "serialize" ], - "time": "2019-05-05T12:50:25+00:00" + "time": "2019-05-31T20:04:32+00:00" }, { "name": "paragonie/random_compat", @@ -3265,16 +3271,16 @@ }, { "name": "symfony/console", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "707b619d2c3bedf0224d56f95f77dabc60102305" + "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/707b619d2c3bedf0224d56f95f77dabc60102305", - "reference": "707b619d2c3bedf0224d56f95f77dabc60102305", + "url": "https://api.github.com/repos/symfony/console/zipball/d50bbeeb0e17e6dd4124ea391eff235e932cbf64", + "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64", "shasum": "" }, "require": { @@ -3336,11 +3342,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-05-27T08:16:38+00:00" + "time": "2019-06-05T13:25:51+00:00" }, { "name": "symfony/css-selector", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3393,16 +3399,16 @@ }, { "name": "symfony/debug", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "97cde06d798f1326857090bc1b7c8f9d225c3dcb" + "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/97cde06d798f1326857090bc1b7c8f9d225c3dcb", - "reference": "97cde06d798f1326857090bc1b7c8f9d225c3dcb", + "url": "https://api.github.com/repos/symfony/debug/zipball/4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", + "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6", "shasum": "" }, "require": { @@ -3445,20 +3451,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-05-20T16:16:12+00:00" + "time": "2019-05-30T16:10:05+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "c71314cd3b9420b732e1526f33a24eff5430b5b3" + "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c71314cd3b9420b732e1526f33a24eff5430b5b3", - "reference": "c71314cd3b9420b732e1526f33a24eff5430b5b3", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4e6c670af81c4fb0b6c08b035530a9915d0b691f", + "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f", "shasum": "" }, "require": { @@ -3515,7 +3521,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2019-05-28T07:50:59+00:00" + "time": "2019-05-30T16:10:05+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3577,7 +3583,7 @@ }, { "name": "symfony/finder", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -3626,16 +3632,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e8da078912bed1339f046c3a9488a5cbd0605971" + "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8da078912bed1339f046c3a9488a5cbd0605971", - "reference": "e8da078912bed1339f046c3a9488a5cbd0605971", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b7e4945dd9b277cd24e93566e4da0a87956392a9", + "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9", "shasum": "" }, "require": { @@ -3677,20 +3683,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-05-29T18:10:42+00:00" + "time": "2019-06-06T10:05:02+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "b4ce396bdce518978a17324d3d39d61058d039e6" + "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b4ce396bdce518978a17324d3d39d61058d039e6", - "reference": "b4ce396bdce518978a17324d3d39d61058d039e6", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/738ad561cd6a8d1c44ee1da941b2e628e264c429", + "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429", "shasum": "" }, "require": { @@ -3769,20 +3775,20 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-05-30T06:21:08+00:00" + "time": "2019-06-06T13:23:34+00:00" }, { "name": "symfony/mime", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "0b166aee243364cd9de05755d2e9651876090abb" + "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/0b166aee243364cd9de05755d2e9651876090abb", - "reference": "0b166aee243364cd9de05755d2e9651876090abb", + "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b", + "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b", "shasum": "" }, "require": { @@ -3828,7 +3834,7 @@ "mime", "mime-type" ], - "time": "2019-05-22T13:16:28+00:00" + "time": "2019-06-04T09:22:54+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4183,16 +4189,16 @@ }, { "name": "symfony/process", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "a5e3dd4e93a364668034a3cb6efa963d0b33ab45" + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/a5e3dd4e93a364668034a3cb6efa963d0b33ab45", - "reference": "a5e3dd4e93a364668034a3cb6efa963d0b33ab45", + "url": "https://api.github.com/repos/symfony/process/zipball/856d35814cf287480465bb7a6c413bb7f5f5e69c", + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c", "shasum": "" }, "require": { @@ -4228,20 +4234,20 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2019-05-26T20:47:49+00:00" + "time": "2019-05-30T16:10:05+00:00" }, { "name": "symfony/routing", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "e6cc85f03102ef5e4aedfe636f83e58cf6fd7338" + "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/e6cc85f03102ef5e4aedfe636f83e58cf6fd7338", - "reference": "e6cc85f03102ef5e4aedfe636f83e58cf6fd7338", + "url": "https://api.github.com/repos/symfony/routing/zipball/9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", + "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465", "shasum": "" }, "require": { @@ -4304,7 +4310,7 @@ "uri", "url" ], - "time": "2019-05-20T16:16:12+00:00" + "time": "2019-06-05T09:16:20+00:00" }, { "name": "symfony/service-contracts", @@ -4366,16 +4372,16 @@ }, { "name": "symfony/translation", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f7e90f0f90e354f99f20aa9ead95a1b201b126f9" + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f7e90f0f90e354f99f20aa9ead95a1b201b126f9", - "reference": "f7e90f0f90e354f99f20aa9ead95a1b201b126f9", + "url": "https://api.github.com/repos/symfony/translation/zipball/5dda505e5f65d759741dfaf4e54b36010a4b57aa", + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa", "shasum": "" }, "require": { @@ -4438,7 +4444,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-05-28T09:09:27+00:00" + "time": "2019-06-03T20:27:40+00:00" }, { "name": "symfony/translation-contracts", @@ -4499,16 +4505,16 @@ }, { "name": "symfony/var-dumper", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2fd2ecf7913fb96f0c2e941ca15bb702184c6574" + "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2fd2ecf7913fb96f0c2e941ca15bb702184c6574", - "reference": "2fd2ecf7913fb96f0c2e941ca15bb702184c6574", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f974f448154928d2b5fb7c412bd23b81d063f34b", + "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b", "shasum": "" }, "require": { @@ -4571,7 +4577,7 @@ "debug", "dump" ], - "time": "2019-05-01T12:55:49+00:00" + "time": "2019-06-05T02:08:12+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5210,16 +5216,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.15.0", + "version": "v2.15.1", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91" + "reference": "20064511ab796593a3990669eff5f5b535001f7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/adfab51ae979ee8b0fcbc55aa231ec2786cb1f91", - "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/20064511ab796593a3990669eff5f5b535001f7c", + "reference": "20064511ab796593a3990669eff5f5b535001f7c", "shasum": "" }, "require": { @@ -5251,7 +5257,7 @@ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1", "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1", "phpunitgoodpractices/traits": "^1.8", - "symfony/phpunit-bridge": "^4.0" + "symfony/phpunit-bridge": "^4.3" }, "suggest": { "ext-mbstring": "For handling non-UTF8 characters in cache signature.", @@ -5263,11 +5269,6 @@ "php-cs-fixer" ], "type": "application", - "extra": { - "branch-alias": { - "dev-master": "2.15-dev" - } - }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -5299,7 +5300,7 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2019-05-06T07:13:51+00:00" + "time": "2019-06-01T10:32:12+00:00" }, { "name": "fzaninotto/faker", @@ -6338,16 +6339,16 @@ }, { "name": "phpunit/php-timer", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059" + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059", - "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", "shasum": "" }, "require": { @@ -6383,7 +6384,7 @@ "keywords": [ "timer" ], - "time": "2019-02-20T10:12:59+00:00" + "time": "2019-06-07T04:22:29+00:00" }, { "name": "phpunit/php-token-stream", @@ -7086,16 +7087,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "988ab7d70c267c34efa85772ca20de3fad11c74b" + "reference": "bf2af40d738dec5e433faea7b00daa4431d0a4cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/988ab7d70c267c34efa85772ca20de3fad11c74b", - "reference": "988ab7d70c267c34efa85772ca20de3fad11c74b", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/bf2af40d738dec5e433faea7b00daa4431d0a4cf", + "reference": "bf2af40d738dec5e433faea7b00daa4431d0a4cf", "shasum": "" }, "require": { @@ -7132,11 +7133,11 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2019-05-24T12:50:04+00:00" + "time": "2019-06-03T20:27:40+00:00" }, { "name": "symfony/options-resolver", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -7249,7 +7250,7 @@ }, { "name": "symfony/stopwatch", - "version": "v4.3.0", + "version": "v4.3.1", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", From f20e070fe30c5084c200e0f787daba5216440792 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sat, 8 Jun 2019 13:40:44 -0300 Subject: [PATCH 22/22] Version --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d7d0de20a8..371d66a34a 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Software livre de gestão escolar", "type": "project", "license": "GPL-2.0-or-later", - "version": "2.1.14", + "version": "2.1.15", "keywords": [ "Portabilis", "i-Educar" diff --git a/composer.lock b/composer.lock index 07bc96bc51..9015b2d828 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "fbae75dc661848ff4657a50f61c4c05e", + "content-hash": "1bd1572140bf25351346f05438da486c", "packages": [ { "name": "cocur/slugify",