Download as
Browse Code »

Commit a50653c84c563eef3844f6858c1007d28a8601ff

Authored by Eder Soares
2 parents c4277233 58566ec8
Exists in 2.8 and in 6 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Merge branch 'master' into preregistration

Showing 8 changed files with 314 additions and 171 deletions   Show diff stats
app/Process.php
  Diff comments   View file @a50653c
... ... @@ -15,9 +15,11 @@ class Process
15 15  
16 16 const CONSULTAS = 9998890;
17 17  
  18 + const REGISTRATIONS = 578;
18 19 const ENROLLMENT_HISTORY = 1001;
19 20 const ATTENDED_CANDIDATE = 1002;
20 21 const BACK_TO_QUEUE = 1003;
  22 + const RECLASSIFY_REGISTRATION = 1004;
21 23 const UNDO_STUDENT_UNIFICATION = 2001;
22 24 const EXEMPTION_LIST = 2002;
23 25 }
... ...
composer.lock
  Diff comments   View file @a50653c
... ... @@ -60,16 +60,16 @@
60 60 },
61 61 {
62 62 "name": "aws/aws-sdk-php",
63   - "version": "3.112.25",
  63 + "version": "3.113.0",
64 64 "source": {
65 65 "type": "git",
66 66 "url": "https://github.com/aws/aws-sdk-php.git",
67   - "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749"
  67 + "reference": "09998bf4d47195d5c4afa0ffd30e28921ce75f92"
68 68 },
69 69 "dist": {
70 70 "type": "zip",
71   - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f91e264e3cbf8ced5c93f5f786c9e0f079926749",
72   - "reference": "f91e264e3cbf8ced5c93f5f786c9e0f079926749",
  71 + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/09998bf4d47195d5c4afa0ffd30e28921ce75f92",
  72 + "reference": "09998bf4d47195d5c4afa0ffd30e28921ce75f92",
73 73 "shasum": ""
74 74 },
75 75 "require": {
... ... @@ -139,7 +139,7 @@
139 139 "s3",
140 140 "sdk"
141 141 ],
142   - "time": "2019-10-18T18:08:55+00:00"
  142 + "time": "2019-11-05T19:13:36+00:00"
143 143 },
144 144 {
145 145 "name": "barryvdh/laravel-cors",
... ... @@ -406,16 +406,16 @@
406 406 },
407 407 {
408 408 "name": "doctrine/cache",
409   - "version": "v1.8.0",
  409 + "version": "v1.8.1",
410 410 "source": {
411 411 "type": "git",
412 412 "url": "https://github.com/doctrine/cache.git",
413   - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57"
  413 + "reference": "d4374ae95b36062d02ef310100ed33d78738d76c"
414 414 },
415 415 "dist": {
416 416 "type": "zip",
417   - "url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57",
418   - "reference": "d768d58baee9a4862ca783840eca1b9add7a7f57",
  417 + "url": "https://api.github.com/repos/doctrine/cache/zipball/d4374ae95b36062d02ef310100ed33d78738d76c",
  418 + "reference": "d4374ae95b36062d02ef310100ed33d78738d76c",
419 419 "shasum": ""
420 420 },
421 421 "require": {
... ... @@ -451,6 +451,10 @@
451 451 ],
452 452 "authors": [
453 453 {
  454 + "name": "Guilherme Blanco",
  455 + "email": "guilhermeblanco@gmail.com"
  456 + },
  457 + {
454 458 "name": "Roman Borschel",
455 459 "email": "roman@code-factory.org"
456 460 },
... ... @@ -459,10 +463,6 @@
459 463 "email": "kontakt@beberlei.de"
460 464 },
461 465 {
462   - "name": "Guilherme Blanco",
463   - "email": "guilhermeblanco@gmail.com"
464   - },
465   - {
466 466 "name": "Jonathan Wage",
467 467 "email": "jonwage@gmail.com"
468 468 },
... ... @@ -477,35 +477,34 @@
477 477 "cache",
478 478 "caching"
479 479 ],
480   - "time": "2018-08-21T18:01:43+00:00"
  480 + "time": "2019-10-28T09:31:32+00:00"
481 481 },
482 482 {
483 483 "name": "doctrine/dbal",
484   - "version": "v2.9.2",
  484 + "version": "v2.10.0",
485 485 "source": {
486 486 "type": "git",
487 487 "url": "https://github.com/doctrine/dbal.git",
488   - "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9"
  488 + "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934"
489 489 },
490 490 "dist": {
491 491 "type": "zip",
492   - "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
493   - "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
  492 + "url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
  493 + "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
494 494 "shasum": ""
495 495 },
496 496 "require": {
497 497 "doctrine/cache": "^1.0",
498 498 "doctrine/event-manager": "^1.0",
499 499 "ext-pdo": "*",
500   - "php": "^7.1"
  500 + "php": "^7.2"
501 501 },
502 502 "require-dev": {
503   - "doctrine/coding-standard": "^5.0",
504   - "jetbrains/phpstorm-stubs": "^2018.1.2",
505   - "phpstan/phpstan": "^0.10.1",
506   - "phpunit/phpunit": "^7.4",
507   - "symfony/console": "^2.0.5|^3.0|^4.0",
508   - "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
  503 + "doctrine/coding-standard": "^6.0",
  504 + "jetbrains/phpstorm-stubs": "^2019.1",
  505 + "phpstan/phpstan": "^0.11.3",
  506 + "phpunit/phpunit": "^8.4.1",
  507 + "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
509 508 },
510 509 "suggest": {
511 510 "symfony/console": "For helpful console commands such as SQL execution and import of files."
... ... @@ -516,7 +515,7 @@
516 515 "type": "library",
517 516 "extra": {
518 517 "branch-alias": {
519   - "dev-master": "2.9.x-dev",
  518 + "dev-master": "2.10.x-dev",
520 519 "dev-develop": "3.0.x-dev"
521 520 }
522 521 },
... ... @@ -531,6 +530,10 @@
531 530 ],
532 531 "authors": [
533 532 {
  533 + "name": "Guilherme Blanco",
  534 + "email": "guilhermeblanco@gmail.com"
  535 + },
  536 + {
534 537 "name": "Roman Borschel",
535 538 "email": "roman@code-factory.org"
536 539 },
... ... @@ -539,10 +542,6 @@
539 542 "email": "kontakt@beberlei.de"
540 543 },
541 544 {
542   - "name": "Guilherme Blanco",
543   - "email": "guilhermeblanco@gmail.com"
544   - },
545   - {
546 545 "name": "Jonathan Wage",
547 546 "email": "jonwage@gmail.com"
548 547 }
... ... @@ -552,14 +551,25 @@
552 551 "keywords": [
553 552 "abstraction",
554 553 "database",
  554 + "db2",
555 555 "dbal",
  556 + "mariadb",
  557 + "mssql",
556 558 "mysql",
557   - "persistence",
  559 + "oci8",
  560 + "oracle",
  561 + "pdo",
558 562 "pgsql",
559   - "php",
560   - "queryobject"
561   - ],
562   - "time": "2018-12-31T03:27:51+00:00"
  563 + "postgresql",
  564 + "queryobject",
  565 + "sasql",
  566 + "sql",
  567 + "sqlanywhere",
  568 + "sqlite",
  569 + "sqlserver",
  570 + "sqlsrv"
  571 + ],
  572 + "time": "2019-11-03T16:50:43+00:00"
563 573 },
564 574 {
565 575 "name": "doctrine/event-manager",
... ... @@ -1076,27 +1086,28 @@
1076 1086 },
1077 1087 {
1078 1088 "name": "guzzlehttp/guzzle",
1079   - "version": "6.3.3",
  1089 + "version": "6.4.1",
1080 1090 "source": {
1081 1091 "type": "git",
1082 1092 "url": "https://github.com/guzzle/guzzle.git",
1083   - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba"
  1093 + "reference": "0895c932405407fd3a7368b6910c09a24d26db11"
1084 1094 },
1085 1095 "dist": {
1086 1096 "type": "zip",
1087   - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba",
1088   - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba",
  1097 + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0895c932405407fd3a7368b6910c09a24d26db11",
  1098 + "reference": "0895c932405407fd3a7368b6910c09a24d26db11",
1089 1099 "shasum": ""
1090 1100 },
1091 1101 "require": {
  1102 + "ext-json": "*",
1092 1103 "guzzlehttp/promises": "^1.0",
1093   - "guzzlehttp/psr7": "^1.4",
  1104 + "guzzlehttp/psr7": "^1.6.1",
1094 1105 "php": ">=5.5"
1095 1106 },
1096 1107 "require-dev": {
1097 1108 "ext-curl": "*",
1098 1109 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0",
1099   - "psr/log": "^1.0"
  1110 + "psr/log": "^1.1"
1100 1111 },
1101 1112 "suggest": {
1102 1113 "psr/log": "Required for using the Log middleware"
... ... @@ -1108,12 +1119,12 @@
1108 1119 }
1109 1120 },
1110 1121 "autoload": {
1111   - "files": [
1112   - "src/functions_include.php"
1113   - ],
1114 1122 "psr-4": {
1115 1123 "GuzzleHttp\\": "src/"
1116   - }
  1124 + },
  1125 + "files": [
  1126 + "src/functions_include.php"
  1127 + ]
1117 1128 },
1118 1129 "notification-url": "https://packagist.org/downloads/",
1119 1130 "license": [
... ... @@ -1137,7 +1148,7 @@
1137 1148 "rest",
1138 1149 "web service"
1139 1150 ],
1140   - "time": "2018-04-22T15:46:56+00:00"
  1151 + "time": "2019-10-23T15:58:00+00:00"
1141 1152 },
1142 1153 {
1143 1154 "name": "guzzlehttp/promises",
... ... @@ -2230,16 +2241,16 @@
2230 2241 },
2231 2242 {
2232 2243 "name": "nesbot/carbon",
2233   - "version": "2.25.2",
  2244 + "version": "2.26.0",
2234 2245 "source": {
2235 2246 "type": "git",
2236 2247 "url": "https://github.com/briannesbitt/Carbon.git",
2237   - "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f"
  2248 + "reference": "e01ecc0b71168febb52ae1fdc1cfcc95428e604e"
2238 2249 },
2239 2250 "dist": {
2240 2251 "type": "zip",
2241   - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/443fe5f1498147e0fbc792142b5dc43e2e8a533f",
2242   - "reference": "443fe5f1498147e0fbc792142b5dc43e2e8a533f",
  2252 + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/e01ecc0b71168febb52ae1fdc1cfcc95428e604e",
  2253 + "reference": "e01ecc0b71168febb52ae1fdc1cfcc95428e604e",
2243 2254 "shasum": ""
2244 2255 },
2245 2256 "require": {
... ... @@ -2293,20 +2304,20 @@
2293 2304 "datetime",
2294 2305 "time"
2295 2306 ],
2296   - "time": "2019-10-14T14:18:59+00:00"
  2307 + "time": "2019-10-21T21:32:25+00:00"
2297 2308 },
2298 2309 {
2299 2310 "name": "nikic/php-parser",
2300   - "version": "v4.2.4",
  2311 + "version": "v4.2.5",
2301 2312 "source": {
2302 2313 "type": "git",
2303 2314 "url": "https://github.com/nikic/PHP-Parser.git",
2304   - "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4"
  2315 + "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2"
2305 2316 },
2306 2317 "dist": {
2307 2318 "type": "zip",
2308   - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/97e59c7a16464196a8b9c77c47df68e4a39a45c4",
2309   - "reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4",
  2319 + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
  2320 + "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
2310 2321 "shasum": ""
2311 2322 },
2312 2323 "require": {
... ... @@ -2314,6 +2325,7 @@
2314 2325 "php": ">=7.0"
2315 2326 },
2316 2327 "require-dev": {
  2328 + "ircmaxell/php-yacc": "0.0.4",
2317 2329 "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
2318 2330 },
2319 2331 "bin": [
... ... @@ -2344,20 +2356,20 @@
2344 2356 "parser",
2345 2357 "php"
2346 2358 ],
2347   - "time": "2019-09-01T07:51:21+00:00"
  2359 + "time": "2019-10-25T18:33:07+00:00"
2348 2360 },
2349 2361 {
2350 2362 "name": "opis/closure",
2351   - "version": "3.4.0",
  2363 + "version": "3.4.1",
2352 2364 "source": {
2353 2365 "type": "git",
2354 2366 "url": "https://github.com/opis/closure.git",
2355   - "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7"
  2367 + "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7"
2356 2368 },
2357 2369 "dist": {
2358 2370 "type": "zip",
2359   - "url": "https://api.github.com/repos/opis/closure/zipball/60a97fff133b1669a5b1776aa8ab06db3f3962b7",
2360   - "reference": "60a97fff133b1669a5b1776aa8ab06db3f3962b7",
  2371 + "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7",
  2372 + "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7",
2361 2373 "shasum": ""
2362 2374 },
2363 2375 "require": {
... ... @@ -2405,7 +2417,7 @@
2405 2417 "serialization",
2406 2418 "serialize"
2407 2419 ],
2408   - "time": "2019-09-02T21:07:33+00:00"
  2420 + "time": "2019-10-19T18:38:51+00:00"
2409 2421 },
2410 2422 {
2411 2423 "name": "paragonie/random_compat",
... ... @@ -2547,16 +2559,16 @@
2547 2559 },
2548 2560 {
2549 2561 "name": "phpoption/phpoption",
2550   - "version": "1.5.0",
  2562 + "version": "1.5.1",
2551 2563 "source": {
2552 2564 "type": "git",
2553 2565 "url": "https://github.com/schmittjoh/php-option.git",
2554   - "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed"
  2566 + "reference": "894e8f93890b79f29911cce497fe811fe9d931ba"
2555 2567 },
2556 2568 "dist": {
2557 2569 "type": "zip",
2558   - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed",
2559   - "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed",
  2570 + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/894e8f93890b79f29911cce497fe811fe9d931ba",
  2571 + "reference": "894e8f93890b79f29911cce497fe811fe9d931ba",
2560 2572 "shasum": ""
2561 2573 },
2562 2574 "require": {
... ... @@ -2578,7 +2590,7 @@
2578 2590 },
2579 2591 "notification-url": "https://packagist.org/downloads/",
2580 2592 "license": [
2581   - "Apache2"
  2593 + "Apache-2.0"
2582 2594 ],
2583 2595 "authors": [
2584 2596 {
... ... @@ -2593,7 +2605,7 @@
2593 2605 "php",
2594 2606 "type"
2595 2607 ],
2596   - "time": "2015-07-25T16:39:46+00:00"
  2608 + "time": "2019-11-06T12:42:47+00:00"
2597 2609 },
2598 2610 {
2599 2611 "name": "predis/predis",
... ... @@ -2900,16 +2912,16 @@
2900 2912 },
2901 2913 {
2902 2914 "name": "psr/log",
2903   - "version": "1.1.0",
  2915 + "version": "1.1.2",
2904 2916 "source": {
2905 2917 "type": "git",
2906 2918 "url": "https://github.com/php-fig/log.git",
2907   - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
  2919 + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801"
2908 2920 },
2909 2921 "dist": {
2910 2922 "type": "zip",
2911   - "url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
2912   - "reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
  2923 + "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801",
  2924 + "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801",
2913 2925 "shasum": ""
2914 2926 },
2915 2927 "require": {
... ... @@ -2918,7 +2930,7 @@
2918 2930 "type": "library",
2919 2931 "extra": {
2920 2932 "branch-alias": {
2921   - "dev-master": "1.0.x-dev"
  2933 + "dev-master": "1.1.x-dev"
2922 2934 }
2923 2935 },
2924 2936 "autoload": {
... ... @@ -2943,7 +2955,7 @@
2943 2955 "psr",
2944 2956 "psr-3"
2945 2957 ],
2946   - "time": "2018-11-20T15:27:04+00:00"
  2958 + "time": "2019-11-01T11:05:21+00:00"
2947 2959 },
2948 2960 {
2949 2961 "name": "psr/simple-cache",
... ... @@ -3303,16 +3315,16 @@
3303 3315 },
3304 3316 {
3305 3317 "name": "symfony/console",
3306   - "version": "v4.3.5",
  3318 + "version": "v4.3.6",
3307 3319 "source": {
3308 3320 "type": "git",
3309 3321 "url": "https://github.com/symfony/console.git",
3310   - "reference": "929ddf360d401b958f611d44e726094ab46a7369"
  3322 + "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78"
3311 3323 },
3312 3324 "dist": {
3313 3325 "type": "zip",
3314   - "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369",
3315   - "reference": "929ddf360d401b958f611d44e726094ab46a7369",
  3326 + "url": "https://api.github.com/repos/symfony/console/zipball/136c4bd62ea871d00843d1bc0316de4c4a84bb78",
  3327 + "reference": "136c4bd62ea871d00843d1bc0316de4c4a84bb78",
3316 3328 "shasum": ""
3317 3329 },
3318 3330 "require": {
... ... @@ -3374,11 +3386,11 @@
3374 3386 ],
3375 3387 "description": "Symfony Console Component",
3376 3388 "homepage": "https://symfony.com",
3377   - "time": "2019-10-07T12:36:49+00:00"
  3389 + "time": "2019-10-30T12:58:49+00:00"
3378 3390 },
3379 3391 {
3380 3392 "name": "symfony/css-selector",
3381   - "version": "v4.3.5",
  3393 + "version": "v4.3.6",
3382 3394 "source": {
3383 3395 "type": "git",
3384 3396 "url": "https://github.com/symfony/css-selector.git",
... ... @@ -3431,16 +3443,16 @@
3431 3443 },
3432 3444 {
3433 3445 "name": "symfony/debug",
3434   - "version": "v4.3.5",
  3446 + "version": "v4.3.6",
3435 3447 "source": {
3436 3448 "type": "git",
3437 3449 "url": "https://github.com/symfony/debug.git",
3438   - "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe"
  3450 + "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2"
3439 3451 },
3440 3452 "dist": {
3441 3453 "type": "zip",
3442   - "url": "https://api.github.com/repos/symfony/debug/zipball/cc5c1efd0edfcfd10b354750594a46b3dd2afbbe",
3443   - "reference": "cc5c1efd0edfcfd10b354750594a46b3dd2afbbe",
  3454 + "url": "https://api.github.com/repos/symfony/debug/zipball/5ea9c3e01989a86ceaa0283f21234b12deadf5e2",
  3455 + "reference": "5ea9c3e01989a86ceaa0283f21234b12deadf5e2",
3444 3456 "shasum": ""
3445 3457 },
3446 3458 "require": {
... ... @@ -3483,11 +3495,11 @@
3483 3495 ],
3484 3496 "description": "Symfony Debug Component",
3485 3497 "homepage": "https://symfony.com",
3486   - "time": "2019-09-19T15:51:53+00:00"
  3498 + "time": "2019-10-28T17:07:32+00:00"
3487 3499 },
3488 3500 {
3489 3501 "name": "symfony/event-dispatcher",
3490   - "version": "v4.3.5",
  3502 + "version": "v4.3.6",
3491 3503 "source": {
3492 3504 "type": "git",
3493 3505 "url": "https://github.com/symfony/event-dispatcher.git",
... ... @@ -3615,16 +3627,16 @@
3615 3627 },
3616 3628 {
3617 3629 "name": "symfony/finder",
3618   - "version": "v4.3.5",
  3630 + "version": "v4.3.6",
3619 3631 "source": {
3620 3632 "type": "git",
3621 3633 "url": "https://github.com/symfony/finder.git",
3622   - "reference": "5e575faa95548d0586f6bedaeabec259714e44d1"
  3634 + "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f"
3623 3635 },
3624 3636 "dist": {
3625 3637 "type": "zip",
3626   - "url": "https://api.github.com/repos/symfony/finder/zipball/5e575faa95548d0586f6bedaeabec259714e44d1",
3627   - "reference": "5e575faa95548d0586f6bedaeabec259714e44d1",
  3638 + "url": "https://api.github.com/repos/symfony/finder/zipball/72a068f77e317ae77c0a0495236ad292cfb5ce6f",
  3639 + "reference": "72a068f77e317ae77c0a0495236ad292cfb5ce6f",
3628 3640 "shasum": ""
3629 3641 },
3630 3642 "require": {
... ... @@ -3660,20 +3672,20 @@
3660 3672 ],
3661 3673 "description": "Symfony Finder Component",
3662 3674 "homepage": "https://symfony.com",
3663   - "time": "2019-09-16T11:29:48+00:00"
  3675 + "time": "2019-10-30T12:53:54+00:00"
3664 3676 },
3665 3677 {
3666 3678 "name": "symfony/http-foundation",
3667   - "version": "v4.3.5",
  3679 + "version": "v4.3.6",
3668 3680 "source": {
3669 3681 "type": "git",
3670 3682 "url": "https://github.com/symfony/http-foundation.git",
3671   - "reference": "76590ced16d4674780863471bae10452b79210a5"
  3683 + "reference": "38f63e471cda9d37ac06e76d14c5ea2ec5887051"
3672 3684 },
3673 3685 "dist": {
3674 3686 "type": "zip",
3675   - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/76590ced16d4674780863471bae10452b79210a5",
3676   - "reference": "76590ced16d4674780863471bae10452b79210a5",
  3687 + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/38f63e471cda9d37ac06e76d14c5ea2ec5887051",
  3688 + "reference": "38f63e471cda9d37ac06e76d14c5ea2ec5887051",
3677 3689 "shasum": ""
3678 3690 },
3679 3691 "require": {
... ... @@ -3715,20 +3727,20 @@
3715 3727 ],
3716 3728 "description": "Symfony HttpFoundation Component",
3717 3729 "homepage": "https://symfony.com",
3718   - "time": "2019-10-04T19:48:13+00:00"
  3730 + "time": "2019-10-30T12:58:49+00:00"
3719 3731 },
3720 3732 {
3721 3733 "name": "symfony/http-kernel",
3722   - "version": "v4.3.5",
  3734 + "version": "v4.3.6",
3723 3735 "source": {
3724 3736 "type": "git",
3725 3737 "url": "https://github.com/symfony/http-kernel.git",
3726   - "reference": "5f08141850932e8019c01d8988bf3ed6367d2991"
  3738 + "reference": "56acfda9e734e8715b3b0e6859cdb4f5b28757bf"
3727 3739 },
3728 3740 "dist": {
3729 3741 "type": "zip",
3730   - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5f08141850932e8019c01d8988bf3ed6367d2991",
3731   - "reference": "5f08141850932e8019c01d8988bf3ed6367d2991",
  3742 + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/56acfda9e734e8715b3b0e6859cdb4f5b28757bf",
  3743 + "reference": "56acfda9e734e8715b3b0e6859cdb4f5b28757bf",
3732 3744 "shasum": ""
3733 3745 },
3734 3746 "require": {
... ... @@ -3807,20 +3819,20 @@
3807 3819 ],
3808 3820 "description": "Symfony HttpKernel Component",
3809 3821 "homepage": "https://symfony.com",
3810   - "time": "2019-10-07T15:06:41+00:00"
  3822 + "time": "2019-11-01T10:00:03+00:00"
3811 3823 },
3812 3824 {
3813 3825 "name": "symfony/mime",
3814   - "version": "v4.3.5",
  3826 + "version": "v4.3.6",
3815 3827 "source": {
3816 3828 "type": "git",
3817 3829 "url": "https://github.com/symfony/mime.git",
3818   - "reference": "32f71570547b91879fdbd9cf50317d556ae86916"
  3830 + "reference": "3c0e197529da6e59b217615ba8ee7604df88b551"
3819 3831 },
3820 3832 "dist": {
3821 3833 "type": "zip",
3822   - "url": "https://api.github.com/repos/symfony/mime/zipball/32f71570547b91879fdbd9cf50317d556ae86916",
3823   - "reference": "32f71570547b91879fdbd9cf50317d556ae86916",
  3834 + "url": "https://api.github.com/repos/symfony/mime/zipball/3c0e197529da6e59b217615ba8ee7604df88b551",
  3835 + "reference": "3c0e197529da6e59b217615ba8ee7604df88b551",
3824 3836 "shasum": ""
3825 3837 },
3826 3838 "require": {
... ... @@ -3866,7 +3878,7 @@
3866 3878 "mime",
3867 3879 "mime-type"
3868 3880 ],
3869   - "time": "2019-09-19T17:00:15+00:00"
  3881 + "time": "2019-10-30T12:58:49+00:00"
3870 3882 },
3871 3883 {
3872 3884 "name": "symfony/polyfill-ctype",
... ... @@ -4221,16 +4233,16 @@
4221 4233 },
4222 4234 {
4223 4235 "name": "symfony/process",
4224   - "version": "v4.3.5",
  4236 + "version": "v4.3.6",
4225 4237 "source": {
4226 4238 "type": "git",
4227 4239 "url": "https://github.com/symfony/process.git",
4228   - "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b"
  4240 + "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0"
4229 4241 },
4230 4242 "dist": {
4231 4243 "type": "zip",
4232   - "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b",
4233   - "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b",
  4244 + "url": "https://api.github.com/repos/symfony/process/zipball/3b2e0cb029afbb0395034509291f21191d1a4db0",
  4245 + "reference": "3b2e0cb029afbb0395034509291f21191d1a4db0",
4234 4246 "shasum": ""
4235 4247 },
4236 4248 "require": {
... ... @@ -4266,20 +4278,20 @@
4266 4278 ],
4267 4279 "description": "Symfony Process Component",
4268 4280 "homepage": "https://symfony.com",
4269   - "time": "2019-09-26T21:17:10+00:00"
  4281 + "time": "2019-10-28T17:07:32+00:00"
4270 4282 },
4271 4283 {
4272 4284 "name": "symfony/routing",
4273   - "version": "v4.3.5",
  4285 + "version": "v4.3.6",
4274 4286 "source": {
4275 4287 "type": "git",
4276 4288 "url": "https://github.com/symfony/routing.git",
4277   - "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea"
  4289 + "reference": "63a9920cc86fcc745e5ea254e362f02b615290b9"
4278 4290 },
4279 4291 "dist": {
4280 4292 "type": "zip",
4281   - "url": "https://api.github.com/repos/symfony/routing/zipball/3b174ef04fe66696524efad1e5f7a6c663d822ea",
4282   - "reference": "3b174ef04fe66696524efad1e5f7a6c663d822ea",
  4293 + "url": "https://api.github.com/repos/symfony/routing/zipball/63a9920cc86fcc745e5ea254e362f02b615290b9",
  4294 + "reference": "63a9920cc86fcc745e5ea254e362f02b615290b9",
4283 4295 "shasum": ""
4284 4296 },
4285 4297 "require": {
... ... @@ -4342,7 +4354,7 @@
4342 4354 "uri",
4343 4355 "url"
4344 4356 ],
4345   - "time": "2019-10-04T20:57:10+00:00"
  4357 + "time": "2019-10-30T12:58:49+00:00"
4346 4358 },
4347 4359 {
4348 4360 "name": "symfony/service-contracts",
... ... @@ -4404,16 +4416,16 @@
4404 4416 },
4405 4417 {
4406 4418 "name": "symfony/translation",
4407   - "version": "v4.3.5",
  4419 + "version": "v4.3.6",
4408 4420 "source": {
4409 4421 "type": "git",
4410 4422 "url": "https://github.com/symfony/translation.git",
4411   - "reference": "fe6193b066c457c144333c06aaa869a2d42a167f"
  4423 + "reference": "a3aa590ce944afb3434d7a55f81b00927144d5ec"
4412 4424 },
4413 4425 "dist": {
4414 4426 "type": "zip",
4415   - "url": "https://api.github.com/repos/symfony/translation/zipball/fe6193b066c457c144333c06aaa869a2d42a167f",
4416   - "reference": "fe6193b066c457c144333c06aaa869a2d42a167f",
  4427 + "url": "https://api.github.com/repos/symfony/translation/zipball/a3aa590ce944afb3434d7a55f81b00927144d5ec",
  4428 + "reference": "a3aa590ce944afb3434d7a55f81b00927144d5ec",
4417 4429 "shasum": ""
4418 4430 },
4419 4431 "require": {
... ... @@ -4476,7 +4488,7 @@
4476 4488 ],
4477 4489 "description": "Symfony Translation Component",
4478 4490 "homepage": "https://symfony.com",
4479   - "time": "2019-09-27T14:37:39+00:00"
  4491 + "time": "2019-10-30T12:53:54+00:00"
4480 4492 },
4481 4493 {
4482 4494 "name": "symfony/translation-contracts",
... ... @@ -4537,16 +4549,16 @@
4537 4549 },
4538 4550 {
4539 4551 "name": "symfony/var-dumper",
4540   - "version": "v4.3.5",
  4552 + "version": "v4.3.6",
4541 4553 "source": {
4542 4554 "type": "git",
4543 4555 "url": "https://github.com/symfony/var-dumper.git",
4544   - "reference": "bde8957fc415fdc6964f33916a3755737744ff05"
  4556 + "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf"
4545 4557 },
4546 4558 "dist": {
4547 4559 "type": "zip",
4548   - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05",
4549   - "reference": "bde8957fc415fdc6964f33916a3755737744ff05",
  4560 + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ea4940845535c85ff5c505e13b3205b0076d07bf",
  4561 + "reference": "ea4940845535c85ff5c505e13b3205b0076d07bf",
4550 4562 "shasum": ""
4551 4563 },
4552 4564 "require": {
... ... @@ -4609,25 +4621,27 @@
4609 4621 "debug",
4610 4622 "dump"
4611 4623 ],
4612   - "time": "2019-10-04T19:48:13+00:00"
  4624 + "time": "2019-10-13T12:02:04+00:00"
4613 4625 },
4614 4626 {
4615 4627 "name": "tijsverkoyen/css-to-inline-styles",
4616   - "version": "2.2.1",
  4628 + "version": "2.2.2",
4617 4629 "source": {
4618 4630 "type": "git",
4619 4631 "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git",
4620   - "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757"
  4632 + "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15"
4621 4633 },
4622 4634 "dist": {
4623 4635 "type": "zip",
4624   - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
4625   - "reference": "0ed4a2ea4e0902dac0489e6436ebcd5bbcae9757",
  4636 + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
  4637 + "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15",
4626 4638 "shasum": ""
4627 4639 },
4628 4640 "require": {
  4641 + "ext-dom": "*",
  4642 + "ext-libxml": "*",
4629 4643 "php": "^5.5 || ^7.0",
4630   - "symfony/css-selector": "^2.7 || ^3.0 || ^4.0"
  4644 + "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0"
4631 4645 },
4632 4646 "require-dev": {
4633 4647 "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
... ... @@ -4656,7 +4670,7 @@
4656 4670 ],
4657 4671 "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.",
4658 4672 "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles",
4659   - "time": "2017-11-27T11:13:29+00:00"
  4673 + "time": "2019-10-24T08:53:34+00:00"
4660 4674 },
4661 4675 {
4662 4676 "name": "tooleks/laravel-asset-version",
... ... @@ -4948,24 +4962,24 @@
4948 4962 },
4949 4963 {
4950 4964 "name": "composer/xdebug-handler",
4951   - "version": "1.3.3",
  4965 + "version": "1.4.0",
4952 4966 "source": {
4953 4967 "type": "git",
4954 4968 "url": "https://github.com/composer/xdebug-handler.git",
4955   - "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
  4969 + "reference": "cbe23383749496fe0f373345208b79568e4bc248"
4956 4970 },
4957 4971 "dist": {
4958 4972 "type": "zip",
4959   - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
4960   - "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
  4973 + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
  4974 + "reference": "cbe23383749496fe0f373345208b79568e4bc248",
4961 4975 "shasum": ""
4962 4976 },
4963 4977 "require": {
4964   - "php": "^5.3.2 || ^7.0",
  4978 + "php": "^5.3.2 || ^7.0 || ^8.0",
4965 4979 "psr/log": "^1.0"
4966 4980 },
4967 4981 "require-dev": {
4968   - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
  4982 + "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
4969 4983 },
4970 4984 "type": "library",
4971 4985 "autoload": {
... ... @@ -4983,12 +4997,12 @@
4983 4997 "email": "john-stevenson@blueyonder.co.uk"
4984 4998 }
4985 4999 ],
4986   - "description": "Restarts a process without xdebug.",
  5000 + "description": "Restarts a process without Xdebug.",
4987 5001 "keywords": [
4988 5002 "Xdebug",
4989 5003 "performance"
4990 5004 ],
4991   - "time": "2019-05-27T17:52:04+00:00"
  5005 + "time": "2019-11-06T16:40:04+00:00"
4992 5006 },
4993 5007 {
4994 5008 "name": "doctrine/annotations",
... ... @@ -5237,16 +5251,16 @@
5237 5251 },
5238 5252 {
5239 5253 "name": "friendsofphp/php-cs-fixer",
5240   - "version": "v2.15.3",
  5254 + "version": "v2.16.0",
5241 5255 "source": {
5242 5256 "type": "git",
5243 5257 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
5244   - "reference": "705490b0f282f21017d73561e9498d2b622ee34c"
  5258 + "reference": "ceaff36bee1ed3f1bbbedca36d2528c0826c336d"
5245 5259 },
5246 5260 "dist": {
5247 5261 "type": "zip",
5248   - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/705490b0f282f21017d73561e9498d2b622ee34c",
5249   - "reference": "705490b0f282f21017d73561e9498d2b622ee34c",
  5262 + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ceaff36bee1ed3f1bbbedca36d2528c0826c336d",
  5263 + "reference": "ceaff36bee1ed3f1bbbedca36d2528c0826c336d",
5250 5264 "shasum": ""
5251 5265 },
5252 5266 "require": {
... ... @@ -5322,7 +5336,7 @@
5322 5336 }
5323 5337 ],
5324 5338 "description": "A tool to automatically fix PHP code style",
5325   - "time": "2019-08-31T12:51:54+00:00"
  5339 + "time": "2019-11-03T13:31:09+00:00"
5326 5340 },
5327 5341 {
5328 5342 "name": "fzaninotto/faker",
... ... @@ -5424,20 +5438,21 @@
5424 5438 },
5425 5439 {
5426 5440 "name": "laravel/dusk",
5427   - "version": "v5.5.2",
  5441 + "version": "v5.6.0",
5428 5442 "source": {
5429 5443 "type": "git",
5430 5444 "url": "https://github.com/laravel/dusk.git",
5431   - "reference": "aed755282a13a9b36d26854a0105d519aa22fec9"
  5445 + "reference": "db4f8d75b7c9acf88ef1712e9ccf51c15540934d"
5432 5446 },
5433 5447 "dist": {
5434 5448 "type": "zip",
5435   - "url": "https://api.github.com/repos/laravel/dusk/zipball/aed755282a13a9b36d26854a0105d519aa22fec9",
5436   - "reference": "aed755282a13a9b36d26854a0105d519aa22fec9",
  5449 + "url": "https://api.github.com/repos/laravel/dusk/zipball/db4f8d75b7c9acf88ef1712e9ccf51c15540934d",
  5450 + "reference": "db4f8d75b7c9acf88ef1712e9ccf51c15540934d",
5437 5451 "shasum": ""
5438 5452 },
5439 5453 "require": {
5440 5454 "ext-json": "*",
  5455 + "ext-pcntl": "*",
5441 5456 "ext-zip": "*",
5442 5457 "facebook/webdriver": "^1.7",
5443 5458 "illuminate/console": "~5.7.0|~5.8.0|^6.0|^7.0",
... ... @@ -5485,7 +5500,7 @@
5485 5500 "testing",
5486 5501 "webdriver"
5487 5502 ],
5488   - "time": "2019-09-24T20:30:07+00:00"
  5503 + "time": "2019-10-29T15:58:57+00:00"
5489 5504 },
5490 5505 {
5491 5506 "name": "laravel/telescope",
... ... @@ -6456,16 +6471,16 @@
6456 6471 },
6457 6472 {
6458 6473 "name": "phpunit/phpunit",
6459   - "version": "7.5.16",
  6474 + "version": "7.5.17",
6460 6475 "source": {
6461 6476 "type": "git",
6462 6477 "url": "https://github.com/sebastianbergmann/phpunit.git",
6463   - "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661"
  6478 + "reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a"
6464 6479 },
6465 6480 "dist": {
6466 6481 "type": "zip",
6467   - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/316afa6888d2562e04aeb67ea7f2017a0eb41661",
6468   - "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661",
  6482 + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4c92a15296e58191a4cd74cff3b34fc8e374174a",
  6483 + "reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a",
6469 6484 "shasum": ""
6470 6485 },
6471 6486 "require": {
... ... @@ -6536,7 +6551,7 @@
6536 6551 "testing",
6537 6552 "xunit"
6538 6553 ],
6539   - "time": "2019-09-14T09:08:39+00:00"
  6554 + "time": "2019-10-28T10:37:36+00:00"
6540 6555 },
6541 6556 {
6542 6557 "name": "sebastian/code-unit-reverse-lookup",
... ... @@ -7106,7 +7121,7 @@
7106 7121 },
7107 7122 {
7108 7123 "name": "symfony/filesystem",
7109   - "version": "v4.3.5",
  7124 + "version": "v4.3.6",
7110 7125 "source": {
7111 7126 "type": "git",
7112 7127 "url": "https://github.com/symfony/filesystem.git",
... ... @@ -7156,16 +7171,16 @@
7156 7171 },
7157 7172 {
7158 7173 "name": "symfony/options-resolver",
7159   - "version": "v4.3.5",
  7174 + "version": "v4.3.6",
7160 7175 "source": {
7161 7176 "type": "git",
7162 7177 "url": "https://github.com/symfony/options-resolver.git",
7163   - "reference": "81c2e120522a42f623233968244baebd6b36cb6a"
  7178 + "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4"
7164 7179 },
7165 7180 "dist": {
7166 7181 "type": "zip",
7167   - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/81c2e120522a42f623233968244baebd6b36cb6a",
7168   - "reference": "81c2e120522a42f623233968244baebd6b36cb6a",
  7182 + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/f46c7fc8e207bd8a2188f54f8738f232533765a4",
  7183 + "reference": "f46c7fc8e207bd8a2188f54f8738f232533765a4",
7169 7184 "shasum": ""
7170 7185 },
7171 7186 "require": {
... ... @@ -7206,7 +7221,7 @@
7206 7221 "configuration",
7207 7222 "options"
7208 7223 ],
7209   - "time": "2019-08-08T09:29:19+00:00"
  7224 + "time": "2019-10-28T20:59:01+00:00"
7210 7225 },
7211 7226 {
7212 7227 "name": "symfony/polyfill-php70",
... ... @@ -7269,7 +7284,7 @@
7269 7284 },
7270 7285 {
7271 7286 "name": "symfony/stopwatch",
7272   - "version": "v4.3.5",
  7287 + "version": "v4.3.6",
7273 7288 "source": {
7274 7289 "type": "git",
7275 7290 "url": "https://github.com/symfony/stopwatch.git",
... ...
database/migrations/2019_10_17_095937_create_menu_reclassify_registration.php 0 → 100644
  Diff comments   View file @a50653c
... ... @@ -0,0 +1,34 @@
  1 +<?php
  2 +
  3 +use App\Menu;
  4 +use App\Process;
  5 +use Illuminate\Support\Facades\Schema;
  6 +use Illuminate\Database\Schema\Blueprint;
  7 +use Illuminate\Database\Migrations\Migration;
  8 +
  9 +class CreateMenuReclassifyRegistration extends Migration
  10 +{
  11 + /**
  12 + * Run the migrations.
  13 + *
  14 + * @return void
  15 + */
  16 + public function up()
  17 + {
  18 + Menu::query()->create([
  19 + 'parent_id' => Menu::query()->where('old', Process::MENU_SCHOOL)->firstOrFail()->getKey(),
  20 + 'title' => 'Reclassificar matrícula',
  21 + 'process' => Process::RECLASSIFY_REGISTRATION,
  22 + ]);
  23 + }
  24 +
  25 + /**
  26 + * Reverse the migrations.
  27 + *
  28 + * @return void
  29 + */
  30 + public function down()
  31 + {
  32 + Menu::query()->where('process', Process::RECLASSIFY_REGISTRATION)->delete();
  33 + }
  34 +}
... ...
database/migrations/2019_10_17_102129_add_reclassify_menu_to_user_types_with_registrations.php 0 → 100644
  Diff comments   View file @a50653c
... ... @@ -0,0 +1,57 @@
  1 +<?php
  2 +
  3 +use Illuminate\Support\Facades\Schema;
  4 +use Illuminate\Database\Schema\Blueprint;
  5 +use Illuminate\Database\Migrations\Migration;
  6 +use App\Process;
  7 +
  8 +class AddReclassifyMenuToUserTypesWithRegistrations extends Migration
  9 +{
  10 + /**
  11 + * Run the migrations.
  12 + *
  13 + * @return void
  14 + */
  15 + public function up()
  16 + {
  17 + DB::insert('
  18 + INSERT INTO pmieducar.menu_tipo_usuario (ref_cod_tipo_usuario, menu_id, cadastra, visualiza, exclui)
  19 + SELECT
  20 + ref_cod_tipo_usuario,
  21 + (
  22 + SELECT id
  23 + FROM menus
  24 + WHERE process = ?
  25 + ) as menu_id,
  26 + cadastra,
  27 + visualiza,
  28 + exclui
  29 + FROM pmieducar.menu_tipo_usuario
  30 + where menu_id = (
  31 + SELECT id
  32 + FROM menus
  33 + WHERE process = ?
  34 + )
  35 +
  36 + ', [
  37 + Process::RECLASSIFY_REGISTRATION,
  38 + Process::REGISTRATIONS,
  39 + ]);
  40 + }
  41 +
  42 + /**
  43 + * Reverse the migrations.
  44 + *
  45 + * @return void
  46 + */
  47 + public function down()
  48 + {
  49 + DB::table('pmieducar.menu_tipo_usuario')
  50 + ->whereRaw('menu_id = (
  51 + SELECT id
  52 + FROM menus
  53 + WHERE process = ?
  54 + )', [Process::RECLASSIFY_REGISTRATION])
  55 + ->delete();
  56 + }
  57 +}
... ...
ieducar/intranet/educar_ano_letivo_modulo_cad.php
  Diff comments   View file @a50653c
... ... @@ -546,7 +546,8 @@ class indice extends clsCadastro
546 546 'cod_curso_profissional',
547 547 'tipo_mediacao_didatico_pedagogico',
548 548 'nao_informar_educacenso',
549   - 'turma_mais_educacao'
  549 + 'turma_mais_educacao',
  550 + 'local_funcionamento_diferenciado'
550 551 ];
551 552  
552 553 $turmaDestino = new clsPmieducarTurma();
... ...
ieducar/intranet/educar_matricula_det.php
  Diff comments   View file @a50653c
... ... @@ -317,7 +317,7 @@ class indice extends clsDetalhe
317 317 $this->array_botao[] = 'Falecido';
318 318 $this->array_botao_url_script[] = "go(\"educar_falecido_cad.php?ref_cod_matricula={$registro['cod_matricula']}&ref_cod_aluno={$registro['ref_cod_aluno']}\");";
319 319  
320   - if ($registro['ref_ref_cod_serie']) {
  320 + if ($registro['ref_ref_cod_serie'] && $this->permissaoReclassificar()) {
321 321 $this->array_botao[] = 'Reclassificar';
322 322 $this->array_botao_url_script[] = "go(\"educar_matricula_reclassificar_cad.php?ref_cod_matricula={$registro['cod_matricula']}&ref_cod_aluno={$registro['ref_cod_aluno']}\")";
323 323 }
... ... @@ -430,6 +430,13 @@ class indice extends clsDetalhe
430 430 return $acesso->permissao_excluir(627, $this->pessoa_logada, 7, null, true);
431 431 }
432 432  
  433 + public function permissaoReclassificar()
  434 + {
  435 + $acesso = new clsPermissoes();
  436 +
  437 + return $acesso->permissao_cadastra(Process::RECLASSIFY_REGISTRATION, $this->pessoa_logada, 7, null, true);
  438 + }
  439 +
433 440 public function canCancelTransferencia($matriculaId)
434 441 {
435 442 $sql = "SELECT transferencia_solicitacao.cod_transferencia_solicitacao
... ...
ieducar/intranet/educar_matricula_reclassificar_cad.php
  Diff comments   View file @a50653c
... ... @@ -11,12 +11,14 @@ require_once &#39;modules/Avaliacao/Model/NotaAlunoDataMapper.php&#39;;
11 11 require_once 'modules/Avaliacao/Model/NotaComponenteMediaDataMapper.php';
12 12 require_once 'lib/App/Model/MatriculaSituacao.php';
13 13  
  14 +use App\Process;
  15 +
14 16 class clsIndexBase extends clsBase
15 17 {
16 18 function Formular()
17 19 {
18 20 $this->SetTitulo( "{$this->_instituicao} i-Educar - Reclassificar Matr&iacute;cula" );
19   - $this->processoAp = "578";
  21 + $this->processoAp = Process::RECLASSIFY_REGISTRATION;
20 22 }
21 23 }
22 24  
... ... @@ -60,7 +62,7 @@ class indice extends clsCadastro
60 62 $this->ref_cod_aluno=$_GET["ref_cod_aluno"];
61 63  
62 64 $obj_permissoes = new clsPermissoes();
63   - $obj_permissoes->permissao_cadastra( 578, $this->pessoa_logada, 7, "educar_matricula_lst.php?ref_cod_aluno={$this->ref_cod_aluno}" );
  65 + $obj_permissoes->permissao_cadastra( Process::RECLASSIFY_REGISTRATION, $this->pessoa_logada, 7, "educar_matricula_lst.php?ref_cod_aluno={$this->ref_cod_aluno}" );
64 66  
65 67 $obj_matricula = new clsPmieducarMatricula($this->cod_matricula);
66 68 $det_matricula = $obj_matricula->detalhe();
... ... @@ -138,7 +140,7 @@ class indice extends clsCadastro
138 140 {
139 141  
140 142 $obj_permissoes = new clsPermissoes();
141   - $obj_permissoes->permissao_cadastra( 578, $this->pessoa_logada, 7, "educar_matricula_lst.php?ref_cod_aluno={$this->ref_cod_aluno}" );
  143 + $obj_permissoes->permissao_cadastra(Process::RECLASSIFY_REGISTRATION, $this->pessoa_logada, 7, "educar_matricula_lst.php?ref_cod_aluno={$this->ref_cod_aluno}" );
142 144  
143 145 $this->data_cancel = Portabilis_Date_Utils::brToPgSQL($this->data_cancel);
144 146  
... ...
ieducar/lib/Portabilis/Report/ReportsRenderServerFactory.php
  Diff comments   View file @a50653c
1 1 <?php
2 2  
3   -use Carbon\Carbon;
4 3 use GuzzleHttp\Client;
5 4 use GuzzleHttp\Exception\GuzzleException;
  5 +use Illuminate\Support\Facades\Log;
6 6  
7 7 require_once 'lib/Portabilis/Report/ReportFactory.php';
8 8  
... ... @@ -45,6 +45,25 @@ class Portabilis_Report_ReportsRenderServerFactory extends Portabilis_Report_Rep
45 45 private $timezone;
46 46  
47 47 /**
  48 + * Loga erros da requisição ao servidor de relatórios.
  49 + *
  50 + * @param array $payload
  51 + * @param string $response
  52 + *
  53 + * @return void
  54 + */
  55 + protected function log($payload, $response)
  56 + {
  57 + $log = json_encode([
  58 + 'url' => $this->url,
  59 + 'payload' => $payload,
  60 + 'response' => $response,
  61 + ]);
  62 +
  63 + Log::error($log);
  64 + }
  65 +
  66 + /**
48 67 * @inheritdoc
49 68 */
50 69 public function setSettings($config)
... ... @@ -69,10 +88,10 @@ class Portabilis_Report_ReportsRenderServerFactory extends Portabilis_Report_Rep
69 88 * @param Portabilis_Report_ReportCore $report
70 89 * @param array $options
71 90 *
72   - * @return string
73   - *
74 91 * @throws GuzzleException
75 92 * @throws Exception
  93 + *
  94 + * @return string
76 95 */
77 96 public function dumps($report, $options = [])
78 97 {
... ... @@ -111,7 +130,7 @@ class Portabilis_Report_ReportsRenderServerFactory extends Portabilis_Report_Rep
111 130 $data = $report->getJsonData();
112 131 $data = $report->modify($data);
113 132  
114   - $response = $client->request('POST', $this->url, [
  133 + $payload = [
115 134 'json' => [
116 135 'report' => $templateName,
117 136 'url' => $url,
... ... @@ -122,15 +141,21 @@ class Portabilis_Report_ReportsRenderServerFactory extends Portabilis_Report_Rep
122 141 'Accept' => 'application/json',
123 142 'Authorization' => 'Token ' . $this->token,
124 143 ]
125   - ]);
  144 + ];
  145 +
  146 + $response = $client->request('POST', $this->url, $payload);
126 147  
127 148 $json = json_decode($response->getBody()->getContents(), true);
128 149  
129 150 if (is_null($json)) {
  151 + $this->log($payload, $response->getBody()->getContents());
  152 +
130 153 throw new Exception('Não foi possível analisar a resposta do serviço.');
131 154 }
132 155  
133 156 if ($json['success'] == false) {
  157 + $this->log($payload, $response->getBody()->getContents());
  158 +
134 159 throw new Exception($json['error'] ?? $json['message']);
135 160 }
136 161  
... ...