From 2bdcf24efddf59730bc28e8575dcc3561382c440 Mon Sep 17 00:00:00 2001 From: Lucas Schmoeller da Silva Date: Sat, 18 Jan 2020 15:11:10 -0300 Subject: [PATCH 01/17] Adc namespace de classes dos Reports no composer.json Refs #2984 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f25be87037..14dfae21d3 100644 --- a/composer.json +++ b/composer.json @@ -62,7 +62,8 @@ ], "psr-4": { "App\\": "app/", - "iEducar\\": "src" + "iEducar\\": "src", + "iEducar\\Packages\\Reports\\": "ieducar/modules/Reports/src" } }, "autoload-dev": { From df3bd5039e698f735e8e930749a132598c5d662f Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Thu, 13 Feb 2020 11:35:57 -0300 Subject: [PATCH 02/17] =?UTF-8?q?Desabilita=20temporariamente=20o=20lan?= =?UTF-8?q?=C3=A7amento=20de=20faltas=20para=20casos=20em=20que=20a=20regr?= =?UTF-8?q?a=20n=C3=A3o=20usa=20nota?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/modules/Avaliacao/Views/PromocaoApiController.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php index 0d5ebc2a9c..d010c0bcd5 100644 --- a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php +++ b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php @@ -227,7 +227,10 @@ protected function lancarFaltasNaoLancadas($matriculaId) // FIXME #parameters $regra = $this->boletimService()->getRegra(); $tpPresenca = $regra->get('tipoPresenca'); - $regraNaoUsaNota = $this->regraNaoUsaNota($regra->get('tipoNota')); + + //todo: Desabilitado temporariamente devido a problemas com aprovações indevidas + // #6995 + $regraNaoUsaNota = false;//$this->regraNaoUsaNota($regra->get('tipoNota')); $componentesCurriculares = $this->loadComponentesCurriculares($matriculaId); From abc2eb4455fe61350f8c8795b09caefb9c5a6107 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sat, 15 Feb 2020 11:32:19 -0300 Subject: [PATCH 03/17] =?UTF-8?q?Salva=20campo=20data=20de=20expira=C3=A7?= =?UTF-8?q?=C3=A3o=20corretamente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/include/portal/clsPortalFuncionario.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/intranet/include/portal/clsPortalFuncionario.inc.php b/ieducar/intranet/include/portal/clsPortalFuncionario.inc.php index f3abce48fc..e1306e7731 100644 --- a/ieducar/intranet/include/portal/clsPortalFuncionario.inc.php +++ b/ieducar/intranet/include/portal/clsPortalFuncionario.inc.php @@ -32,7 +32,7 @@ class clsPortalFuncionario extends Model public $receber_novidades; public $atualizou_cadastro; - public function __construct($ref_cod_pessoa_fj = null, $matricula = null, $senha = null, $ativo = null, $ref_sec = null, $ramal = null, $sequencial = null, $opcao_menu = null, $ref_cod_administracao_secretaria = null, $ref_ref_cod_administracao_secretaria = null, $ref_cod_departamento = null, $ref_ref_ref_cod_administracao_secretaria = null, $ref_ref_cod_departamento = null, $ref_cod_setor = null, $ref_cod_funcionario_vinculo = null, $tempo_expira_senha = null, $tempo_expira_conta = null, $data_troca_senha = null, $data_reativa_conta = null, $ref_ref_cod_pessoa_fj = null, $proibido = null, $ref_cod_setor_new = null, $matricula_new = null, $matricula_permanente = null, $tipo_menu = null, $email = null, $matricula_interna = null) + public function __construct($ref_cod_pessoa_fj = null, $matricula = null, $senha = null, $ativo = null, $ref_sec = null, $ramal = null, $sequencial = null, $opcao_menu = null, $ref_cod_administracao_secretaria = null, $ref_ref_cod_administracao_secretaria = null, $ref_cod_departamento = null, $ref_ref_ref_cod_administracao_secretaria = null, $ref_ref_cod_departamento = null, $ref_cod_setor = null, $ref_cod_funcionario_vinculo = null, $tempo_expira_senha = null, $data_expiracao = null, $data_troca_senha = null, $data_reativa_conta = null, $ref_ref_cod_pessoa_fj = null, $proibido = null, $ref_cod_setor_new = null, $matricula_new = null, $matricula_permanente = null, $tipo_menu = null, $email = null, $matricula_interna = null) { $db = new clsBanco(); $this->_schema = 'portal.'; From 505456c579f29f2c13135daacc545a48981247bb Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sun, 16 Feb 2020 15:14:39 -0300 Subject: [PATCH 04/17] =?UTF-8?q?Mant=C3=A9m=20apenas=20a=20primeira=20lin?= =?UTF-8?q?ha=20de=20configura=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._16_000000_keep_just_one_configuration.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 database/migrations/2020_02_16_000000_keep_just_one_configuration.php diff --git a/database/migrations/2020_02_16_000000_keep_just_one_configuration.php b/database/migrations/2020_02_16_000000_keep_just_one_configuration.php new file mode 100644 index 0000000000..a3d039470b --- /dev/null +++ b/database/migrations/2020_02_16_000000_keep_just_one_configuration.php @@ -0,0 +1,21 @@ +first(); + + DB::unprepared('DELETE FROM pmieducar.configuracoes_gerais;'); + + DB::table('pmieducar.configuracoes_gerais')->insert($config); + } +} From 43a27cdaf469b2bf160468495c686198b63963d8 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sun, 16 Feb 2020 15:14:42 -0300 Subject: [PATCH 05/17] =?UTF-8?q?Adiciona=20chave=20prim=C3=A1ria=20a=20ta?= =?UTF-8?q?bela=20de=20configura=C3=A7=C3=B5es=20gerais?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...y_column_in_configuracoes_gerais_table.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 database/migrations/2020_02_16_100000_add_primary_column_in_configuracoes_gerais_table.php diff --git a/database/migrations/2020_02_16_100000_add_primary_column_in_configuracoes_gerais_table.php b/database/migrations/2020_02_16_100000_add_primary_column_in_configuracoes_gerais_table.php new file mode 100644 index 0000000000..e389b452da --- /dev/null +++ b/database/migrations/2020_02_16_100000_add_primary_column_in_configuracoes_gerais_table.php @@ -0,0 +1,32 @@ +primary('ref_cod_instituicao'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('configuracoes_gerais', function (Blueprint $table) { + $table->dropPrimary('ref_cod_instituicao'); + }); + } +} From 929d6640a9dc78dc80982cb5bdb74f58544d2af6 Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Mon, 17 Feb 2020 09:00:12 -0300 Subject: [PATCH 06/17] =?UTF-8?q?Trata=20campos=20opcionais=20na=20importa?= =?UTF-8?q?=C3=A7=C3=A3o=20do=20registro=2010?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/Educacenso/ImportService.php | 2 +- .../Educacenso/Version2019/Registro10Import.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Services/Educacenso/ImportService.php b/app/Services/Educacenso/ImportService.php index efaf754e3c..12f8de7bac 100644 --- a/app/Services/Educacenso/ImportService.php +++ b/app/Services/Educacenso/ImportService.php @@ -35,7 +35,7 @@ private function importLine($line, $user) $lineId = $this->getLineId($line); $class = $this->getRegistroById($lineId); - $line = str_replace("\r\n", '', utf8_decode($line)); + $line = preg_replace( "/\r|\n/", '', utf8_decode($line)); $arrayColumns = explode(self::DELIMITER, $line); if (!$class) { diff --git a/app/Services/Educacenso/Version2019/Registro10Import.php b/app/Services/Educacenso/Version2019/Registro10Import.php index 8bdc7ce8f0..59227d7196 100644 --- a/app/Services/Educacenso/Version2019/Registro10Import.php +++ b/app/Services/Educacenso/Version2019/Registro10Import.php @@ -125,18 +125,18 @@ public function import(RegistroEducacenso $model, $year, $user) $school->qtd_secretario_escolar = $model->qtdSecretarioEscolar ?: null; $school->qtd_segurancas = $model->qtdSegurancas ?: null; $school->qtd_tecnicos = $model->qtdTecnicos ?: null; - $school->alimentacao_escolar_alunos = $model->alimentacaoEscolarAlunos; + $school->alimentacao_escolar_alunos = $model->alimentacaoEscolarAlunos ?: null; $school->organizacao_ensino = $this->getArrayOrganizacaoEnsino(); $school->instrumentos_pedagogicos = $this->getArrayInstrumentosPedagogicos(); - $school->educacao_indigena = $model->educacaoIndigena; + $school->educacao_indigena = $model->educacaoIndigena ?: null; $school->lingua_ministrada = $model->linguaIndigena ? LinguaMinistrada::INDIGENA : LinguaMinistrada::PORTUGUESA; $school->codigo_lingua_indigena = $this->getArrayLinguaIndigena(); - $school->exame_selecao_ingresso = $model->exameSelecaoIngresso; + $school->exame_selecao_ingresso = $model->exameSelecaoIngresso ?: null; $school->reserva_vagas_cotas = $this->getArrayReservaVagas(); $school->predio_compartilhado_outra_escola = $model->predioCompartilhadoOutraEscola ?: null; - $school->usa_espacos_equipamentos_atividades_regulares = $model->usaEspacosEquipamentosAtividadesRegulares; + $school->usa_espacos_equipamentos_atividades_regulares = $model->usaEspacosEquipamentosAtividadesRegulares ?: null; $school->orgaos_colegiados = $this->getArrayOrgaosColegiados(); - $school->projeto_politico_pedagogico = $model->projetoPoliticoPedagogico; + $school->projeto_politico_pedagogico = $model->projetoPoliticoPedagogico ?: null; $school->save(); } From 0c187a8b49291349794a8f2d7516509a34a739b4 Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Tue, 18 Feb 2020 16:51:29 -0300 Subject: [PATCH 07/17] =?UTF-8?q?Altera=20verifica=C3=A7=C3=A3o=20de=20sit?= =?UTF-8?q?ua=C3=A7=C3=A3o=20Aprovado=20com=20depend=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Para a contagem da quantidade máxima de disciplinas reprovadas permitidas para a situação _Aprovado com dependência_, não estavam sendo consideradas disciplinas reprovadas por falta. Foi criado um novo método para fazer essa verificação, considerando também as disciplinas reprovadas por falta --- ieducar/modules/Avaliacao/Service/Boletim.php | 70 ++++++++++++++----- 1 file changed, 54 insertions(+), 16 deletions(-) diff --git a/ieducar/modules/Avaliacao/Service/Boletim.php b/ieducar/modules/Avaliacao/Service/Boletim.php index 2b5145f282..3b132b6054 100644 --- a/ieducar/modules/Avaliacao/Service/Boletim.php +++ b/ieducar/modules/Avaliacao/Service/Boletim.php @@ -1,6 +1,8 @@ getSituacaoNotas(true); $situacaoFaltas = $this->getSituacaoFaltas(); + if ($this->allowsApproveWithDependence($situacaoNotas->situacao)) { + $situacaoNotas->situacao = App_Model_MatriculaSituacao::APROVADO_COM_DEPENDENCIA; + } + $situacao = $this->getSituacaoNotaFalta($situacaoNotas->situacao, $situacaoFaltas->situacao); $situacao->nota = $situacaoNotas; $situacao->falta = $situacaoFaltas; @@ -916,22 +922,6 @@ public function getSituacaoNotas($calcularSituacaoAluno = false) $situacao->componentesCurriculares[$id]->situacao = $situacao->componentesCurriculares[$codigosAglutinados[0]]->situacao; } - $matricula = $this->getOption('matriculaData'); - $serie = App_Model_IedFinder::getSerie($matricula['ref_ref_cod_serie']); - $instituicao = App_Model_IedFinder::getInstituicao($matricula['ref_cod_instituicao']); - - $anoConcluinte = ($serie['concluinte'] == 2); - $reprovaAnoConcluinte = dbBool($instituicao['reprova_dependencia_ano_concluinte']); - - $aprovaDependencia = !($reprovaAnoConcluinte && $anoConcluinte); - $aprovaDependencia = ($aprovaDependencia && !dbBool($matricula['dependencia'])); - $aprovaDependencia = ($aprovaDependencia && $situacaoGeral == App_Model_MatriculaSituacao::REPROVADO); - $aprovaDependencia = ($aprovaDependencia && $qtdComponenteReprovado <= $this->getRegraAvaliacaoQtdDisciplinasDependencia()); - - if ($aprovaDependencia) { - $situacaoGeral = App_Model_MatriculaSituacao::APROVADO_COM_DEPENDENCIA; - } - if ($situacaoGeral == App_Model_MatriculaSituacao::REPROVADO && $this->hasRegraAvaliacaoAprovaMediaDisciplina() && ($somaMedias / $qtdComponentes) >= $this->getRegraAvaliacaoMediaRecuperacao()) { @@ -3115,4 +3105,52 @@ public function calculateStageScore($stage, $score, $remedial) return $service->calculateRemedial($score, $remedial); } + + /** + * Verifica se a matrícula pode ficar aprovada com dependência + * + * @param integer $status + * @return bool + * @throws App_Model_Exception + * @throws Exception + */ + private function allowsApproveWithDependence($newRegistrationStatus) + { + $matricula = $this->getOption('matriculaData'); + $serie = LegacyGrade::find($matricula['ref_ref_cod_serie']); + $instituicao = app(LegacyInstitution::class); + + $concluding = ($serie->concluinte == 2); + $reprovesConcluding = $instituicao->reprova_dependencia_ano_concluinte; + + if ($concluding && $reprovesConcluding) { + return false; + } + + if ($matricula['dependencia']) { + return false; + } + + if ($newRegistrationStatus != App_Model_MatriculaSituacao::REPROVADO) { + return false; + } + + $disciplineAverages = $this->_loadMedias()->getMediasComponentes(); + + $amountReproved = 0; + foreach ($disciplineAverages as $disciplineId => $disciplineAverage) { + $disciplineAverage = $disciplineAverage[0]; + + if (!$this->exibeSituacao($disciplineId)) { + continue; + } + + if ($disciplineAverage->situacao == App_Model_MatriculaSituacao::REPROVADO) { + $amountReproved++; + } + + } + + return $amountReproved <= $this->getRegraAvaliacaoQtdDisciplinasDependencia(); + } } From 93a2b5932dc68d899d700db9494efd185d95bbc6 Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Wed, 19 Feb 2020 07:32:44 -0300 Subject: [PATCH 08/17] Ajusta teste legado --- tests/Unit/Modules/Service/SituacaoTest.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/Unit/Modules/Service/SituacaoTest.php b/tests/Unit/Modules/Service/SituacaoTest.php index 2186e38942..f19c720eb3 100644 --- a/tests/Unit/Modules/Service/SituacaoTest.php +++ b/tests/Unit/Modules/Service/SituacaoTest.php @@ -29,6 +29,9 @@ * @version $Id$ */ +use App\Models\LegacyLevel; +use App\Models\LegacyRegistration; + require_once __DIR__.'/TestCommon.php'; /** @@ -62,6 +65,14 @@ public function testSituacaoAluno() ->method('getRegra') ->will($this->returnValue($regra)); + $registration = factory(LegacyRegistration::class)->create([ + 'ref_ref_cod_serie' => factory(LegacyLevel::class)->create(), + 'dependencia' => true, + ]); + $service->expects($this->any()) + ->method('getOption') + ->will($this->returnValue($registration->toArray())); + $notaSituacoes = [ 1 => App_Model_MatriculaSituacao::APROVADO, 2 => App_Model_MatriculaSituacao::APROVADO_APOS_EXAME, From 44cebed61d7821e35c0b7ab5613f18473be6263d Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Wed, 19 Feb 2020 07:36:10 -0300 Subject: [PATCH 09/17] =?UTF-8?q?Cria=20m=C3=A9todo=20para=20post=20de=20n?= =?UTF-8?q?ota=20do=20exame?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php b/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php index 5354bc66ee..026b3159a2 100644 --- a/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php +++ b/tests/Feature/DiarioApi/DiarioApiRequestTestTrait.php @@ -50,14 +50,19 @@ public function postAbsence($enrollment, $disciplineId, $stage, $score) return json_decode($response->content()); } - public function postScore($enrollment, $disciplineId, $stage, $score) + public function postExam($enrollment, $disciplineId, $stage, $score) + { + return $this->postScore($enrollment, $disciplineId, $stage, $score, 'nota_exame'); + } + + public function postScore($enrollment, $disciplineId, $stage, $score, $resource = 'nota') { $this->cleanGlobals(); $schoolClass = $enrollment->schoolClass; $data = [ - 'resource' => 'nota', + 'resource' => $resource, 'oper' => 'post', 'instituicao_id' => $schoolClass->school->institution->id, 'escola_id' => $schoolClass->school_id, From 0817b45a076b15bcf5b1aa95e984edb44fbf213e Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Wed, 19 Feb 2020 07:37:02 -0300 Subject: [PATCH 10/17] =?UTF-8?q?Cria=20teste=20para=20contador=20de=20dis?= =?UTF-8?q?ciplinas=20em=20depend=C3=AAncia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/Feature/DiarioApi/DependencyTest.php | 51 +++++++++++++++++++ .../DiarioApi/DiarioApiFakeDataTestTrait.php | 16 ++++++ ...AverageCalculationWeightedRecoveryTest.php | 18 +------ 3 files changed, 68 insertions(+), 17 deletions(-) diff --git a/tests/Feature/DiarioApi/DependencyTest.php b/tests/Feature/DiarioApi/DependencyTest.php index 6c491d3d46..02facae8dc 100644 --- a/tests/Feature/DiarioApi/DependencyTest.php +++ b/tests/Feature/DiarioApi/DependencyTest.php @@ -58,4 +58,55 @@ public function testWithDependencyShouldReturnsApprovedWithDependency() $registration = $this->enrollment->registration; $this->assertEquals(App_Model_MatriculaSituacao::APROVADO_COM_DEPENDENCIA, $registration->refresh()->aprovado); } + + /** + * Quando o número de disciplinas em dependencia é maior do que o configurado, incluindo reprovações por falta, + * deve retornar Reprovado + */ + public function testShouldReturnsReprovedWhenDependenciesIsOver() + { + $this->enrollment = $this->getProgressionWithAverageCalculationWeightedRecovery(); + + $schoolClass = $this->enrollment->schoolClass; + $school = $schoolClass->school; + + $this->createStages($school, 2); + $this->createDisciplines($schoolClass, 2); + + $evaluationRule = $schoolClass->grade->evaluationRules()->first(); + $evaluationRule->qtd_disciplinas_dependencia = 1; + $evaluationRule->save(); + + $disciplines = $schoolClass->disciplines; + + $score = [ + 1 => 4, + 2 => 1, + ]; + $absence = [ + 1 => 1, + 2 => 3, + ]; + + $this->postAbsenceForStages($absence, $disciplines[0]); + $this->postScoreForStages($score, $disciplines[0]); + $response = $this->postExam($this->enrollment, $disciplines[0]->id, 'Rc', '1'); + $this->assertEquals('Retido', $response->situacao); + + $score = [ + 1 => 10, + 2 => 10, + ]; + $absence = [ + 1 => 100, + 2 => 3, + ]; + + $this->postAbsenceForStages($absence, $disciplines[1]); + $response = $this->postScoreForStages($score, $disciplines[1]); + $this->assertEquals('Retido', $response->situacao); + + $registration = $this->enrollment->registration; + $this->assertEquals(App_Model_MatriculaSituacao::REPROVADO, $registration->refresh()->aprovado); + } } diff --git a/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php b/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php index f7c2614530..014e1d9ec2 100644 --- a/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php +++ b/tests/Feature/DiarioApi/DiarioApiFakeDataTestTrait.php @@ -116,6 +116,22 @@ public function getPromotionFromAverageAndAttendanceWithoutRetake() return $enrollment; } + public function getProgressionWithAverageCalculationWeightedRecovery() + { + $roundingTable = factory(LegacyRoundingTable::class, 'numeric')->create(); + factory(LegacyValueRoundingTable::class, 10)->create([ + 'tabela_arredondamento_id' => $roundingTable->id, + ]); + + $evaluationRule = factory(LegacyEvaluationRule::class, 'progressao-calculo-media-recuperacao-ponderada')->create([ + 'tabela_arredondamento_id' => $roundingTable->id, + ]); + + $enrollment = $this->getCommonFakeData($evaluationRule); + + return $enrollment; + } + public function createStages($school, $stages) { for ($count = 1; $count <= $stages; $count++) { diff --git a/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php b/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php index 5443861703..1f7c17ad35 100644 --- a/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php +++ b/tests/Feature/DiarioApi/ProgressionWithAverageCalculationWeightedRecoveryTest.php @@ -22,23 +22,7 @@ class ProgressionWithAverageCalculationWeightedRecoveryTest extends TestCase public function setUp(): void { parent::setUp(); - $this->enrollment = $this->getProgressionWithAverageCalculationWeightedRecoveryTest(); - } - - public function getProgressionWithAverageCalculationWeightedRecoveryTest() - { - $roundingTable = factory(LegacyRoundingTable::class, 'numeric')->create(); - factory(LegacyValueRoundingTable::class, 10)->create([ - 'tabela_arredondamento_id' => $roundingTable->id, - ]); - - $evaluationRule = factory(LegacyEvaluationRule::class, 'progressao-calculo-media-recuperacao-ponderada')->create([ - 'tabela_arredondamento_id' => $roundingTable->id, - ]); - - $enrollment = $this->getCommonFakeData($evaluationRule); - - return $enrollment; + $this->enrollment = $this->getProgressionWithAverageCalculationWeightedRecovery(); } /** From 75edac9ef4ea785f94aaf9a0e2216071a1276264 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Wed, 19 Feb 2020 13:54:21 -0300 Subject: [PATCH 11/17] Utiliza ano letivo do formulario --- ieducar/intranet/educar_turma_cad.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ieducar/intranet/educar_turma_cad.php b/ieducar/intranet/educar_turma_cad.php index 3f8c0ba76c..ac0a1cdd55 100644 --- a/ieducar/intranet/educar_turma_cad.php +++ b/ieducar/intranet/educar_turma_cad.php @@ -1586,15 +1586,13 @@ protected function getAnoEscolarEmAndamento($escolaId) protected function getCountMatriculas($escolaId, $turmaId) { - $ano = $this->getAnoEscolarEmAndamento($escolaId); - - if (!is_numeric($ano)) { + if (!is_numeric($this->ano_letivo)) { $this->mensagem = 'Não foi possivel obter um ano em andamento, por favor, inicie um ano para a escola ou desative a configuração (para série e escola) \'Bloquear cadastro de novas turmas antes de atingir limite de vagas (no mesmo turno)\'.'; return false; } - $sql = "select count(cod_matricula) as matriculas from pmieducar.matricula, pmieducar.matricula_turma where ano = $ano and matricula.ativo = 1 and matricula_turma.ativo = matricula.ativo and cod_matricula = ref_cod_matricula and ref_cod_turma = $turmaId"; + $sql = "select count(cod_matricula) as matriculas from pmieducar.matricula, pmieducar.matricula_turma where ano = {$this->ano_letivo} and matricula.ativo = 1 and matricula_turma.ativo = matricula.ativo and cod_matricula = ref_cod_matricula and ref_cod_turma = {$turmaId}"; return $this->getDb()->CampoUnico($sql); } @@ -1606,7 +1604,7 @@ protected function canCreateTurma($escolaId, $serieId, $turnoId) if ($escolaSerie['bloquear_cadastro_turma_para_serie_com_vagas'] == 1) { $turmas = new clsPmieducarTurma(); - $turmas = $turmas->lista(null, null, null, $serieId, $escolaId, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, true, $turnoId, null, null, true); + $turmas = $turmas->lista(null, null, null, $serieId, $escolaId, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, true, $turnoId, null, $this->ano_letivo, true); foreach ($turmas as $turma) { $countMatriculas = $this->getCountMatriculas($escolaId, $turma['cod_turma']); From b3035db2d19c9e794c8806928f31a0fb489244a4 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Wed, 19 Feb 2020 14:24:29 -0300 Subject: [PATCH 12/17] =?UTF-8?q?Altera=20mensagem=20e=20remove=20metodos?= =?UTF-8?q?=20n=C3=A3o=20utilizados?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_turma_cad.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/ieducar/intranet/educar_turma_cad.php b/ieducar/intranet/educar_turma_cad.php index ac0a1cdd55..e1217c0461 100644 --- a/ieducar/intranet/educar_turma_cad.php +++ b/ieducar/intranet/educar_turma_cad.php @@ -1579,15 +1579,10 @@ protected function getEscolaSerie($escolaId, $serieId) return $escolaSerie->detalhe(); } - protected function getAnoEscolarEmAndamento($escolaId) - { - return $this->getDb()->CampoUnico("select ano from pmieducar.escola_ano_letivo where ativo = 1 and andamento = 1 and ref_cod_escola = $escolaId"); - } - - protected function getCountMatriculas($escolaId, $turmaId) + protected function getCountMatriculas($turmaId) { if (!is_numeric($this->ano_letivo)) { - $this->mensagem = 'Não foi possivel obter um ano em andamento, por favor, inicie um ano para a escola ou desative a configuração (para série e escola) \'Bloquear cadastro de novas turmas antes de atingir limite de vagas (no mesmo turno)\'.'; + $this->mensagem = 'É necessário informar um ano letivo.'; return false; } @@ -1607,7 +1602,7 @@ protected function canCreateTurma($escolaId, $serieId, $turnoId) $turmas = $turmas->lista(null, null, null, $serieId, $escolaId, null, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, true, $turnoId, null, $this->ano_letivo, true); foreach ($turmas as $turma) { - $countMatriculas = $this->getCountMatriculas($escolaId, $turma['cod_turma']); + $countMatriculas = $this->getCountMatriculas($turma['cod_turma']); // countMatriculas retorna false e adiciona mensagem, se não obter ano em andamento if ($countMatriculas === false) { From 9f6c8cae4bfcf78bb52b0966ce2529fd01ea4bc2 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Thu, 20 Feb 2020 10:17:49 -0300 Subject: [PATCH 13/17] =?UTF-8?q?Passa=20etapas=20no=20lan=C3=A7amento=20d?= =?UTF-8?q?e=20faltas=20onde=20a=20etapa=20j=C3=A1=20foi=20concluida?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Avaliacao/Views/PromocaoApiController.php | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php index d010c0bcd5..5bd9972742 100644 --- a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php +++ b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php @@ -1,5 +1,7 @@ boletimService()->getRegra(); $tpPresenca = $regra->get('tipoPresenca'); - //todo: Desabilitado temporariamente devido a problemas com aprovações indevidas - // #6995 - $regraNaoUsaNota = false;//$this->regraNaoUsaNota($regra->get('tipoNota')); + $regraNaoUsaNota = $this->regraNaoUsaNota($regra->get('tipoNota')); $componentesCurriculares = $this->loadComponentesCurriculares($matriculaId); + $ano = $this->boletimService()->getOption('matriculaData')['ano']; + $escolaId = $this->boletimService()->getOption('matriculaData')['ref_ref_cod_escola']; + $schoolStages = LegacySchoolStage::query() + ->where(['ref_ref_cod_escola'=> $escolaId, 'ref_ano' => $ano]) + ->where('data_fim', '<', now()) + ->get(['data_fim', 'sequencial']); + + foreach($schoolStages as $schoolStage) { + $getSchoolStages[] = $schoolStage->sequencial; + } + + sort($getSchoolStages); + $etapas = array_map(function($arr) { + return $arr; + }, $getSchoolStages); + if ($tpPresenca == RegraAvaliacao_Model_TipoPresenca::GERAL) { // FIXME #parameters - foreach (range(1, $this->boletimService()->getOption('etapas')) as $etapa) { + + foreach ($etapas as $etapa) { $hasNotaOrParecerInEtapa = false; if ($regraNaoUsaNota) { @@ -270,7 +287,7 @@ protected function lancarFaltasNaoLancadas($matriculaId) }//for etapa } elseif ($tpPresenca == RegraAvaliacao_Model_TipoPresenca::POR_COMPONENTE) { // FIXME #parameters - foreach (range(1, $this->boletimService()->getOption('etapas')) as $etapa) { + foreach ($etapas as $etapa) { foreach ($componentesCurriculares as $cc) { $nota = $this->getNota($etapa, $cc['id']); $parecer = $this->getParecerDescritivo($etapa, $cc['id']); From 3740b2fb60c5b6a4352e4784ba770655267a42d4 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Thu, 20 Feb 2020 14:23:29 -0300 Subject: [PATCH 14/17] Valida modulo da turma primeiro --- .../Avaliacao/Views/PromocaoApiController.php | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php index 5bd9972742..eb4b7b3419 100644 --- a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php +++ b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php @@ -1,5 +1,6 @@ boletimService()->getOption('matriculaData')['ano']; $escolaId = $this->boletimService()->getOption('matriculaData')['ref_ref_cod_escola']; - $schoolStages = LegacySchoolStage::query() - ->where(['ref_ref_cod_escola'=> $escolaId, 'ref_ano' => $ano]) + $turmaId = $this->boletimService()->getOption('matriculaData')['ref_cod_turma']; + + $stages = LegacySchoolClassStage::query(['sequencial']) + ->where(['ref_cod_turma' => $turmaId]) ->where('data_fim', '<', now()) - ->get(['data_fim', 'sequencial']); + ->orderBy('sequencial'); + + if ($stages->exists()) { + $stages = LegacySchoolStage::query(['sequencial']) + ->where([ + 'ref_ref_cod_escola' => $escolaId, + 'ref_ano' => $ano + ]) + ->where('data_fim', '<', now()) + ->orderBy('sequencial'); + } - foreach($schoolStages as $schoolStage) { - $getSchoolStages[] = $schoolStage->sequencial; + foreach($stages->get() as $stage) { + $getStages[] = $stage->sequencial; } - sort($getSchoolStages); $etapas = array_map(function($arr) { return $arr; - }, $getSchoolStages); + }, $getStages); if ($tpPresenca == RegraAvaliacao_Model_TipoPresenca::GERAL) { // FIXME #parameters From 2b7fa7dd7bf429ca6cdff8fb8cbf138e7eec47e6 Mon Sep 17 00:00:00 2001 From: Matheus Nicoski Date: Thu, 20 Feb 2020 14:25:16 -0300 Subject: [PATCH 15/17] =?UTF-8?q?Ajusta=20condi=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/modules/Avaliacao/Views/PromocaoApiController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php index eb4b7b3419..1d9fac380f 100644 --- a/ieducar/modules/Avaliacao/Views/PromocaoApiController.php +++ b/ieducar/modules/Avaliacao/Views/PromocaoApiController.php @@ -244,7 +244,7 @@ protected function lancarFaltasNaoLancadas($matriculaId) ->where('data_fim', '<', now()) ->orderBy('sequencial'); - if ($stages->exists()) { + if (!$stages->exists()) { $stages = LegacySchoolStage::query(['sequencial']) ->where([ 'ref_ref_cod_escola' => $escolaId, From b269f24552843bace3de837ed887e796919731ae Mon Sep 17 00:00:00 2001 From: Everton Muniz Date: Thu, 20 Feb 2020 18:10:45 -0300 Subject: [PATCH 16/17] Remove usos da tabela endereco_externo --- app/Repositories/EducacensoRepository.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Repositories/EducacensoRepository.php b/app/Repositories/EducacensoRepository.php index aa669756bb..4c13f2be54 100644 --- a/app/Repositories/EducacensoRepository.php +++ b/app/Repositories/EducacensoRepository.php @@ -35,13 +35,13 @@ public function getDataForRecord00($school, $year) FROM pmieducar.ano_letivo_modulo WHERE ano_letivo_modulo.ref_ano = :year AND ano_letivo_modulo.ref_ref_cod_escola = e.cod_escola) AS "fimAnoLetivo", j.fantasia AS nome, - COALESCE(ep.cep, ee.cep) AS cep, + ep.cep AS cep, municipio.cod_ibge AS "codigoIbgeMunicipio", distrito.cod_ibge AS "codigoIbgeDistrito", - COALESCE(l.idtlog || l.nome, ee.idtlog || ee.logradouro) AS logradouro, - COALESCE(ep.numero, ee.numero) AS numero, - COALESCE(ep.complemento, ee.complemento) AS complemento, - COALESCE(bairro.nome, ee.bairro) AS bairro, + l.idtlog || l.nome AS logradouro, + ep.numero AS numero, + ep.complemento AS complemento, + bairro.nome AS bairro, (SELECT COALESCE( (SELECT min(fone_pessoa.ddd) FROM cadastro.fone_pessoa From 2b8133f48b1713e90dbafb9dc4d75f058c7a81b6 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Sat, 22 Feb 2020 19:45:20 -0300 Subject: [PATCH 17/17] Version --- composer.json | 2 +- composer.lock | 231 ++++++++++++++++++++++++++------------------------ 2 files changed, 119 insertions(+), 114 deletions(-) diff --git a/composer.json b/composer.json index 7eba68f9a3..c8fc0465e7 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.2.19", + "version": "2.2.20", "keywords": [ "Portabilis", "i-Educar" diff --git a/composer.lock b/composer.lock index 6f23609f70..ac3c3ad11a 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": "b5e759e1f49d4af363d9befde6eb0f9c", + "content-hash": "f21b5bfa32f2e40bb5fb037f4d1f1a94", "packages": [ { "name": "asm89/stack-cors", @@ -60,16 +60,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.133.10", + "version": "3.133.20", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "17e19f58676e418d9b685378a3b8210673443bce" + "reference": "c5f84f9edafb6372dafdbc87cb588772761179ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/17e19f58676e418d9b685378a3b8210673443bce", - "reference": "17e19f58676e418d9b685378a3b8210673443bce", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c5f84f9edafb6372dafdbc87cb588772761179ca", + "reference": "c5f84f9edafb6372dafdbc87cb588772761179ca", "shasum": "" }, "require": { @@ -140,7 +140,7 @@ "s3", "sdk" ], - "time": "2020-02-07T19:17:22+00:00" + "time": "2020-02-21T19:09:49+00:00" }, { "name": "aws/aws-sdk-php-laravel", @@ -1013,16 +1013,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.15", + "version": "2.1.17", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "e834eea5306d85d67de5a05db5882911d5b29357" + "reference": "ade6887fd9bd74177769645ab5c474824f8a418a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/e834eea5306d85d67de5a05db5882911d5b29357", - "reference": "e834eea5306d85d67de5a05db5882911d5b29357", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a", + "reference": "ade6887fd9bd74177769645ab5c474824f8a418a", "shasum": "" }, "require": { @@ -1067,7 +1067,7 @@ "validation", "validator" ], - "time": "2020-01-20T21:40:59+00:00" + "time": "2020-02-13T22:36:52+00:00" }, { "name": "erusev/parsedown", @@ -1117,24 +1117,24 @@ }, { "name": "fideloper/proxy", - "version": "4.2.2", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/fideloper/TrustedProxy.git", - "reference": "790194d5d3da89a713478875d2e2d05855a90a81" + "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/790194d5d3da89a713478875d2e2d05855a90a81", - "reference": "790194d5d3da89a713478875d2e2d05855a90a81", + "url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a", + "reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a", "shasum": "" }, "require": { - "illuminate/contracts": "^5.0|^6.0|^7.0", + "illuminate/contracts": "^5.0|^6.0|^7.0|^8.0", "php": ">=5.4.0" }, "require-dev": { - "illuminate/http": "^5.0|^6.0|^7.0", + "illuminate/http": "^5.0|^6.0|^7.0|^8.0", "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.0" }, @@ -1167,7 +1167,7 @@ "proxy", "trusted proxy" ], - "time": "2019-12-20T13:11:11+00:00" + "time": "2020-02-22T01:51:47+00:00" }, { "name": "google/recaptcha", @@ -1620,16 +1620,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.36", + "version": "v5.8.37", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "ccf857af50897eda43ceaf12e318cf214e0e4e95" + "reference": "ce08aaee3a0b8bb58b459b2decf7f25ba7b10fa4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/ccf857af50897eda43ceaf12e318cf214e0e4e95", - "reference": "ccf857af50897eda43ceaf12e318cf214e0e4e95", + "url": "https://api.github.com/repos/laravel/framework/zipball/ce08aaee3a0b8bb58b459b2decf7f25ba7b10fa4", + "reference": "ce08aaee3a0b8bb58b459b2decf7f25ba7b10fa4", "shasum": "" }, "require": { @@ -1764,20 +1764,20 @@ "framework", "laravel" ], - "time": "2019-12-17T16:00:14+00:00" + "time": "2020-02-14T14:29:11+00:00" }, { "name": "laravel/horizon", - "version": "v3.6.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/laravel/horizon.git", - "reference": "c9b5f033b9d484cdfbc05a3152601b7ade57931d" + "reference": "42f565649fa778a9a2b1c995df932871f89afa35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/horizon/zipball/c9b5f033b9d484cdfbc05a3152601b7ade57931d", - "reference": "c9b5f033b9d484cdfbc05a3152601b7ade57931d", + "url": "https://api.github.com/repos/laravel/horizon/zipball/42f565649fa778a9a2b1c995df932871f89afa35", + "reference": "42f565649fa778a9a2b1c995df932871f89afa35", "shasum": "" }, "require": { @@ -1833,7 +1833,7 @@ "laravel", "queue" ], - "time": "2020-02-04T15:17:47+00:00" + "time": "2020-02-18T19:28:58+00:00" }, { "name": "laravel/tinker", @@ -2444,16 +2444,16 @@ }, { "name": "nesbot/carbon", - "version": "2.29.1", + "version": "2.30.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "e509be5bf2d703390e69e14496d9a1168452b0a2" + "reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e509be5bf2d703390e69e14496d9a1168452b0a2", - "reference": "e509be5bf2d703390e69e14496d9a1168452b0a2", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/912dff66d2690ca66abddb9b291a1df5f371d3b4", + "reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4", "shasum": "" }, "require": { @@ -2510,7 +2510,7 @@ "datetime", "time" ], - "time": "2020-01-21T09:36:43+00:00" + "time": "2020-02-07T15:25:46+00:00" }, { "name": "nikic/php-parser", @@ -3332,16 +3332,16 @@ }, { "name": "ramsey/uuid", - "version": "3.9.2", + "version": "3.9.3", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "7779489a47d443f845271badbdcedfe4df8e06fb" + "reference": "7e1633a6964b48589b142d60542f9ed31bd37a92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/7779489a47d443f845271badbdcedfe4df8e06fb", - "reference": "7779489a47d443f845271badbdcedfe4df8e06fb", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/7e1633a6964b48589b142d60542f9ed31bd37a92", + "reference": "7e1633a6964b48589b142d60542f9ed31bd37a92", "shasum": "" }, "require": { @@ -3415,7 +3415,7 @@ "identifier", "uuid" ], - "time": "2019-12-17T08:18:51+00:00" + "time": "2020-02-21T04:36:14+00:00" }, { "name": "sixlive/dotenv-editor", @@ -4156,16 +4156,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" + "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", - "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", + "reference": "fbdeaec0df06cf3d51c93de80c7eb76e271f5a38", "shasum": "" }, "require": { @@ -4177,7 +4177,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -4210,20 +4210,20 @@ "polyfill", "portable" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36" + "reference": "926832ce51059bb58211b7b2080a88e0c3b5328e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/a019efccc03f1a335af6b4f20c30f5ea8060be36", - "reference": "a019efccc03f1a335af6b4f20c30f5ea8060be36", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/926832ce51059bb58211b7b2080a88e0c3b5328e", + "reference": "926832ce51059bb58211b7b2080a88e0c3b5328e", "shasum": "" }, "require": { @@ -4235,7 +4235,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -4269,26 +4269,26 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46" + "reference": "6842f1a39cf7d580655688069a03dd7cd83d244a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6f9c239e61e1b0c9229a28ff89a812dc449c3d46", - "reference": "6f9c239e61e1b0c9229a28ff89a812dc449c3d46", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/6842f1a39cf7d580655688069a03dd7cd83d244a", + "reference": "6842f1a39cf7d580655688069a03dd7cd83d244a", "shasum": "" }, "require": { "php": ">=5.3.3", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.9" + "symfony/polyfill-php72": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -4296,7 +4296,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -4331,20 +4331,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-17T12:01:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" + "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", - "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/34094cfa9abe1f0f14f48f490772db7a775559f2", + "reference": "34094cfa9abe1f0f14f48f490772db7a775559f2", "shasum": "" }, "require": { @@ -4356,7 +4356,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -4390,20 +4390,20 @@ "portable", "shim" ], - "time": "2019-11-27T14:18:11+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038" + "reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/66fea50f6cb37a35eea048d75a7d99a45b586038", - "reference": "66fea50f6cb37a35eea048d75a7d99a45b586038", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", + "reference": "46ecacf4751dd0dc81e4f6bf01dbf9da1dc1dadf", "shasum": "" }, "require": { @@ -4412,7 +4412,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -4445,20 +4445,20 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f" + "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/4b0e2222c55a25b4541305a053013d5647d3a25f", - "reference": "4b0e2222c55a25b4541305a053013d5647d3a25f", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/5e66a0fa1070bf46bec4bea7962d285108edd675", + "reference": "5e66a0fa1070bf46bec4bea7962d285108edd675", "shasum": "" }, "require": { @@ -4467,7 +4467,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -4503,7 +4503,7 @@ "portable", "shim" ], - "time": "2019-11-27T16:25:15+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/process", @@ -5652,16 +5652,16 @@ }, { "name": "laravel/dusk", - "version": "v5.9.0", + "version": "v5.9.2", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "3e54875a69d2cb7136a56d9889c11eb2988c8eb4" + "reference": "7abf5a7152863f8597a43d640cce3adb6cd8ab3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/3e54875a69d2cb7136a56d9889c11eb2988c8eb4", - "reference": "3e54875a69d2cb7136a56d9889c11eb2988c8eb4", + "url": "https://api.github.com/repos/laravel/dusk/zipball/7abf5a7152863f8597a43d640cce3adb6cd8ab3f", + "reference": "7abf5a7152863f8597a43d640cce3adb6cd8ab3f", "shasum": "" }, "require": { @@ -5671,7 +5671,7 @@ "illuminate/support": "~5.7.0|~5.8.0|^6.0|^7.0", "nesbot/carbon": "^1.20|^2.0", "php": ">=7.1.0", - "php-webdriver/webdriver": "^1.7", + "php-webdriver/webdriver": "^1.8.1", "symfony/console": "^4.0|^5.0", "symfony/finder": "^4.0|^5.0", "symfony/process": "^4.0|^5.0", @@ -5716,20 +5716,20 @@ "testing", "webdriver" ], - "time": "2020-01-28T20:55:30+00:00" + "time": "2020-02-18T19:13:12+00:00" }, { "name": "laravel/telescope", - "version": "v2.1.5", + "version": "v2.1.7", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "29bd5609443e0e822c6692d4c5a8318c07f3c0c6" + "reference": "5aa2a29faebb0f27b2437292237f4e310a60d5ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/29bd5609443e0e822c6692d4c5a8318c07f3c0c6", - "reference": "29bd5609443e0e822c6692d4c5a8318c07f3c0c6", + "url": "https://api.github.com/repos/laravel/telescope/zipball/5aa2a29faebb0f27b2437292237f4e310a60d5ec", + "reference": "5aa2a29faebb0f27b2437292237f4e310a60d5ec", "shasum": "" }, "require": { @@ -5779,7 +5779,7 @@ "laravel", "monitoring" ], - "time": "2020-02-04T15:37:54+00:00" + "time": "2020-02-18T19:37:42+00:00" }, { "name": "maximebf/debugbar", @@ -6225,35 +6225,36 @@ }, { "name": "php-webdriver/webdriver", - "version": "1.7.1", + "version": "1.8.1", "source": { "type": "git", "url": "https://github.com/php-webdriver/php-webdriver.git", - "reference": "e43de70f3c7166169d0f14a374505392734160e5" + "reference": "262ea0d209c292e0330be1041424887bbbffef04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/e43de70f3c7166169d0f14a374505392734160e5", - "reference": "e43de70f3c7166169d0f14a374505392734160e5", + "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/262ea0d209c292e0330be1041424887bbbffef04", + "reference": "262ea0d209c292e0330be1041424887bbbffef04", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", - "ext-mbstring": "*", "ext-zip": "*", "php": "^5.6 || ~7.0", - "symfony/process": "^2.8 || ^3.1 || ^4.0" + "symfony/polyfill-mbstring": "^1.12", + "symfony/process": "^2.8 || ^3.1 || ^4.0 || ^5.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.0", - "jakub-onderka/php-parallel-lint": "^0.9.2", + "jakub-onderka/php-parallel-lint": "^1.0", "php-coveralls/php-coveralls": "^2.0", "php-mock/php-mock-phpunit": "^1.1", "phpunit/phpunit": "^5.7", "sebastian/environment": "^1.3.4 || ^2.0 || ^3.0", - "squizlabs/php_codesniffer": "^2.6", - "symfony/var-dumper": "^3.3 || ^4.0" + "sminnee/phpunit-mock-objects": "^3.4", + "squizlabs/php_codesniffer": "^3.5", + "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0" }, "suggest": { "ext-SimpleXML": "For Firefox profile creation" @@ -6261,27 +6262,31 @@ "type": "library", "extra": { "branch-alias": { - "dev-community": "1.5-dev" + "dev-master": "1.8.x-dev" } }, "autoload": { "psr-4": { "Facebook\\WebDriver\\": "lib/" - } + }, + "files": [ + "lib/Exception/TimeoutException.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache-2.0" + "MIT" ], - "description": "A PHP client for Selenium WebDriver", - "homepage": "https://github.com/facebook/php-webdriver", + "description": "A PHP client for Selenium WebDriver. Previously facebook/webdriver.", + "homepage": "https://github.com/php-webdriver/php-webdriver", "keywords": [ - "facebook", + "Chromedriver", + "geckodriver", "php", "selenium", "webdriver" ], - "time": "2019-06-13T08:02:18+00:00" + "time": "2020-02-17T08:14:38+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -7652,16 +7657,16 @@ }, { "name": "symfony/polyfill-php70", - "version": "v1.13.1", + "version": "v1.14.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "af23c7bb26a73b850840823662dda371484926c4" + "reference": "419c4940024c30ccc033650373a1fe13890d3255" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/af23c7bb26a73b850840823662dda371484926c4", - "reference": "af23c7bb26a73b850840823662dda371484926c4", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/419c4940024c30ccc033650373a1fe13890d3255", + "reference": "419c4940024c30ccc033650373a1fe13890d3255", "shasum": "" }, "require": { @@ -7671,7 +7676,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.13-dev" + "dev-master": "1.14-dev" } }, "autoload": { @@ -7707,7 +7712,7 @@ "portable", "shim" ], - "time": "2019-11-27T13:56:44+00:00" + "time": "2020-01-13T11:15:53+00:00" }, { "name": "symfony/stopwatch", @@ -7801,16 +7806,16 @@ }, { "name": "webmozart/assert", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "573381c0a64f155a0d9a23f4b0c797194805b925" + "reference": "aed98a490f9a8f78468232db345ab9cf606cf598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925", - "reference": "573381c0a64f155a0d9a23f4b0c797194805b925", + "url": "https://api.github.com/repos/webmozart/assert/zipball/aed98a490f9a8f78468232db345ab9cf606cf598", + "reference": "aed98a490f9a8f78468232db345ab9cf606cf598", "shasum": "" }, "require": { @@ -7845,7 +7850,7 @@ "check", "validate" ], - "time": "2019-11-24T13:36:37+00:00" + "time": "2020-02-14T12:15:55+00:00" } ], "aliases": [],