Download as
Browse Code »

Commit 77441421d504c8b8bf8e72b6af4476e24552b120

Authored by Eder Soares
Committed by GitHub
2 parents 251f1151 eadc7bb1
Exists in 2.8 and in 7 other branches 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Merge pull request #593 from portabilis/portabilis-patch-2019-06-08 

[2.1] Portabilis patch 08/06/2019
Showing 15 changed files with 210 additions and 134 deletions   Show diff stats
app/Models/Educacenso/Registro10.php
  Diff comments   View file @7744142
... ... @@ -855,9 +855,9 @@ class Registro10 implements RegistroEducacenso
855 855 /**
856 856 * @return bool
857 857 */
858   - public function existeDependencia()
  858 + public function naoPossuiDependencias()
859 859 {
860   - return !empty(array_filter(
  860 + return empty(array_filter(
861 861 [
862 862 array_filter($this->salasGerais),
863 863 array_filter($this->salasFuncionais),
... ...
app/Repositories/EducacensoRepository.php
  Diff comments   View file @7744142
... ... @@ -538,7 +538,7 @@ SQL;
538 538 {
539 539 $sql = <<<'SQL'
540 540 SELECT '60' AS registro,
541   - educacenso_cod_escola.cod_escola "inepEscola",
  541 + educacenso_cod_escola.cod_escola_inep "inepEscola",
542 542 aluno.ref_idpes "codigoPessoa",
543 543 educacenso_cod_aluno.cod_aluno_inep "inepAluno",
544 544 turma.cod_turma "codigoTurma",
... ... @@ -648,10 +648,10 @@ SQL;
648 648 pessoa_mae.nome AS "filiacao1",
649 649 pessoa_pai.nome AS "filiacao2",
650 650 CASE WHEN fisica.sexo = 'M' THEN 1 ELSE 2 END AS "sexo",
651   - fisica_raca.ref_cod_raca AS "raca",
  651 + raca.raca_educacenso AS "raca",
652 652 fisica.nacionalidade AS "nacionalidade",
653   - CASE WHEN fisica.nacionalidade = 3 THEN fisica.idpais_estrangeiro ELSE 76 END AS "paisNacionalidade",
654   - fisica.idmun_nascimento AS "municipioNascimento",
  653 + CASE WHEN fisica.nacionalidade = 3 THEN pais.cod_ibge ELSE 76 END AS "paisNacionalidade",
  654 + municipio_nascimento.cod_ibge AS "municipioNascimento",
655 655 CASE WHEN
656 656 true = (SELECT true FROM cadastro.fisica_deficiencia WHERE fisica_deficiencia.ref_idpes = fisica.idpes LIMIT 1) THEN 1
657 657 ELSE 0 END
... ... @@ -679,10 +679,12 @@ SQL;
679 679 FROM cadastro.fisica
680 680 JOIN cadastro.pessoa ON pessoa.idpes = fisica.idpes
681 681 LEFT JOIN cadastro.fisica_raca ON fisica_raca.ref_idpes = fisica.idpes
  682 + LEFT JOIN cadastro.raca ON (raca.cod_raca = fisica_raca.ref_cod_raca)
682 683 LEFT JOIN cadastro.pessoa as pessoa_mae
683 684 ON fisica.idpes_mae = pessoa_mae.idpes
684 685 LEFT JOIN cadastro.pessoa as pessoa_pai
685 686 ON fisica.idpes_pai = pessoa_pai.idpes
  687 + LEFT JOIN public.municipio municipio_nascimento ON municipio_nascimento.idmun = fisica.idmun_nascimento
686 688 LEFT JOIN cadastro.endereco_pessoa ON endereco_pessoa.idpes = pessoa.idpes
687 689 LEFT JOIN public.logradouro ON logradouro.idlog = endereco_pessoa.idlog
688 690 LEFT JOIN public.municipio ON municipio.idmun = logradouro.idmun
... ... @@ -799,7 +801,7 @@ SQL;
799 801 (ARRAY[12] <@ aluno.recursos_prova_inep)::INT "recursoLinguaPortuguesaSegundaLingua",
800 802 (ARRAY[13] <@ aluno.recursos_prova_inep)::INT "recursoVideoLibras",
801 803 (ARRAY[9] <@ aluno.recursos_prova_inep)::INT "recursoBraile",
802   - (aluno.recursos_prova_inep IS NOT NULL)::INT "recursoNenhum",
  804 + (ARRAY[14] <@ aluno.recursos_prova_inep)::INT "recursoNenhum",
803 805 fisica.nis_pis_pasep AS "nis",
804 806 documento.certidao_nascimento AS "certidaoNascimento",
805 807 aluno.justificativa_falta_documentacao AS "justificativaFaltaDocumentacao"
... ...
composer.json
  Diff comments   View file @7744142
... ... @@ -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.1.14",
  6 + "version": "2.1.15",
7 7 "keywords": [
8 8 "Portabilis",
9 9 "i-Educar"
... ...
composer.lock
  Diff comments   View file @7744142
... ... @@ -4,7 +4,7 @@
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": "fbae75dc661848ff4657a50f61c4c05e",
  7 + "content-hash": "1bd1572140bf25351346f05438da486c",
8 8 "packages": [
9 9 {
10 10 "name": "cocur/slugify",
... ... @@ -507,21 +507,24 @@
507 507 },
508 508 {
509 509 "name": "doctrine/lexer",
510   - "version": "v1.0.1",
  510 + "version": "1.0.2",
511 511 "source": {
512 512 "type": "git",
513 513 "url": "https://github.com/doctrine/lexer.git",
514   - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
  514 + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
515 515 },
516 516 "dist": {
517 517 "type": "zip",
518   - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
519   - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
  518 + "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
  519 + "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
520 520 "shasum": ""
521 521 },
522 522 "require": {
523 523 "php": ">=5.3.2"
524 524 },
  525 + "require-dev": {
  526 + "phpunit/phpunit": "^4.5"
  527 + },
525 528 "type": "library",
526 529 "extra": {
527 530 "branch-alias": {
... ... @@ -529,8 +532,8 @@
529 532 }
530 533 },
531 534 "autoload": {
532   - "psr-0": {
533   - "Doctrine\\Common\\Lexer\\": "lib/"
  535 + "psr-4": {
  536 + "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
534 537 }
535 538 },
536 539 "notification-url": "https://packagist.org/downloads/",
... ... @@ -551,13 +554,16 @@
551 554 "email": "schmittjoh@gmail.com"
552 555 }
553 556 ],
554   - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
555   - "homepage": "http://www.doctrine-project.org",
  557 + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
  558 + "homepage": "https://www.doctrine-project.org/projects/lexer.html",
556 559 "keywords": [
  560 + "annotations",
  561 + "docblock",
557 562 "lexer",
558   - "parser"
  563 + "parser",
  564 + "php"
559 565 ],
560   - "time": "2014-09-09T13:34:57+00:00"
  566 + "time": "2019-06-08T11:03:04+00:00"
561 567 },
562 568 {
563 569 "name": "dragonmantank/cron-expression",
... ... @@ -1214,16 +1220,16 @@
1214 1220 },
1215 1221 {
1216 1222 "name": "kylekatarnls/update-helper",
1217   - "version": "1.1.0",
  1223 + "version": "1.1.1",
1218 1224 "source": {
1219 1225 "type": "git",
1220 1226 "url": "https://github.com/kylekatarnls/update-helper.git",
1221   - "reference": "fbfa94c0f196d4718ce3c1032e9c4b34140e69d3"
  1227 + "reference": "b34a46d7f5ec1795b4a15ac9d46b884377262df9"
1222 1228 },
1223 1229 "dist": {
1224 1230 "type": "zip",
1225   - "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/fbfa94c0f196d4718ce3c1032e9c4b34140e69d3",
1226   - "reference": "fbfa94c0f196d4718ce3c1032e9c4b34140e69d3",
  1231 + "url": "https://api.github.com/repos/kylekatarnls/update-helper/zipball/b34a46d7f5ec1795b4a15ac9d46b884377262df9",
  1232 + "reference": "b34a46d7f5ec1795b4a15ac9d46b884377262df9",
1227 1233 "shasum": ""
1228 1234 },
1229 1235 "require": {
... ... @@ -1255,7 +1261,7 @@
1255 1261 }
1256 1262 ],
1257 1263 "description": "Update helper",
1258   - "time": "2019-05-30T21:26:08+00:00"
  1264 + "time": "2019-06-05T08:34:23+00:00"
1259 1265 },
1260 1266 {
1261 1267 "name": "laravel/framework",
... ... @@ -2032,16 +2038,16 @@
2032 2038 },
2033 2039 {
2034 2040 "name": "nesbot/carbon",
2035   - "version": "1.38.2",
  2041 + "version": "1.38.4",
2036 2042 "source": {
2037 2043 "type": "git",
2038 2044 "url": "https://github.com/briannesbitt/Carbon.git",
2039   - "reference": "7621621f76c99f01318313f576baea22edd86367"
  2045 + "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad"
2040 2046 },
2041 2047 "dist": {
2042 2048 "type": "zip",
2043   - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7621621f76c99f01318313f576baea22edd86367",
2044   - "reference": "7621621f76c99f01318313f576baea22edd86367",
  2049 + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/8dd4172bfe1784952c4d58c4db725d183b1c23ad",
  2050 + "reference": "8dd4172bfe1784952c4d58c4db725d183b1c23ad",
2045 2051 "shasum": ""
2046 2052 },
2047 2053 "require": {
... ... @@ -2089,7 +2095,7 @@
2089 2095 "datetime",
2090 2096 "time"
2091 2097 ],
2092   - "time": "2019-05-30T22:56:55+00:00"
  2098 + "time": "2019-06-03T15:41:40+00:00"
2093 2099 },
2094 2100 {
2095 2101 "name": "nexmo/client",
... ... @@ -2192,16 +2198,16 @@
2192 2198 },
2193 2199 {
2194 2200 "name": "opis/closure",
2195   - "version": "3.2.0",
  2201 + "version": "3.3.0",
2196 2202 "source": {
2197 2203 "type": "git",
2198 2204 "url": "https://github.com/opis/closure.git",
2199   - "reference": "09b4389715a7eec100176ea58286649181753508"
  2205 + "reference": "f846725591203098246276b2e7b9e8b7814c4965"
2200 2206 },
2201 2207 "dist": {
2202 2208 "type": "zip",
2203   - "url": "https://api.github.com/repos/opis/closure/zipball/09b4389715a7eec100176ea58286649181753508",
2204   - "reference": "09b4389715a7eec100176ea58286649181753508",
  2209 + "url": "https://api.github.com/repos/opis/closure/zipball/f846725591203098246276b2e7b9e8b7814c4965",
  2210 + "reference": "f846725591203098246276b2e7b9e8b7814c4965",
2205 2211 "shasum": ""
2206 2212 },
2207 2213 "require": {
... ... @@ -2209,12 +2215,12 @@
2209 2215 },
2210 2216 "require-dev": {
2211 2217 "jeremeamia/superclosure": "^2.0",
2212   - "phpunit/phpunit": "^4.0|^5.0|^6.0|^7.0"
  2218 + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
2213 2219 },
2214 2220 "type": "library",
2215 2221 "extra": {
2216 2222 "branch-alias": {
2217   - "dev-master": "3.2.x-dev"
  2223 + "dev-master": "3.3.x-dev"
2218 2224 }
2219 2225 },
2220 2226 "autoload": {
... ... @@ -2249,7 +2255,7 @@
2249 2255 "serialization",
2250 2256 "serialize"
2251 2257 ],
2252   - "time": "2019-05-05T12:50:25+00:00"
  2258 + "time": "2019-05-31T20:04:32+00:00"
2253 2259 },
2254 2260 {
2255 2261 "name": "paragonie/random_compat",
... ... @@ -3265,16 +3271,16 @@
3265 3271 },
3266 3272 {
3267 3273 "name": "symfony/console",
3268   - "version": "v4.3.0",
  3274 + "version": "v4.3.1",
3269 3275 "source": {
3270 3276 "type": "git",
3271 3277 "url": "https://github.com/symfony/console.git",
3272   - "reference": "707b619d2c3bedf0224d56f95f77dabc60102305"
  3278 + "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64"
3273 3279 },
3274 3280 "dist": {
3275 3281 "type": "zip",
3276   - "url": "https://api.github.com/repos/symfony/console/zipball/707b619d2c3bedf0224d56f95f77dabc60102305",
3277   - "reference": "707b619d2c3bedf0224d56f95f77dabc60102305",
  3282 + "url": "https://api.github.com/repos/symfony/console/zipball/d50bbeeb0e17e6dd4124ea391eff235e932cbf64",
  3283 + "reference": "d50bbeeb0e17e6dd4124ea391eff235e932cbf64",
3278 3284 "shasum": ""
3279 3285 },
3280 3286 "require": {
... ... @@ -3336,11 +3342,11 @@
3336 3342 ],
3337 3343 "description": "Symfony Console Component",
3338 3344 "homepage": "https://symfony.com",
3339   - "time": "2019-05-27T08:16:38+00:00"
  3345 + "time": "2019-06-05T13:25:51+00:00"
3340 3346 },
3341 3347 {
3342 3348 "name": "symfony/css-selector",
3343   - "version": "v4.3.0",
  3349 + "version": "v4.3.1",
3344 3350 "source": {
3345 3351 "type": "git",
3346 3352 "url": "https://github.com/symfony/css-selector.git",
... ... @@ -3393,16 +3399,16 @@
3393 3399 },
3394 3400 {
3395 3401 "name": "symfony/debug",
3396   - "version": "v4.3.0",
  3402 + "version": "v4.3.1",
3397 3403 "source": {
3398 3404 "type": "git",
3399 3405 "url": "https://github.com/symfony/debug.git",
3400   - "reference": "97cde06d798f1326857090bc1b7c8f9d225c3dcb"
  3406 + "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6"
3401 3407 },
3402 3408 "dist": {
3403 3409 "type": "zip",
3404   - "url": "https://api.github.com/repos/symfony/debug/zipball/97cde06d798f1326857090bc1b7c8f9d225c3dcb",
3405   - "reference": "97cde06d798f1326857090bc1b7c8f9d225c3dcb",
  3410 + "url": "https://api.github.com/repos/symfony/debug/zipball/4e025104f1f9adb1f7a2d14fb102c9986d6e97c6",
  3411 + "reference": "4e025104f1f9adb1f7a2d14fb102c9986d6e97c6",
3406 3412 "shasum": ""
3407 3413 },
3408 3414 "require": {
... ... @@ -3445,20 +3451,20 @@
3445 3451 ],
3446 3452 "description": "Symfony Debug Component",
3447 3453 "homepage": "https://symfony.com",
3448   - "time": "2019-05-20T16:16:12+00:00"
  3454 + "time": "2019-05-30T16:10:05+00:00"
3449 3455 },
3450 3456 {
3451 3457 "name": "symfony/event-dispatcher",
3452   - "version": "v4.3.0",
  3458 + "version": "v4.3.1",
3453 3459 "source": {
3454 3460 "type": "git",
3455 3461 "url": "https://github.com/symfony/event-dispatcher.git",
3456   - "reference": "c71314cd3b9420b732e1526f33a24eff5430b5b3"
  3462 + "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f"
3457 3463 },
3458 3464 "dist": {
3459 3465 "type": "zip",
3460   - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c71314cd3b9420b732e1526f33a24eff5430b5b3",
3461   - "reference": "c71314cd3b9420b732e1526f33a24eff5430b5b3",
  3466 + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4e6c670af81c4fb0b6c08b035530a9915d0b691f",
  3467 + "reference": "4e6c670af81c4fb0b6c08b035530a9915d0b691f",
3462 3468 "shasum": ""
3463 3469 },
3464 3470 "require": {
... ... @@ -3515,7 +3521,7 @@
3515 3521 ],
3516 3522 "description": "Symfony EventDispatcher Component",
3517 3523 "homepage": "https://symfony.com",
3518   - "time": "2019-05-28T07:50:59+00:00"
  3524 + "time": "2019-05-30T16:10:05+00:00"
3519 3525 },
3520 3526 {
3521 3527 "name": "symfony/event-dispatcher-contracts",
... ... @@ -3577,7 +3583,7 @@
3577 3583 },
3578 3584 {
3579 3585 "name": "symfony/finder",
3580   - "version": "v4.3.0",
  3586 + "version": "v4.3.1",
3581 3587 "source": {
3582 3588 "type": "git",
3583 3589 "url": "https://github.com/symfony/finder.git",
... ... @@ -3626,16 +3632,16 @@
3626 3632 },
3627 3633 {
3628 3634 "name": "symfony/http-foundation",
3629   - "version": "v4.3.0",
  3635 + "version": "v4.3.1",
3630 3636 "source": {
3631 3637 "type": "git",
3632 3638 "url": "https://github.com/symfony/http-foundation.git",
3633   - "reference": "e8da078912bed1339f046c3a9488a5cbd0605971"
  3639 + "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9"
3634 3640 },
3635 3641 "dist": {
3636 3642 "type": "zip",
3637   - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e8da078912bed1339f046c3a9488a5cbd0605971",
3638   - "reference": "e8da078912bed1339f046c3a9488a5cbd0605971",
  3643 + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b7e4945dd9b277cd24e93566e4da0a87956392a9",
  3644 + "reference": "b7e4945dd9b277cd24e93566e4da0a87956392a9",
3639 3645 "shasum": ""
3640 3646 },
3641 3647 "require": {
... ... @@ -3677,20 +3683,20 @@
3677 3683 ],
3678 3684 "description": "Symfony HttpFoundation Component",
3679 3685 "homepage": "https://symfony.com",
3680   - "time": "2019-05-29T18:10:42+00:00"
  3686 + "time": "2019-06-06T10:05:02+00:00"
3681 3687 },
3682 3688 {
3683 3689 "name": "symfony/http-kernel",
3684   - "version": "v4.3.0",
  3690 + "version": "v4.3.1",
3685 3691 "source": {
3686 3692 "type": "git",
3687 3693 "url": "https://github.com/symfony/http-kernel.git",
3688   - "reference": "b4ce396bdce518978a17324d3d39d61058d039e6"
  3694 + "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429"
3689 3695 },
3690 3696 "dist": {
3691 3697 "type": "zip",
3692   - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b4ce396bdce518978a17324d3d39d61058d039e6",
3693   - "reference": "b4ce396bdce518978a17324d3d39d61058d039e6",
  3698 + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/738ad561cd6a8d1c44ee1da941b2e628e264c429",
  3699 + "reference": "738ad561cd6a8d1c44ee1da941b2e628e264c429",
3694 3700 "shasum": ""
3695 3701 },
3696 3702 "require": {
... ... @@ -3769,20 +3775,20 @@
3769 3775 ],
3770 3776 "description": "Symfony HttpKernel Component",
3771 3777 "homepage": "https://symfony.com",
3772   - "time": "2019-05-30T06:21:08+00:00"
  3778 + "time": "2019-06-06T13:23:34+00:00"
3773 3779 },
3774 3780 {
3775 3781 "name": "symfony/mime",
3776   - "version": "v4.3.0",
  3782 + "version": "v4.3.1",
3777 3783 "source": {
3778 3784 "type": "git",
3779 3785 "url": "https://github.com/symfony/mime.git",
3780   - "reference": "0b166aee243364cd9de05755d2e9651876090abb"
  3786 + "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b"
3781 3787 },
3782 3788 "dist": {
3783 3789 "type": "zip",
3784   - "url": "https://api.github.com/repos/symfony/mime/zipball/0b166aee243364cd9de05755d2e9651876090abb",
3785   - "reference": "0b166aee243364cd9de05755d2e9651876090abb",
  3790 + "url": "https://api.github.com/repos/symfony/mime/zipball/ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
  3791 + "reference": "ec2c5565de60e03f33d4296a655e3273f0ad1f8b",
3786 3792 "shasum": ""
3787 3793 },
3788 3794 "require": {
... ... @@ -3828,7 +3834,7 @@
3828 3834 "mime",
3829 3835 "mime-type"
3830 3836 ],
3831   - "time": "2019-05-22T13:16:28+00:00"
  3837 + "time": "2019-06-04T09:22:54+00:00"
3832 3838 },
3833 3839 {
3834 3840 "name": "symfony/polyfill-ctype",
... ... @@ -4183,16 +4189,16 @@
4183 4189 },
4184 4190 {
4185 4191 "name": "symfony/process",
4186   - "version": "v4.3.0",
  4192 + "version": "v4.3.1",
4187 4193 "source": {
4188 4194 "type": "git",
4189 4195 "url": "https://github.com/symfony/process.git",
4190   - "reference": "a5e3dd4e93a364668034a3cb6efa963d0b33ab45"
  4196 + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c"
4191 4197 },
4192 4198 "dist": {
4193 4199 "type": "zip",
4194   - "url": "https://api.github.com/repos/symfony/process/zipball/a5e3dd4e93a364668034a3cb6efa963d0b33ab45",
4195   - "reference": "a5e3dd4e93a364668034a3cb6efa963d0b33ab45",
  4200 + "url": "https://api.github.com/repos/symfony/process/zipball/856d35814cf287480465bb7a6c413bb7f5f5e69c",
  4201 + "reference": "856d35814cf287480465bb7a6c413bb7f5f5e69c",
4196 4202 "shasum": ""
4197 4203 },
4198 4204 "require": {
... ... @@ -4228,20 +4234,20 @@
4228 4234 ],
4229 4235 "description": "Symfony Process Component",
4230 4236 "homepage": "https://symfony.com",
4231   - "time": "2019-05-26T20:47:49+00:00"
  4237 + "time": "2019-05-30T16:10:05+00:00"
4232 4238 },
4233 4239 {
4234 4240 "name": "symfony/routing",
4235   - "version": "v4.3.0",
  4241 + "version": "v4.3.1",
4236 4242 "source": {
4237 4243 "type": "git",
4238 4244 "url": "https://github.com/symfony/routing.git",
4239   - "reference": "e6cc85f03102ef5e4aedfe636f83e58cf6fd7338"
  4245 + "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465"
4240 4246 },
4241 4247 "dist": {
4242 4248 "type": "zip",
4243   - "url": "https://api.github.com/repos/symfony/routing/zipball/e6cc85f03102ef5e4aedfe636f83e58cf6fd7338",
4244   - "reference": "e6cc85f03102ef5e4aedfe636f83e58cf6fd7338",
  4249 + "url": "https://api.github.com/repos/symfony/routing/zipball/9b31cd24f6ad2cebde6845f6daa9c6d69efe2465",
  4250 + "reference": "9b31cd24f6ad2cebde6845f6daa9c6d69efe2465",
4245 4251 "shasum": ""
4246 4252 },
4247 4253 "require": {
... ... @@ -4304,7 +4310,7 @@
4304 4310 "uri",
4305 4311 "url"
4306 4312 ],
4307   - "time": "2019-05-20T16:16:12+00:00"
  4313 + "time": "2019-06-05T09:16:20+00:00"
4308 4314 },
4309 4315 {
4310 4316 "name": "symfony/service-contracts",
... ... @@ -4366,16 +4372,16 @@
4366 4372 },
4367 4373 {
4368 4374 "name": "symfony/translation",
4369   - "version": "v4.3.0",
  4375 + "version": "v4.3.1",
4370 4376 "source": {
4371 4377 "type": "git",
4372 4378 "url": "https://github.com/symfony/translation.git",
4373   - "reference": "f7e90f0f90e354f99f20aa9ead95a1b201b126f9"
  4379 + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa"
4374 4380 },
4375 4381 "dist": {
4376 4382 "type": "zip",
4377   - "url": "https://api.github.com/repos/symfony/translation/zipball/f7e90f0f90e354f99f20aa9ead95a1b201b126f9",
4378   - "reference": "f7e90f0f90e354f99f20aa9ead95a1b201b126f9",
  4383 + "url": "https://api.github.com/repos/symfony/translation/zipball/5dda505e5f65d759741dfaf4e54b36010a4b57aa",
  4384 + "reference": "5dda505e5f65d759741dfaf4e54b36010a4b57aa",
4379 4385 "shasum": ""
4380 4386 },
4381 4387 "require": {
... ... @@ -4438,7 +4444,7 @@
4438 4444 ],
4439 4445 "description": "Symfony Translation Component",
4440 4446 "homepage": "https://symfony.com",
4441   - "time": "2019-05-28T09:09:27+00:00"
  4447 + "time": "2019-06-03T20:27:40+00:00"
4442 4448 },
4443 4449 {
4444 4450 "name": "symfony/translation-contracts",
... ... @@ -4499,16 +4505,16 @@
4499 4505 },
4500 4506 {
4501 4507 "name": "symfony/var-dumper",
4502   - "version": "v4.3.0",
  4508 + "version": "v4.3.1",
4503 4509 "source": {
4504 4510 "type": "git",
4505 4511 "url": "https://github.com/symfony/var-dumper.git",
4506   - "reference": "2fd2ecf7913fb96f0c2e941ca15bb702184c6574"
  4512 + "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b"
4507 4513 },
4508 4514 "dist": {
4509 4515 "type": "zip",
4510   - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2fd2ecf7913fb96f0c2e941ca15bb702184c6574",
4511   - "reference": "2fd2ecf7913fb96f0c2e941ca15bb702184c6574",
  4516 + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/f974f448154928d2b5fb7c412bd23b81d063f34b",
  4517 + "reference": "f974f448154928d2b5fb7c412bd23b81d063f34b",
4512 4518 "shasum": ""
4513 4519 },
4514 4520 "require": {
... ... @@ -4571,7 +4577,7 @@
4571 4577 "debug",
4572 4578 "dump"
4573 4579 ],
4574   - "time": "2019-05-01T12:55:49+00:00"
  4580 + "time": "2019-06-05T02:08:12+00:00"
4575 4581 },
4576 4582 {
4577 4583 "name": "tijsverkoyen/css-to-inline-styles",
... ... @@ -5210,16 +5216,16 @@
5210 5216 },
5211 5217 {
5212 5218 "name": "friendsofphp/php-cs-fixer",
5213   - "version": "v2.15.0",
  5219 + "version": "v2.15.1",
5214 5220 "source": {
5215 5221 "type": "git",
5216 5222 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
5217   - "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91"
  5223 + "reference": "20064511ab796593a3990669eff5f5b535001f7c"
5218 5224 },
5219 5225 "dist": {
5220 5226 "type": "zip",
5221   - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/adfab51ae979ee8b0fcbc55aa231ec2786cb1f91",
5222   - "reference": "adfab51ae979ee8b0fcbc55aa231ec2786cb1f91",
  5227 + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/20064511ab796593a3990669eff5f5b535001f7c",
  5228 + "reference": "20064511ab796593a3990669eff5f5b535001f7c",
5223 5229 "shasum": ""
5224 5230 },
5225 5231 "require": {
... ... @@ -5251,7 +5257,7 @@
5251 5257 "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
5252 5258 "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1",
5253 5259 "phpunitgoodpractices/traits": "^1.8",
5254   - "symfony/phpunit-bridge": "^4.0"
  5260 + "symfony/phpunit-bridge": "^4.3"
5255 5261 },
5256 5262 "suggest": {
5257 5263 "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
... ... @@ -5263,11 +5269,6 @@
5263 5269 "php-cs-fixer"
5264 5270 ],
5265 5271 "type": "application",
5266   - "extra": {
5267   - "branch-alias": {
5268   - "dev-master": "2.15-dev"
5269   - }
5270   - },
5271 5272 "autoload": {
5272 5273 "psr-4": {
5273 5274 "PhpCsFixer\\": "src/"
... ... @@ -5299,7 +5300,7 @@
5299 5300 }
5300 5301 ],
5301 5302 "description": "A tool to automatically fix PHP code style",
5302   - "time": "2019-05-06T07:13:51+00:00"
  5303 + "time": "2019-06-01T10:32:12+00:00"
5303 5304 },
5304 5305 {
5305 5306 "name": "fzaninotto/faker",
... ... @@ -6338,16 +6339,16 @@
6338 6339 },
6339 6340 {
6340 6341 "name": "phpunit/php-timer",
6341   - "version": "2.1.1",
  6342 + "version": "2.1.2",
6342 6343 "source": {
6343 6344 "type": "git",
6344 6345 "url": "https://github.com/sebastianbergmann/php-timer.git",
6345   - "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059"
  6346 + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e"
6346 6347 },
6347 6348 "dist": {
6348 6349 "type": "zip",
6349   - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059",
6350   - "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059",
  6350 + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e",
  6351 + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e",
6351 6352 "shasum": ""
6352 6353 },
6353 6354 "require": {
... ... @@ -6383,7 +6384,7 @@
6383 6384 "keywords": [
6384 6385 "timer"
6385 6386 ],
6386   - "time": "2019-02-20T10:12:59+00:00"
  6387 + "time": "2019-06-07T04:22:29+00:00"
6387 6388 },
6388 6389 {
6389 6390 "name": "phpunit/php-token-stream",
... ... @@ -7086,16 +7087,16 @@
7086 7087 },
7087 7088 {
7088 7089 "name": "symfony/filesystem",
7089   - "version": "v4.3.0",
  7090 + "version": "v4.3.1",
7090 7091 "source": {
7091 7092 "type": "git",
7092 7093 "url": "https://github.com/symfony/filesystem.git",
7093   - "reference": "988ab7d70c267c34efa85772ca20de3fad11c74b"
  7094 + "reference": "bf2af40d738dec5e433faea7b00daa4431d0a4cf"
7094 7095 },
7095 7096 "dist": {
7096 7097 "type": "zip",
7097   - "url": "https://api.github.com/repos/symfony/filesystem/zipball/988ab7d70c267c34efa85772ca20de3fad11c74b",
7098   - "reference": "988ab7d70c267c34efa85772ca20de3fad11c74b",
  7098 + "url": "https://api.github.com/repos/symfony/filesystem/zipball/bf2af40d738dec5e433faea7b00daa4431d0a4cf",
  7099 + "reference": "bf2af40d738dec5e433faea7b00daa4431d0a4cf",
7099 7100 "shasum": ""
7100 7101 },
7101 7102 "require": {
... ... @@ -7132,11 +7133,11 @@
7132 7133 ],
7133 7134 "description": "Symfony Filesystem Component",
7134 7135 "homepage": "https://symfony.com",
7135   - "time": "2019-05-24T12:50:04+00:00"
  7136 + "time": "2019-06-03T20:27:40+00:00"
7136 7137 },
7137 7138 {
7138 7139 "name": "symfony/options-resolver",
7139   - "version": "v4.3.0",
  7140 + "version": "v4.3.1",
7140 7141 "source": {
7141 7142 "type": "git",
7142 7143 "url": "https://github.com/symfony/options-resolver.git",
... ... @@ -7249,7 +7250,7 @@
7249 7250 },
7250 7251 {
7251 7252 "name": "symfony/stopwatch",
7252   - "version": "v4.3.0",
  7253 + "version": "v4.3.1",
7253 7254 "source": {
7254 7255 "type": "git",
7255 7256 "url": "https://github.com/symfony/stopwatch.git",
... ...
config/assets.php
  Diff comments   View file @7744142
... ... @@ -14,7 +14,7 @@ return [
14 14 |
15 15 */
16 16  
17   - 'version' => '0.0.20',
  17 + 'version' => '0.0.21',
18 18  
19 19 /*
20 20 |--------------------------------------------------------------------------
... ...
database/migrations/2019_05_28_111739_adiciona_coluna_custom_labels.php 0 → 100644
  Diff comments   View file @7744142
... ... @@ -0,0 +1,48 @@
  1 +<?php
  2 +
  3 +use Illuminate\Database\Migrations\Migration;
  4 +use Illuminate\Support\Facades\DB;
  5 +
  6 +class AdicionaColunaCustomLabels extends Migration
  7 +{
  8 +
  9 + private function getDefaultCustomLabels()
  10 + {
  11 + $customLabel = new CustomLabel();
  12 + $defaults = $customLabel->getDefaults();
  13 + $defaults['report.termo_recuperacao_final'] = 'Exame final';
  14 +
  15 + return $defaults;
  16 + }
  17 +
  18 + /**
  19 + * Run the migrations.
  20 + *
  21 + * @return void
  22 + */
  23 + public function up()
  24 + {
  25 + $setting = DB::table('pmieducar.configuracoes_gerais')
  26 + ->select('ref_cod_instituicao', 'custom_labels')
  27 + ->where('active_on_ieducar', 1)
  28 + ->first();
  29 +
  30 + if (empty($setting)) {
  31 + return;
  32 + }
  33 +
  34 + $customLabels = json_decode($setting->custom_labels, true);
  35 + $customLabels = is_array($customLabels) ? array_filter($customLabels) : [];
  36 +
  37 + $newCustomLabels = array_merge($this->getDefaultCustomLabels(), $customLabels);
  38 + $newCustomLabels = json_encode($newCustomLabels);
  39 +
  40 + DB::unprepared(
  41 + "
  42 + UPDATE pmieducar.configuracoes_gerais
  43 + SET custom_labels = '{$newCustomLabels}'
  44 + WHERE ref_cod_instituicao = {$setting->ref_cod_instituicao}
  45 + "
  46 + );
  47 + }
  48 +}
... ...
ieducar/intranet/educar_importacao_educacenso.php
  Diff comments   View file @7744142
... ... @@ -430,6 +430,9 @@ class indice extends clsCadastro
430 430  
431 431 foreach ($fields as $key => $value) {
432 432 if(property_exists($objEscola, $key)){
  433 + if ($this->isPostgresArray($value)) {
  434 + $value = $this->cleanPostgresArray($value);
  435 + }
433 436 $objEscola->{$key} = $value;
434 437 }
435 438 }
... ... @@ -441,6 +444,20 @@ class indice extends clsCadastro
441 444  
442 445 }
443 446  
  447 + private function isPostgresArray($value)
  448 + {
  449 + if (substr($value, 0, 1) == '{' && substr($value, -1) == '}') {
  450 + return true;
  451 + }
  452 +
  453 + return false;
  454 + }
  455 +
  456 + private function cleanPostgresArray($value)
  457 + {
  458 + return str_replace(['{','}'], '', $value);
  459 + }
  460 +
444 461 function importaRegistro20($dadosRegistro){
445 462  
446 463 $inepEscola = $dadosRegistro[2-1];
... ... @@ -1757,6 +1774,9 @@ class indice extends clsCadastro
1757 1774  
1758 1775 foreach ($fields as $key => $value){
1759 1776 if(property_exists($escola, $key)){
  1777 + if ($this->isPostgresArray($value)) {
  1778 + $value = $this->cleanPostgresArray($value);
  1779 + }
1760 1780 $escola->{$key} = $value;
1761 1781 }
1762 1782 }
... ...
ieducar/modules/Api/Views/EducacensoAnaliseController.php
  Diff comments   View file @7744142
... ... @@ -465,7 +465,7 @@ class EducacensoAnaliseController extends ApiCoreController
465 465 ];
466 466 }
467 467  
468   - if ($escola->possuiDependencias == 1 && !$escola->existeDependencia()) {
  468 + if ($escola->possuiDependencias == 1 && $escola->naoPossuiDependencias()) {
469 469 $mensagem[] = [
470 470 '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.",
471 471 'path' => '(Escola > Cadastros > Escolas > Editar > Aba: Dependências > Campos: Salas gerais, Sala funcionais, Banheiros, Laboratórios, Salas de atividades, Dormitórios e Áreas externas)',
... ... @@ -935,7 +935,17 @@ class EducacensoAnaliseController extends ApiCoreController
935 935 ];
936 936 }
937 937  
938   - $componentes = $turma->componentes();
  938 + try {
  939 + $componentes = $turma->componentes();
  940 + } catch (Throwable $exception) {
  941 + $mensagem[] = [
  942 + 'text' => "Dados para formular o registro 20 da escola {$turma->nomeEscola} não encontrados. Verifique se alguma disciplina da turma {$nomeTurma} foi informada",
  943 + 'path' => '(Escola > Cadastros > Turmas > Editar > Aba: Dados gerais > Seção: Componentes curriculares definidos em séries da escola)',
  944 + 'linkPath' => "/intranet/educar_turma_cad.php?cod_turma={$turma->codTurma}",
  945 + 'fail' => true
  946 + ];
  947 + continue;
  948 + }
939 949  
940 950 if (empty($componentes)) {
941 951 $mensagem[] = [
... ...
ieducar/modules/Api/Views/EducacensoExportController.php
  Diff comments   View file @7744142
... ... @@ -144,17 +144,15 @@ class EducacensoExportController extends ApiCoreController
144 144 $this->ref_cod_instituicao = $obj_permissoes->getInstituicao($this->pessoa_logada);
145 145 $continuaExportacao = true;
146 146 $export = $this->exportaDadosRegistro00($escolaId, $ano, $continuaExportacao);
147   - if (!$continuaExportacao) {
148   - return $export;
  147 + if ($continuaExportacao) {
  148 + $export .= $this->exportaDadosRegistro10($escolaId, $ano);
  149 + $export .= $this->exportaDadosRegistro20($escolaId, $ano);
  150 + $export .= $this->exportaDadosRegistro30($escolaId, $ano);
  151 + $export .= $this->exportaDadosRegistro40($escolaId);
  152 + $export .= $this->exportaDadosRegistro50($escolaId, $ano);
  153 + $export .= $this->exportaDadosRegistro60($escolaId, $ano);
149 154 }
150 155  
151   - $export .= $this->exportaDadosRegistro10($escolaId, $ano);
152   - $export .= $this->exportaDadosRegistro20($escolaId, $ano);
153   - $export .= $this->exportaDadosRegistro30($escolaId, $ano);
154   - $export .= $this->exportaDadosRegistro40($escolaId);
155   - $export .= $this->exportaDadosRegistro50($escolaId, $ano);
156   - $export .= $this->exportaDadosRegistro60($escolaId, $ano);
157   -
158 156 $export .= $this->exportaDadosRegistro99();
159 157 return $export;
160 158 }
... ... @@ -630,7 +628,7 @@ class EducacensoExportController extends ApiCoreController
630 628  
631 629 protected function exportaDadosRegistro99()
632 630 {
633   - return "99|\n";
  631 + return "99|";
634 632 }
635 633  
636 634 protected function exportaDadosRegistro89($escolaId)
... ...
ieducar/modules/Educacenso/Assets/Javascripts/Educacenso.js
  Diff comments   View file @7744142
... ... @@ -44,10 +44,10 @@ $j(document).ready(function(){
44 44 '</div>'+
45 45 '<div id="modal_mensagem_desabilitado" style="width:400px;display:none; text-align:left">'+
46 46 ' <p style="margin-left: 20px; margin-top: 30px;font-family: verdana, arial; font-size: 18px; font-weight: bold;">Parabéns! Até o momento todos os dados da sua escola, foram validados com sucesso!</p>' +
47   - ' <p style="margin-left: 20px; margin-top: 30px;font-family: verdana, arial; font-size: 14px;">Isso não significa que o trabalho acabou, ainda podem surgir novos ajustes… Fique atento e repita o processo de exportação periodicamente até o dia <b>29/05</b>. Isso evitará surpresas e transtornos! 😉</p>' +
  47 + ' <p style="margin-left: 20px; margin-top: 30px;font-family: verdana, arial; font-size: 14px;">Isso não significa que o trabalho acabou, ainda podem surgir novos ajustes… Fique atento e repita o processo de exportação periodicamente até o dia <b>04/06</b>. Isso evitará surpresas e transtornos! 😉</p>' +
48 48 ' <p style="margin-left: 20px; margin-top: 30px;font-family: verdana, arial; font-size: 18px; font-weight: bold;">Próximos passos</p>' +
49 49 ' <ul>' +
50   - ' <li><p style="margin-top: 30px;font-family: verdana, arial; font-size: 14px;">A partir do dia 29/05, clique no botão: [Exportar] novamente para gerar o arquivo com os dados para o Educacenso;</p></li>' +
  50 + ' <li><p style="margin-top: 30px;font-family: verdana, arial; font-size: 14px;">A partir do dia 04/06, clique no botão: [Exportar] novamente para gerar o arquivo com os dados para o Educacenso;</p></li>' +
51 51 ' <li><p style="font-family: verdana, arial; font-size: 14px;">Após salvar o arquivo em seu computador, acesse o link: <a href="http://treinamento.censobasico.inep.gov.br/censobasico" target="_new"> http://treinamento.censobasico.inep.gov.br/censobasico</a> e utilize suas credenciais para acessar a página de importação. Para saber mais sobre esses passos, <a href="https://www.youtube.com/watch?v=AzU8ltLF8Ig&feature=youtu.be&t=5080" target="_new">clique aqui.</a></p></li>' +
52 52 ' </ul>' +
53 53 '</div>'+
... ...
src/Modules/Educacenso/Analysis/Register30CommonDataAnalysis.php
  Diff comments   View file @7744142
... ... @@ -119,7 +119,7 @@ class Register30CommonDataAnalysis implements AnalysisInterface
119 119 ];
120 120 }
121 121  
122   - if (!$data->raca) {
  122 + if (is_null($data->raca)) {
123 123 $this->messages[] = [
124 124 '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.",
125 125 'path' => '(Pessoas > Cadastros > Pessoas físicas > Editar > Campo: Raça)',
... ... @@ -155,7 +155,7 @@ class Register30CommonDataAnalysis implements AnalysisInterface
155 155 ];
156 156 }
157 157  
158   - if (!$data->municipioNascimento && $data->nacionalidade != Nacionalidade::ESTRANGEIRA) {
  158 + if (!$data->municipioNascimento && $data->nacionalidade == Nacionalidade::BRASILEIRA) {
159 159 $this->messages[] = [
160 160 'text' => "Dados para formular o registro 30 da escola {$data->nomeEscola} não encontrados. Verifique se a naturalidade da pessoa {$data->nomePessoa} foi informada.",
161 161 'path' => '(Pessoas > Cadastros > Pessoas físicas > Editar > Campo: Naturalidade)',
... ...
src/Modules/Educacenso/Data/Registro10.php
  Diff comments   View file @7744142
... ... @@ -106,7 +106,7 @@ class Registro10 extends AbstractRegistro
106 106 $data->salasGeraisSalaProfessores() ?: 0, // 71
107 107 $data->salasAtividadesRecursosAee() ?: 0, // 72
108 108 $data->salasGeraisSalaSecretaria() ?: 0, // 73
109   - $data->existeDependencia() ?: 0, // 74
  109 + $data->naoPossuiDependencias() ?: 0, // 74
110 110 $data->recursosAcessibilidadeCorrimao() ?: 0, // 75
111 111 $data->recursosAcessibilidadeElevador() ?: 0, // 76
112 112 $data->recursosAcessibilidadePisosTateis() ?: 0, // 77
... ...
src/Modules/Educacenso/Data/Registro30.php
  Diff comments   View file @7744142
... ... @@ -44,6 +44,7 @@ class Registro30 extends AbstractRegistro
44 44 $arrayEmployeeId = $this->getArrayEmployeeId();
45 45 $employeeData = $this->repository->getEmployeeDataForRecord30($arrayEmployeeId);
46 46 foreach ($employeeData as $data) {
  47 + $data->email = strtoupper($data->email);
47 48 $this->model = $this->modelArray[$data->codigoPessoa];
48 49 $this->hydrateModel($data);
49 50 $this->modelArray[$data->codigoPessoa] = $this->model;
... ...
src/Modules/Educacenso/ExportRule/RegrasGeraisRegistro30.php
  Diff comments   View file @7744142
... ... @@ -17,10 +17,6 @@ class RegrasGeraisRegistro30 implements EducacensoExportRule
17 17 */
18 18 public static function handle(RegistroEducacenso $registro30): RegistroEducacenso
19 19 {
20   - if ($registro30->nacionalidade == Nacionalidade::ESTRANGEIRA) {
21   - $registro30->cpf = null;
22   - }
23   -
24 20 if ($registro30->nacionalidade == Nacionalidade::ESTRANGEIRA || $registro30->nacionalidade == Nacionalidade::NATURALIZADO_BRASILEIRO) {
25 21 $registro30->municipioNascimento = null;
26 22 }
... ...
src/Modules/Educacenso/ExportRule/VeiculoTransporte.php
  Diff comments   View file @7744142
... ... @@ -13,7 +13,7 @@ class VeiculoTransporte implements EducacensoExportRule
13 13 */
14 14 public static function handle(RegistroEducacenso $registro60): RegistroEducacenso
15 15 {
16   - if (is_null($registro60->transportePublico)) {
  16 + if (empty($registro60->transportePublico)) {
17 17 $registro60->veiculoTransporteBicicleta = null;
18 18 $registro60->veiculoTransporteMicroonibus = null;
19 19 $registro60->veiculoTransporteOnibus = null;
... ...