Download as
Browse Code »

Commit ae70623b46f69f53fb6c74967c468baa039a3c0b

Authored by Eder Soares
Committed by GitHub
2 parents eb5ad58c 7c8ee87a
Exists in 2.9 and in 7 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 2.8

Merge pull request #672 from portabilis/portabilis-patch-2019-10-18 

[2.2] Portabilis patch 18/10/2019
Showing 8 changed files with 128 additions and 29 deletions   Show diff stats
composer.json
  Diff comments   View file @ae70623
... ... @@ -3,7 +3,7 @@
3 3 "description": "Software livre de gestão escolar",
4 4 "type": "project",
5 5 "license": "GPL-2.0-or-later",
6   - "version": "2.2.9",
  6 + "version": "2.2.10",
7 7 "keywords": [
8 8 "Portabilis",
9 9 "i-Educar"
... ...
composer.lock
  Diff comments   View file @ae70623
... ... @@ -4,20 +4,20 @@
4 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5 5 "This file is @generated automatically"
6 6 ],
7   - "content-hash": "b03e79b5d95d52de66fbe631b2bc6f71",
  7 + "content-hash": "b809688eaf9970067bfc1abc85b1a398",
8 8 "packages": [
9 9 {
10 10 "name": "aws/aws-sdk-php",
11   - "version": "3.112.19",
  11 + "version": "3.112.25",
12 12 "source": {
13 13 "type": "git",
14 14 "url": "https://github.com/aws/aws-sdk-php.git",
15   - "reference": "8e69a518ff058612b94d328c2cde644621a4c0cc"
  15 + "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749"
16 16 },
17 17 "dist": {
18 18 "type": "zip",
19   - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8e69a518ff058612b94d328c2cde644621a4c0cc",
20   - "reference": "8e69a518ff058612b94d328c2cde644621a4c0cc",
  19 + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f91e264e3cbf8ced5c93f5f786c9e0f079926749",
  20 + "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749",
21 21 "shasum": ""
22 22 },
23 23 "require": {
... ... @@ -87,7 +87,7 @@
87 87 "s3",
88 88 "sdk"
89 89 ],
90   - "time": "2019-10-10T18:23:11+00:00"
  90 + "time": "2019-10-18T18:08:55+00:00"
91 91 },
92 92 {
93 93 "name": "cocur/slugify",
... ... @@ -1522,16 +1522,16 @@
1522 1522 },
1523 1523 {
1524 1524 "name": "league/flysystem",
1525   - "version": "1.0.55",
  1525 + "version": "1.0.57",
1526 1526 "source": {
1527 1527 "type": "git",
1528 1528 "url": "https://github.com/thephpleague/flysystem.git",
1529   - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6"
  1529 + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a"
1530 1530 },
1531 1531 "dist": {
1532 1532 "type": "zip",
1533   - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/33c91155537c6dc899eacdc54a13ac6303f156e6",
1534   - "reference": "33c91155537c6dc899eacdc54a13ac6303f156e6",
  1533 + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
  1534 + "reference": "0e9db7f0b96b9f12dcf6f65bc34b72b1a30ea55a",
1535 1535 "shasum": ""
1536 1536 },
1537 1537 "require": {
... ... @@ -1602,7 +1602,7 @@
1602 1602 "sftp",
1603 1603 "storage"
1604 1604 ],
1605   - "time": "2019-08-24T11:17:19+00:00"
  1605 + "time": "2019-10-16T21:01:05+00:00"
1606 1606 },
1607 1607 {
1608 1608 "name": "league/flysystem-aws-s3-v3",
... ... @@ -2065,16 +2065,16 @@
2065 2065 },
2066 2066 {
2067 2067 "name": "nesbot/carbon",
2068   - "version": "2.25.1",
  2068 + "version": "2.25.2",
2069 2069 "source": {
2070 2070 "type": "git",
2071 2071 "url": "https://github.com/briannesbitt/Carbon.git",
2072   - "reference": "d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1"
  2072 + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f"
2073 2073 },
2074 2074 "dist": {
2075 2075 "type": "zip",
2076   - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1",
2077   - "reference": "d59c6cea9c4a3547bb6c0dfec451319abdaa4fb1",
  2076 + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f",
  2077 + "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f",
2078 2078 "shasum": ""
2079 2079 },
2080 2080 "require": {
... ... @@ -2128,7 +2128,7 @@
2128 2128 "datetime",
2129 2129 "time"
2130 2130 ],
2131   - "time": "2019-10-05T15:52:23+00:00"
  2131 + "time": "2019-10-14T14:18:59+00:00"
2132 2132 },
2133 2133 {
2134 2134 "name": "nikic/php-parser",
... ... @@ -5337,25 +5337,25 @@
5337 5337 },
5338 5338 {
5339 5339 "name": "maximebf/debugbar",
5340   - "version": "v1.15.0",
  5340 + "version": "v1.15.1",
5341 5341 "source": {
5342 5342 "type": "git",
5343 5343 "url": "https://github.com/maximebf/php-debugbar.git",
5344   - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07"
  5344 + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
5345 5345 },
5346 5346 "dist": {
5347 5347 "type": "zip",
5348   - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
5349   - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07",
  5348 + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
  5349 + "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
5350 5350 "shasum": ""
5351 5351 },
5352 5352 "require": {
5353   - "php": ">=5.3.0",
  5353 + "php": ">=5.6",
5354 5354 "psr/log": "^1.0",
5355   - "symfony/var-dumper": "^2.6|^3.0|^4.0"
  5355 + "symfony/var-dumper": "^2.6|^3|^4"
5356 5356 },
5357 5357 "require-dev": {
5358   - "phpunit/phpunit": "^4.0|^5.0"
  5358 + "phpunit/phpunit": "^5"
5359 5359 },
5360 5360 "suggest": {
5361 5361 "kriswallsmith/assetic": "The best way to manage assets",
... ... @@ -5365,7 +5365,7 @@
5365 5365 "type": "library",
5366 5366 "extra": {
5367 5367 "branch-alias": {
5368   - "dev-master": "1.14-dev"
  5368 + "dev-master": "1.15-dev"
5369 5369 }
5370 5370 },
5371 5371 "autoload": {
... ... @@ -5394,7 +5394,7 @@
5394 5394 "debug",
5395 5395 "debugbar"
5396 5396 ],
5397   - "time": "2017-12-15T11:13:46+00:00"
  5397 + "time": "2019-09-24T14:55:42+00:00"
5398 5398 },
5399 5399 {
5400 5400 "name": "mockery/mockery",
... ...
config/assets.php
  Diff comments   View file @ae70623
... ... @@ -14,7 +14,7 @@ return [
14 14 |
15 15 */
16 16  
17   - 'version' => '0.0.34',
  17 + 'version' => '0.0.35',
18 18  
19 19 /*
20 20 |--------------------------------------------------------------------------
... ...
database/migrations/2019_10_10_151206_update_higher_education_name.php 0 → 100755
  Diff comments   View file @ae70623
... ... @@ -0,0 +1,55 @@
  1 +<?php
  2 +
  3 +use Illuminate\Support\Facades\Schema;
  4 +use Illuminate\Database\Schema\Blueprint;
  5 +use Illuminate\Database\Migrations\Migration;
  6 +
  7 +class UpdateHigherEducationName extends Migration
  8 +{
  9 + /**
  10 + * Run the migrations.
  11 + *
  12 + * @return void
  13 + */
  14 + public function up()
  15 + {
  16 + DB::update("
  17 + UPDATE modules.educacenso_curso_superior
  18 + SET nome = CASE curso_id
  19 + WHEN '142C01' THEN 'Pedagogia (Ciências da Educação)'
  20 + WHEN '145F01' THEN 'Ciências Biológicas'
  21 + WHEN '145F02' THEN 'Ciências Naturais'
  22 + WHEN '145F05' THEN 'Educação Religiosa'
  23 + WHEN '145F08' THEN 'Filosofia'
  24 + WHEN '145F09' THEN 'Física'
  25 + WHEN '145F10' THEN 'Geografia'
  26 + WHEN '145F11' THEN 'História'
  27 + WHEN '145F15' THEN 'Letras - Língua Portuguesa'
  28 + WHEN '145F18' THEN 'Matemática'
  29 + WHEN '145F21' THEN 'Química'
  30 + WHEN '145F24' THEN 'Ciências Sociais'
  31 + WHEN '146P01' THEN 'Licenciatura para a Educação Profissional e Tecnológica'
  32 + WHEN '210A01' THEN 'Bacharelado Interdisciplinar em Artes'
  33 + WHEN '220H01' THEN 'Bacharelado Interdisciplinar Ciências Humanas'
  34 + WHEN '314E02' THEN 'Ciências Econômicas'
  35 + WHEN '623E01' THEN 'Engenharia Florestal'
  36 + WHEN '720S01' THEN 'Bacharelado Interdisciplinar Ciências da Saúde'
  37 + END
  38 + WHERE curso_id IN (
  39 + '142C01', '145F01', '145F02', '145F05', '145F08', '145F09',
  40 + '145F10', '145F11', '145F18', '145F21', '145F24', '146P01',
  41 + '210A01', '220H01', '314E02', '623E01', '720S01', '145F15'
  42 + )
  43 + ");
  44 + }
  45 +
  46 + /**
  47 + * Reverse the migrations.
  48 + *
  49 + * @return void
  50 + */
  51 + public function down()
  52 + {
  53 + //
  54 + }
  55 +}
... ...
ieducar/intranet/educar_escola_cad.php
  Diff comments   View file @ae70623
... ... @@ -115,6 +115,8 @@ class indice extends clsCadastro
115 115 public $situacao_funcionamento;
116 116 public $dependencia_administrativa;
117 117 public $orgao_vinculado_escola;
  118 + public $latitude;
  119 + public $longitude;
118 120 public $regulamentacao;
119 121 public $gestor_id;
120 122 public $cargo_gestor;
... ... @@ -866,6 +868,9 @@ class indice extends clsCadastro
866 868 $this->campoOculto("passou", $this->passou);
867 869 }
868 870  
  871 + $this->inputsHelper()->numeric('latitude', array('max_length' => '20', 'size' => '20', 'required' => false, 'value' => $this->latitude, 'label_hint' => 'São aceito somente números, ponto "." e hífen "-"'));
  872 + $this->inputsHelper()->numeric('longitude', array('max_length' => '20', 'size' => '20', 'required' => false, 'value' => $this->longitude, 'label_hint' => 'São aceito somente números, ponto "." e hífen "-"'));
  873 +
869 874 $this->campoCheck("bloquear_lancamento_diario_anos_letivos_encerrados", "Bloquear lançamento no diário para anos letivos encerrados", $this->bloquear_lancamento_diario_anos_letivos_encerrados);
870 875 $this->campoCheck("utiliza_regra_diferenciada", "Utiliza regra diferenciada", dbBool($this->utiliza_regra_diferenciada), '', false, false, false, 'Se marcado, utilizará regra de avaliação diferenciada informada na Série');
871 876  
... ... @@ -1696,6 +1701,8 @@ class indice extends clsCadastro
1696 1701 $obj->situacao_funcionamento = $this->situacao_funcionamento;
1697 1702 $obj->dependencia_administrativa = $this->dependencia_administrativa;
1698 1703 $obj->orgao_vinculado_escola = $orgao_vinculado_escola;
  1704 + $obj->latitude = $this->latitude;
  1705 + $obj->longitude = $this->longitude;
1699 1706 $obj->regulamentacao = $this->regulamentacao;
1700 1707 $obj->ref_idpes_gestor = $this->gestor_id;
1701 1708 $obj->cargo_gestor = $this->cargo_gestor;
... ... @@ -1860,6 +1867,8 @@ class indice extends clsCadastro
1860 1867 $obj = new clsPmieducarEscola(null, $this->pessoa_logada, null, $this->ref_cod_instituicao, $this->zona_localizacao, $this->ref_cod_escola_rede_ensino, null, $this->sigla, null, null, 1, null, $this->bloquear_lancamento_diario_anos_letivos_encerrados, $this->utiliza_regra_diferenciada);
1861 1868 $obj->dependencia_administrativa = $this->dependencia_administrativa;
1862 1869 $obj->orgao_vinculado_escola = $orgao_vinculado_escola;
  1870 + $obj->latitude = $this->latitude;
  1871 + $obj->longitude = $this->longitude;
1863 1872 $obj->regulamentacao = $this->regulamentacao;
1864 1873 $obj->situacao_funcionamento = $this->situacao_funcionamento;
1865 1874 $obj->ref_idpes_gestor = $this->gestor_id;
... ... @@ -2064,6 +2073,8 @@ class indice extends clsCadastro
2064 2073 $obj = new clsPmieducarEscola($this->cod_escola, null, $this->pessoa_logada, $this->ref_cod_instituicao, $this->zona_localizacao, $this->ref_cod_escola_rede_ensino, $this->ref_idpes, $this->sigla, null, null, 1, $this->bloquear_lancamento_diario_anos_letivos_encerrados, $this->utiliza_regra_diferenciada);
2065 2074 $obj->dependencia_administrativa = $this->dependencia_administrativa;
2066 2075 $obj->orgao_vinculado_escola = $orgao_vinculado_escola;
  2076 + $obj->latitude = $this->latitude;
  2077 + $obj->longitude = $this->longitude;
2067 2078 $obj->regulamentacao = $this->regulamentacao;
2068 2079 $obj->situacao_funcionamento = $this->situacao_funcionamento;
2069 2080 $obj->ref_idpes_gestor = $this->gestor_id;
... ... @@ -2157,6 +2168,8 @@ class indice extends clsCadastro
2157 2168 $obj->situacao_funcionamento = $this->situacao_funcionamento;
2158 2169 $obj->dependencia_administrativa = $this->dependencia_administrativa;
2159 2170 $obj->orgao_vinculado_escola = $orgao_vinculado_escola;
  2171 + $obj->latitude = $this->latitude;
  2172 + $obj->longitude = $this->longitude;
2160 2173 $obj->regulamentacao = $this->regulamentacao;
2161 2174 $obj->ref_idpes_gestor = $this->gestor_id;
2162 2175 $obj->cargo_gestor = $this->cargo_gestor;
... ...
ieducar/intranet/styles/custom.css
  Diff comments   View file @ae70623
... ... @@ -1314,3 +1314,7 @@ a.btn-detalhes {
1314 1314 cursor: pointer;
1315 1315 white-space: nowrap;
1316 1316 }
  1317 +
  1318 +.matricula-situacao-deslocamento {
  1319 + color: #FF6600;
  1320 +}
... ...
ieducar/lib/App/Model/IedFinder.php
  Diff comments   View file @ae70623
... ... @@ -3,6 +3,7 @@
3 3 use App\Models\LegacyDiscipline;
4 4 use App\Models\LegacyDisciplineAcademicYear;
5 5 use App\Models\LegacySchool;
  6 +use App\Models\LegacySchoolClass;
6 7 use iEducar\Modules\Enrollments\Exceptions\StudentNotEnrolledInSchoolClass;
7 8 use iEducar\Modules\AcademicYear\Exceptions\DisciplineNotLinkedToRegistrationException;
8 9 use iEducar\Modules\EvaluationRules\Exceptions\EvaluationRuleNotDefinedInLevel;
... ... @@ -671,11 +672,13 @@ class App_Model_IedFinder extends CoreExt_Entity
671 672 $where['componente_curricular_id'] = $componenteCurricularId;
672 673 }
673 674  
  675 + $disciplinaDispensada = self::disciplinaDispensadaDaTurma($turma);
  676 +
674 677 $componentesTurma = $mapper->findAll([], $where);
675 678  
676 679 // Não existem componentes específicos para a turma
677 680 if (0 == count($componentesTurma)) {
678   - return self::getEscolaSerieDisciplina(
  681 + $componentesTurma = self::getEscolaSerieDisciplina(
679 682 $serieId,
680 683 $escola,
681 684 $componenteMapper,
... ... @@ -684,6 +687,9 @@ class App_Model_IedFinder extends CoreExt_Entity
684 687 $trazerDetalhes,
685 688 $ano
686 689 );
  690 +
  691 + unset($componentesTurma[$disciplinaDispensada]);
  692 + return $componentesTurma;
687 693 }
688 694  
689 695 $componentes = [];
... ... @@ -1101,6 +1107,27 @@ class App_Model_IedFinder extends CoreExt_Entity
1101 1107 return $disciplinasDispensa;
1102 1108 }
1103 1109  
  1110 + public static function disciplinaDispensadaDaTurma($codTurma)
  1111 + {
  1112 + if (!$codTurma) {
  1113 + return;
  1114 + }
  1115 +
  1116 + $discipline = Cache::store('array')->remember("disciplinaDispensadaDaTurma:{$codTurma}", now()->addMinute(), function () use ($codTurma) {
  1117 + $discipline = LegacySchoolClass::query()->find($codTurma)->ref_cod_disciplina_dispensada ?? null;
  1118 +
  1119 + // Caso não exista a disciplina, armazena a string 'null'
  1120 + return $discipline ?: 'null';
  1121 + });
  1122 +
  1123 + // Se o retorno é uma string 'null', sabemos o que o valor real é null
  1124 + if ($discipline === 'null') {
  1125 + return null;
  1126 + }
  1127 +
  1128 + return $discipline;
  1129 + }
  1130 +
1104 1131 public static function validaDispensaPorMatricula(
1105 1132 $codMatricula,
1106 1133 $codSerie,
... ...
ieducar/modules/Avaliacao/Assets/Javascripts/Diario.js
  Diff comments   View file @ae70623
... ... @@ -1088,7 +1088,7 @@ function handleSearch($resultTable, dataResponse) {
1088 1088 .attr('id', 'situacao-matricula-' + value.matricula_id)
1089 1089 .data('matricula_id', value.matricula_id)
1090 1090 .addClass('center')
1091   - .css('color', '#FF6600')
  1091 + .addClass('matricula-situacao-deslocamento')
1092 1092 .html(value.situacao_deslocamento)
1093 1093 .appendTo($linha);
1094 1094  
... ...