Download as
Browse Code »

Commit 59d80cc1394ad79f37773c50cdca61b6081ba30a

Authored by Eder Soares
Committed by GitHub
2 parents d7e56843 d7d7199a
Exists in 2.8 and in 6 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Merge pull request #666 from portabilis/portabilis-patch-2019-10-04 

[2.2] Portabilis patch 04/10/2019
Showing 146 changed files with 472 additions and 197 deletions   Show diff stats

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 146 files displayed.

composer.json
  Diff comments   View file @59d80cc
... ... @@ -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.7",
  6 + "version": "2.2.8",
7 7 "keywords": [
8 8 "Portabilis",
9 9 "i-Educar"
... ...
composer.lock
  Diff comments   View file @59d80cc
... ... @@ -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": "5a017f9e03d28d1379df94e1a0cab062",
  7 + "content-hash": "05f3300a60f7224c9d631a9447757d9d",
8 8 "packages": [
9 9 {
10 10 "name": "aws/aws-sdk-php",
11   - "version": "3.112.9",
  11 + "version": "3.112.14",
12 12 "source": {
13 13 "type": "git",
14 14 "url": "https://github.com/aws/aws-sdk-php.git",
15   - "reference": "224955fcb7ca9edc8de3e4147c0b180aeaee5a48"
  15 + "reference": "491960b26d7c02d8d9c9c998646d25a99e10fd16"
16 16 },
17 17 "dist": {
18 18 "type": "zip",
19   - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/224955fcb7ca9edc8de3e4147c0b180aeaee5a48",
20   - "reference": "224955fcb7ca9edc8de3e4147c0b180aeaee5a48",
  19 + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/491960b26d7c02d8d9c9c998646d25a99e10fd16",
  20 + "reference": "491960b26d7c02d8d9c9c998646d25a99e10fd16",
21 21 "shasum": ""
22 22 },
23 23 "require": {
... ... @@ -87,7 +87,7 @@
87 87 "s3",
88 88 "sdk"
89 89 ],
90   - "time": "2019-09-26T18:13:00+00:00"
  90 + "time": "2019-10-03T18:12:08+00:00"
91 91 },
92 92 {
93 93 "name": "cocur/slugify",
... ... @@ -2066,16 +2066,16 @@
2066 2066 },
2067 2067 {
2068 2068 "name": "nesbot/carbon",
2069   - "version": "2.24.0",
  2069 + "version": "2.25.0",
2070 2070 "source": {
2071 2071 "type": "git",
2072 2072 "url": "https://github.com/briannesbitt/Carbon.git",
2073   - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29"
  2073 + "reference": "b70da677101cca7b584c7489770d2677c2733593"
2074 2074 },
2075 2075 "dist": {
2076 2076 "type": "zip",
2077   - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/934459c5ac0658bc765ad1e53512c7c77adcac29",
2078   - "reference": "934459c5ac0658bc765ad1e53512c7c77adcac29",
  2077 + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/b70da677101cca7b584c7489770d2677c2733593",
  2078 + "reference": "b70da677101cca7b584c7489770d2677c2733593",
2079 2079 "shasum": ""
2080 2080 },
2081 2081 "require": {
... ... @@ -2122,14 +2122,14 @@
2122 2122 "homepage": "http://github.com/kylekatarnls"
2123 2123 }
2124 2124 ],
2125   - "description": "A API extension for DateTime that supports 281 different languages.",
  2125 + "description": "An API extension for DateTime that supports 281 different languages.",
2126 2126 "homepage": "http://carbon.nesbot.com",
2127 2127 "keywords": [
2128 2128 "date",
2129 2129 "datetime",
2130 2130 "time"
2131 2131 ],
2132   - "time": "2019-08-31T16:37:55+00:00"
  2132 + "time": "2019-09-30T16:22:22+00:00"
2133 2133 },
2134 2134 {
2135 2135 "name": "nikic/php-parser",
... ... @@ -4779,16 +4779,16 @@
4779 4779 },
4780 4780 {
4781 4781 "name": "doctrine/annotations",
4782   - "version": "v1.7.0",
  4782 + "version": "v1.8.0",
4783 4783 "source": {
4784 4784 "type": "git",
4785 4785 "url": "https://github.com/doctrine/annotations.git",
4786   - "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb"
  4786 + "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc"
4787 4787 },
4788 4788 "dist": {
4789 4789 "type": "zip",
4790   - "url": "https://api.github.com/repos/doctrine/annotations/zipball/fa4c4e861e809d6a1103bd620cce63ed91aedfeb",
4791   - "reference": "fa4c4e861e809d6a1103bd620cce63ed91aedfeb",
  4790 + "url": "https://api.github.com/repos/doctrine/annotations/zipball/904dca4eb10715b92569fbcd79e201d5c349b6bc",
  4791 + "reference": "904dca4eb10715b92569fbcd79e201d5c349b6bc",
4792 4792 "shasum": ""
4793 4793 },
4794 4794 "require": {
... ... @@ -4797,7 +4797,7 @@
4797 4797 },
4798 4798 "require-dev": {
4799 4799 "doctrine/cache": "1.*",
4800   - "phpunit/phpunit": "^7.5@dev"
  4800 + "phpunit/phpunit": "^7.5"
4801 4801 },
4802 4802 "type": "library",
4803 4803 "extra": {
... ... @@ -4843,7 +4843,7 @@
4843 4843 "docblock",
4844 4844 "parser"
4845 4845 ],
4846   - "time": "2019-08-08T18:11:40+00:00"
  4846 + "time": "2019-10-01T18:55:10+00:00"
4847 4847 },
4848 4848 {
4849 4849 "name": "doctrine/instantiator",
... ... @@ -5399,16 +5399,16 @@
5399 5399 },
5400 5400 {
5401 5401 "name": "mockery/mockery",
5402   - "version": "1.2.3",
  5402 + "version": "1.2.4",
5403 5403 "source": {
5404 5404 "type": "git",
5405 5405 "url": "https://github.com/mockery/mockery.git",
5406   - "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031"
  5406 + "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405"
5407 5407 },
5408 5408 "dist": {
5409 5409 "type": "zip",
5410   - "url": "https://api.github.com/repos/mockery/mockery/zipball/4eff936d83eb809bde2c57a3cea0ee9643769031",
5411   - "reference": "4eff936d83eb809bde2c57a3cea0ee9643769031",
  5410 + "url": "https://api.github.com/repos/mockery/mockery/zipball/b3453f75fd23d9fd41685f2148f4abeacabc6405",
  5411 + "reference": "b3453f75fd23d9fd41685f2148f4abeacabc6405",
5412 5412 "shasum": ""
5413 5413 },
5414 5414 "require": {
... ... @@ -5422,7 +5422,7 @@
5422 5422 "type": "library",
5423 5423 "extra": {
5424 5424 "branch-alias": {
5425   - "dev-master": "1.0.x-dev"
  5425 + "dev-master": "1.2.x-dev"
5426 5426 }
5427 5427 },
5428 5428 "autoload": {
... ... @@ -5460,7 +5460,7 @@
5460 5460 "test double",
5461 5461 "testing"
5462 5462 ],
5463   - "time": "2019-08-07T15:01:07+00:00"
  5463 + "time": "2019-09-30T08:30:27+00:00"
5464 5464 },
5465 5465 {
5466 5466 "name": "moontoast/math",
... ... @@ -5928,22 +5928,22 @@
5928 5928 },
5929 5929 {
5930 5930 "name": "phpspec/prophecy",
5931   - "version": "1.8.1",
  5931 + "version": "1.9.0",
5932 5932 "source": {
5933 5933 "type": "git",
5934 5934 "url": "https://github.com/phpspec/prophecy.git",
5935   - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76"
  5935 + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203"
5936 5936 },
5937 5937 "dist": {
5938 5938 "type": "zip",
5939   - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
5940   - "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76",
  5939 + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/f6811d96d97bdf400077a0cc100ae56aa32b9203",
  5940 + "reference": "f6811d96d97bdf400077a0cc100ae56aa32b9203",
5941 5941 "shasum": ""
5942 5942 },
5943 5943 "require": {
5944 5944 "doctrine/instantiator": "^1.0.2",
5945 5945 "php": "^5.3|^7.0",
5946   - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
  5946 + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
5947 5947 "sebastian/comparator": "^1.1|^2.0|^3.0",
5948 5948 "sebastian/recursion-context": "^1.0|^2.0|^3.0"
5949 5949 },
... ... @@ -5987,7 +5987,7 @@
5987 5987 "spy",
5988 5988 "stub"
5989 5989 ],
5990   - "time": "2019-06-13T12:50:23+00:00"
  5990 + "time": "2019-10-03T11:07:50+00:00"
5991 5991 },
5992 5992 {
5993 5993 "name": "phpunit/php-code-coverage",
... ...
config/assets.php
  Diff comments   View file @59d80cc
... ... @@ -14,7 +14,7 @@ return [
14 14 |
15 15 */
16 16  
17   - 'version' => '0.0.33',
  17 + 'version' => '0.0.34',
18 18  
19 19 /*
20 20 |--------------------------------------------------------------------------
... ...
database/migrations/2019_03_21_121126_altera_view_situacao.php 0 → 100644
  Diff comments   View file @59d80cc
... ... @@ -0,0 +1,30 @@
  1 +<?php
  2 +
  3 +use App\Support\Database\AsView;
  4 +use Illuminate\Database\Migrations\Migration;
  5 +
  6 +class AlteraViewSituacao extends Migration
  7 +{
  8 + use AsView;
  9 +
  10 + /**
  11 + * Run the migrations.
  12 + *
  13 + * @return void
  14 + */
  15 + public function up()
  16 + {
  17 + $this->createView('relatorio.view_situacao', '2019-03-21');
  18 + }
  19 +
  20 + /**
  21 + * Reverse the migrations.
  22 + *
  23 + * @return void
  24 + */
  25 + public function down()
  26 + {
  27 + $this->dropView('relatorio.view_situacao');
  28 + $this->createView('relatorio.view_situacao', '2019-02-28');
  29 + }
  30 +}
... ...
database/migrations/2019_09_20_143952_atualiza_view_situacao_20190920.php 0 → 100644
  Diff comments   View file @59d80cc
... ... @@ -0,0 +1,30 @@
  1 +<?php
  2 +
  3 +use App\Support\Database\AsView;
  4 +use Illuminate\Database\Migrations\Migration;
  5 +
  6 +class AtualizaViewSituacao20190920 extends Migration
  7 +{
  8 + use AsView;
  9 +
  10 + /**
  11 + * Run the migrations.
  12 + *
  13 + * @return void
  14 + */
  15 + public function up()
  16 + {
  17 + $this->createView('relatorio.view_situacao', '2019-09-20');
  18 + }
  19 +
  20 + /**
  21 + * Reverse the migrations.
  22 + *
  23 + * @return void
  24 + */
  25 + public function down()
  26 + {
  27 + $this->dropView('relatorio.view_situacao');
  28 + $this->createView('relatorio.view_situacao', '2019-03-21');
  29 + }
  30 +}
... ...
database/migrations/2019_09_30_101954_trim_rg_column.php 0 → 100644
  Diff comments   View file @59d80cc
... ... @@ -0,0 +1,27 @@
  1 +<?php
  2 +
  3 +use Illuminate\Support\Facades\DB;
  4 +use Illuminate\Database\Migrations\Migration;
  5 +
  6 +class TrimRgColumn extends Migration
  7 +{
  8 + /**
  9 + * Run the migrations.
  10 + *
  11 + * @return void
  12 + */
  13 + public function up()
  14 + {
  15 + DB::update('UPDATE cadastro.documento SET rg = TRIM(rg)');
  16 + }
  17 +
  18 + /**
  19 + * Reverse the migrations.
  20 + *
  21 + * @return void
  22 + */
  23 + public function down()
  24 + {
  25 + //
  26 + }
  27 +}
... ...
database/sqls/views/relatorio.view_situacao-2019-03-21.sql 0 → 100644
  Diff comments   View file @59d80cc
... ... @@ -0,0 +1,144 @@
  1 +CREATE OR REPLACE VIEW relatorio.view_situacao AS
  2 +SELECT
  3 + matricula.cod_matricula,
  4 + situacao_matricula.cod_situacao,
  5 + matricula_turma.ref_cod_turma AS cod_turma,
  6 + matricula_turma.sequencial,
  7 + (
  8 + CASE
  9 + WHEN matricula_turma.remanejado THEN
  10 + 'Remanejado'::character varying
  11 + WHEN matricula_turma.transferido THEN
  12 + 'Transferido'::character varying
  13 + WHEN matricula_turma.reclassificado THEN
  14 + 'Reclassificado'::character varying
  15 + WHEN matricula_turma.abandono THEN
  16 + 'Abandono'::character varying
  17 + WHEN matricula.aprovado = 1 THEN
  18 + 'Aprovado'::character varying
  19 + WHEN matricula.aprovado = 12 THEN
  20 + 'Ap. Depen.'::character varying
  21 + WHEN matricula.aprovado = 13 THEN
  22 + 'Ap. Cons.'::character varying
  23 + WHEN matricula.aprovado = 2 THEN
  24 + 'Reprovado'::character varying
  25 + WHEN matricula.aprovado = 3 THEN
  26 + 'Cursando'::character varying
  27 + WHEN matricula.aprovado = 4 THEN
  28 + 'Transferido'::character varying
  29 + WHEN matricula.aprovado = 5 THEN
  30 + 'Reclassificado'::character varying
  31 + WHEN matricula.aprovado = 6 THEN
  32 + 'Abandono'::character varying
  33 + WHEN matricula.aprovado = 14 THEN
  34 + 'Rp. Faltas'::character varying
  35 + WHEN matricula.aprovado = 15 THEN
  36 + 'Falecido'::character varying
  37 + ELSE 'Recl'::character varying
  38 + END
  39 + ) AS texto_situacao,
  40 + (
  41 + CASE
  42 + WHEN matricula_turma.remanejado THEN
  43 + 'Rem'::character varying
  44 + WHEN matricula_turma.transferido THEN
  45 + 'Trs'::character varying
  46 + WHEN matricula_turma.reclassificado THEN
  47 + 'Recl'::character varying
  48 + WHEN matricula_turma.abandono THEN
  49 + 'Aba'::character varying
  50 + WHEN matricula.aprovado = 1 THEN
  51 + 'Apr'::character varying
  52 + WHEN matricula.aprovado = 12 THEN
  53 + 'ApDp'::character varying
  54 + WHEN matricula.aprovado = 13 THEN
  55 + 'ApCo'::character varying
  56 + WHEN matricula.aprovado = 2 THEN
  57 + 'Rep'::character varying
  58 + WHEN matricula.aprovado = 3 THEN
  59 + 'Cur'::character varying
  60 + WHEN matricula.aprovado = 4 THEN
  61 + 'Trs'::character varying
  62 + WHEN matricula.aprovado = 5 THEN
  63 + 'Recl'::character varying
  64 + WHEN matricula.aprovado = 6 THEN
  65 + 'Aba'::character varying
  66 + WHEN matricula.aprovado = 14 THEN
  67 + 'RpFt'::character varying
  68 + WHEN matricula.aprovado = 15 THEN
  69 + 'Fal'::character varying
  70 + ELSE 'Recl'::character varying
  71 + END
  72 + ) AS texto_situacao_simplificado
  73 +FROM
  74 + relatorio.situacao_matricula,
  75 + pmieducar.matricula
  76 +JOIN pmieducar.escola
  77 + ON escola.cod_escola = matricula.ref_ref_cod_escola
  78 +JOIN pmieducar.instituicao
  79 + ON instituicao.cod_instituicao = escola.ref_cod_instituicao
  80 +LEFT JOIN pmieducar.matricula_turma
  81 + ON matricula_turma.ref_cod_matricula = matricula.cod_matricula
  82 +WHERE TRUE
  83 + AND matricula.ativo = 1
  84 + AND (
  85 + CASE WHEN instituicao.data_base_remanejamento IS NULL THEN
  86 + COALESCE(matricula_turma.remanejado, false) = false
  87 + ELSE
  88 + true
  89 + END
  90 + )
  91 + AND (
  92 + matricula_turma.ativo = 1
  93 + OR
  94 + (
  95 + instituicao.data_base_remanejamento IS NOT NULL
  96 + AND matricula_turma.data_exclusao::date > instituicao.data_base_remanejamento
  97 + AND (
  98 + matricula_turma.transferido
  99 + OR matricula_turma.remanejado
  100 + OR matricula_turma.reclassificado
  101 + OR matricula_turma.abandono
  102 + OR matricula_turma.falecido
  103 + )
  104 + )
  105 + )
  106 + AND
  107 + (
  108 + CASE
  109 + WHEN situacao_matricula.cod_situacao = 10 THEN
  110 + matricula.aprovado = ANY (ARRAY[1, 2, 3, 4, 5, 6, 12, 13, 14, 15])
  111 + WHEN situacao_matricula.cod_situacao = 9 THEN
  112 + (matricula.aprovado = ANY (ARRAY[1, 2, 3, 5, 12, 13, 14]))
  113 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  114 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  115 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  116 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  117 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  118 + WHEN
  119 + situacao_matricula.cod_situacao = 2 THEN
  120 + (matricula.aprovado = ANY (ARRAY[2, 14]))
  121 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  122 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  123 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  124 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  125 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  126 + WHEN
  127 + situacao_matricula.cod_situacao = 1 THEN
  128 + (matricula.aprovado = ANY (ARRAY[1, 12, 13]))
  129 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  130 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  131 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  132 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  133 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  134 + WHEN situacao_matricula.cod_situacao = ANY (ARRAY[3, 12, 13]) THEN
  135 + matricula.aprovado = situacao_matricula.cod_situacao
  136 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  137 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  138 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  139 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  140 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  141 + ELSE
  142 + matricula.aprovado = situacao_matricula.cod_situacao
  143 + END
  144 + );
... ...
database/sqls/views/relatorio.view_situacao-2019-09-20.sql 0 → 100644
  Diff comments   View file @59d80cc
... ... @@ -0,0 +1,155 @@
  1 +CREATE OR REPLACE VIEW relatorio.view_situacao AS
  2 +SELECT
  3 + matricula.cod_matricula,
  4 + situacao_matricula.cod_situacao,
  5 + matricula_turma.ref_cod_turma AS cod_turma,
  6 + matricula_turma.sequencial,
  7 + (
  8 + CASE
  9 + WHEN matricula_turma.remanejado THEN
  10 + 'Remanejado'::character varying
  11 + WHEN matricula_turma.transferido THEN
  12 + 'Transferido'::character varying
  13 + WHEN matricula_turma.reclassificado THEN
  14 + 'Reclassificado'::character varying
  15 + WHEN matricula_turma.abandono THEN
  16 + 'Abandono'::character varying
  17 + WHEN matricula.aprovado = 1 THEN
  18 + 'Aprovado'::character varying
  19 + WHEN matricula.aprovado = 12 THEN
  20 + 'Ap. Depen.'::character varying
  21 + WHEN matricula.aprovado = 13 THEN
  22 + 'Ap. Cons.'::character varying
  23 + WHEN matricula.aprovado = 2 THEN
  24 + 'Reprovado'::character varying
  25 + WHEN matricula.aprovado = 3 THEN
  26 + 'Cursando'::character varying
  27 + WHEN matricula.aprovado = 4 THEN
  28 + 'Transferido'::character varying
  29 + WHEN matricula.aprovado = 5 THEN
  30 + 'Reclassificado'::character varying
  31 + WHEN matricula.aprovado = 6 THEN
  32 + 'Abandono'::character varying
  33 + WHEN matricula.aprovado = 14 THEN
  34 + 'Rp. Faltas'::character varying
  35 + WHEN matricula.aprovado = 15 THEN
  36 + 'Falecido'::character varying
  37 + ELSE 'Recl'::character varying
  38 + END
  39 + ) AS texto_situacao,
  40 + (
  41 + CASE
  42 + WHEN matricula_turma.remanejado THEN
  43 + 'Rem'::character varying
  44 + WHEN matricula_turma.transferido THEN
  45 + 'Trs'::character varying
  46 + WHEN matricula_turma.reclassificado THEN
  47 + 'Recl'::character varying
  48 + WHEN matricula_turma.abandono THEN
  49 + 'Aba'::character varying
  50 + WHEN matricula.aprovado = 1 THEN
  51 + 'Apr'::character varying
  52 + WHEN matricula.aprovado = 12 THEN
  53 + 'ApDp'::character varying
  54 + WHEN matricula.aprovado = 13 THEN
  55 + 'ApCo'::character varying
  56 + WHEN matricula.aprovado = 2 THEN
  57 + 'Rep'::character varying
  58 + WHEN matricula.aprovado = 3 THEN
  59 + 'Cur'::character varying
  60 + WHEN matricula.aprovado = 4 THEN
  61 + 'Trs'::character varying
  62 + WHEN matricula.aprovado = 5 THEN
  63 + 'Recl'::character varying
  64 + WHEN matricula.aprovado = 6 THEN
  65 + 'Aba'::character varying
  66 + WHEN matricula.aprovado = 14 THEN
  67 + 'RpFt'::character varying
  68 + WHEN matricula.aprovado = 15 THEN
  69 + 'Fal'::character varying
  70 + ELSE 'Recl'::character varying
  71 + END
  72 + ) AS texto_situacao_simplificado
  73 +FROM
  74 + relatorio.situacao_matricula,
  75 + pmieducar.matricula
  76 +JOIN pmieducar.escola
  77 + ON escola.cod_escola = matricula.ref_ref_cod_escola
  78 +JOIN pmieducar.instituicao
  79 + ON instituicao.cod_instituicao = escola.ref_cod_instituicao
  80 +LEFT JOIN pmieducar.matricula_turma
  81 + ON matricula_turma.ref_cod_matricula = matricula.cod_matricula
  82 +WHERE TRUE
  83 + AND matricula.ativo = 1
  84 + AND (
  85 + CASE WHEN instituicao.data_base_remanejamento IS NULL THEN
  86 + COALESCE(matricula_turma.remanejado, false) = false
  87 + ELSE
  88 + COALESCE(matricula_turma.remanejado, false) = false OR
  89 + matricula_turma.data_exclusao::date > instituicao.data_base_remanejamento
  90 + END
  91 + )
  92 + AND (
  93 + matricula_turma.ativo = 1
  94 + OR
  95 + (
  96 + (
  97 + instituicao.data_base_remanejamento IS NOT NULL
  98 + AND matricula_turma.data_exclusao::date > instituicao.data_base_remanejamento
  99 + OR (
  100 + matricula_turma.sequencial = (
  101 + select max(sequencial)
  102 + from pmieducar.matricula_turma mt
  103 + where mt.ref_cod_matricula = matricula_turma.ref_cod_matricula
  104 + and mt.ref_cod_turma = matricula_turma.ref_cod_turma
  105 + )
  106 + )
  107 + )
  108 + AND (
  109 + matricula_turma.transferido
  110 + OR matricula_turma.remanejado
  111 + OR matricula_turma.reclassificado
  112 + OR matricula_turma.abandono
  113 + OR matricula_turma.falecido
  114 + )
  115 + )
  116 + )
  117 + AND
  118 + (
  119 + CASE
  120 + WHEN situacao_matricula.cod_situacao = 10 THEN
  121 + matricula.aprovado = ANY (ARRAY[1, 2, 3, 4, 5, 6, 12, 13, 14, 15])
  122 + WHEN situacao_matricula.cod_situacao = 9 THEN
  123 + (matricula.aprovado = ANY (ARRAY[1, 2, 3, 5, 12, 13, 14]))
  124 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  125 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  126 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  127 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  128 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  129 + WHEN
  130 + situacao_matricula.cod_situacao = 2 THEN
  131 + (matricula.aprovado = ANY (ARRAY[2, 14]))
  132 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  133 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  134 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  135 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  136 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  137 + WHEN
  138 + situacao_matricula.cod_situacao = 1 THEN
  139 + (matricula.aprovado = ANY (ARRAY[1, 12, 13]))
  140 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  141 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  142 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  143 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  144 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  145 + WHEN situacao_matricula.cod_situacao = ANY (ARRAY[3, 12, 13]) THEN
  146 + matricula.aprovado = situacao_matricula.cod_situacao
  147 + AND (NOT matricula_turma.reclassificado OR matricula_turma.reclassificado IS NULL)
  148 + AND (NOT matricula_turma.abandono OR matricula_turma.abandono IS NULL)
  149 + AND (NOT matricula_turma.remanejado OR matricula_turma.remanejado IS NULL)
  150 + AND (NOT matricula_turma.transferido OR matricula_turma.transferido IS NULL)
  151 + AND (NOT matricula_turma.falecido OR matricula_turma.falecido IS NULL)
  152 + ELSE
  153 + matricula.aprovado = situacao_matricula.cod_situacao
  154 + END
  155 + );
... ...
ieducar/intranet/educar_abandono_cad.php
  Diff comments   View file @59d80cc
... ... @@ -15,7 +15,6 @@ class clsIndexBase extends clsBase
15 15 {
16 16 $this->SetTitulo( "{$this->_instituicao} i-Educar - Transfer&ecirc;ncia Solicita&ccedil;&atilde;o" );
17 17 $this->processoAp = "578";
18   - $this->addEstilo("localizacaoSistema");
19 18 }
20 19 }
21 20  
... ...
ieducar/intranet/educar_abandono_tipo_cad.php
  Diff comments   View file @59d80cc
... ... @@ -37,7 +37,6 @@ class clsIndexBase extends clsBase
37 37 {
38 38 $this->SetTitulo( "{$this->_instituicao} i-Educar - Motivo Abandono" );
39 39 $this->processoAp = "950";
40   - $this->addEstilo("localizacaoSistema");
41 40 }
42 41 }
43 42  
... ...
ieducar/intranet/educar_abandono_tipo_det.php
  Diff comments   View file @59d80cc
... ... @@ -36,7 +36,6 @@ class clsIndexBase extends clsBase
36 36 {
37 37 $this->SetTitulo( "{$this->_instituicao} i-Educar - Motivo Abandono" );
38 38 $this->processoAp = "950";
39   - $this->addEstilo("localizacaoSistema");
40 39 }
41 40 }
42 41  
... ...
ieducar/intranet/educar_abandono_tipo_lst.php
  Diff comments   View file @59d80cc
... ... @@ -35,7 +35,6 @@ class clsIndexBase extends clsBase
35 35 {
36 36 $this->SetTitulo( "{$this->_instituicao} i-Educar - Motivo Abandono" );
37 37 $this->processoAp = "950";
38   - $this->addEstilo("localizacaoSistema");
39 38 }
40 39 }
41 40  
... ...
ieducar/intranet/educar_aluno_beneficio_cad.php
  Diff comments   View file @59d80cc
... ... @@ -13,7 +13,6 @@ class clsIndexBase extends clsBase
13 13 {
14 14 $this->SetTitulo( "{$this->_instituicao} i-Educar - Benef&iacute;cio Aluno" );
15 15 $this->processoAp = "581";
16   - $this->addEstilo("localizacaoSistema");
17 16 }
18 17 }
19 18  
... ...
ieducar/intranet/educar_aluno_beneficio_det.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Benef&iacute;cio Aluno" );
14 14 $this->processoAp = "581";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_aluno_beneficio_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Benefício do aluno");
13 13 $this->processoAp = "581";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_avaliacao_desempenho_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} Servidores - Avalia&ccedil;&atilde;o Desempenho" );
14 14 $this->processoAp = "635";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_avaliacao_desempenho_det.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} Servidores - Avalia&ccedil;&atilde;o Desempenho" );
14 14 $this->processoAp = "635";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_avaliacao_desempenho_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} Servidores - Avaliação Desempenho" );
13 13 $this->processoAp = "635";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_bloqueio_ano_letivo_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Bloqueio do ano letivo" );
14 14 $this->processoAp = "21251";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_bloqueio_ano_letivo_det.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Bloqueio do ano letivo" );
14 14 $this->processoAp = "21251";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_bloqueio_ano_letivo_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Bloqueio do ano letivo" );
13 13 $this->processoAp = "21251";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_bloqueio_lancamento_faltas_notas_cad.php
  Diff comments   View file @59d80cc
... ... @@ -50,7 +50,6 @@ class clsIndexBase extends clsBase
50 50 {
51 51 $this->SetTitulo($this->_instituicao . ' i-Educar - Bloqueio de lançamento de notas e faltas por etapa');
52 52 $this->processoAp = 999848;
53   - $this->addEstilo("localizacaoSistema");
54 53 }
55 54 }
56 55  
... ...
ieducar/intranet/educar_bloqueio_lancamento_faltas_notas_det.php
  Diff comments   View file @59d80cc
... ... @@ -49,7 +49,6 @@ class clsIndexBase extends clsBase
49 49 {
50 50 $this->SetTitulo($this->_instituicao . ' i-Educar - Bloqueio de lançamento de notas e faltas por etapa');
51 51 $this->processoAp = 999848;
52   - $this->addEstilo("localizacaoSistema");
53 52 }
54 53 }
55 54  
... ...
ieducar/intranet/educar_bloqueio_lancamento_faltas_notas_lst.php
  Diff comments   View file @59d80cc
... ... @@ -51,7 +51,6 @@ class clsIndexBase extends clsBase
51 51 {
52 52 $this->SetTitulo($this->_instituicao . ' i-Educar - Bloqueio de lançamento de notas e faltas por etapa');
53 53 $this->processoAp = 999848;
54   - $this->addEstilo("localizacaoSistema");
55 54 }
56 55 }
57 56  
... ...
ieducar/intranet/educar_calendario_ano_letivo_cad.php
  Diff comments   View file @59d80cc
... ... @@ -16,7 +16,6 @@ class clsIndexBase extends clsBase
16 16 {
17 17 $this->SetTitulo( "{$this->_instituicao} i-Educar - Calendario Ano Letivo" );
18 18 $this->processoAp = "620";
19   - $this->addEstilo("localizacaoSistema");
20 19 }
21 20 }
22 21  
... ...
ieducar/intranet/educar_calendario_ano_letivo_lst.php
  Diff comments   View file @59d80cc
... ... @@ -19,7 +19,6 @@ class clsIndexBase extends clsBase
19 19 $this->SetTitulo($this->_instituicao . ' i-Educar - Calendários');
20 20 $this->addScript('calendario');
21 21 $this->processoAp = 620;
22   - $this->addEstilo("localizacaoSistema");
23 22 }
24 23 }
25 24  
... ...
ieducar/intranet/educar_calendario_dia_motivo_cad.php
  Diff comments   View file @59d80cc
... ... @@ -16,7 +16,6 @@ class clsIndexBase extends clsBase
16 16 {
17 17 $this->SetTitulo( "{$this->_instituicao} i-Educar - Calend&aacute;rio Dia Motivo" );
18 18 $this->processoAp = "576";
19   - $this->addEstilo("localizacaoSistema");
20 19 }
21 20 }
22 21  
... ...
ieducar/intranet/educar_calendario_dia_motivo_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Calend&aacute;rio Dia Motivo" );
13 13 $this->processoAp = "576";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_calendario_dia_motivo_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Calend&aacute;rio Dia Motivo" );
13 13 $this->processoAp = "576";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_componente_curricular_lst.php
  Diff comments   View file @59d80cc
... ... @@ -15,7 +15,6 @@ class clsIndexBase extends clsBase
15 15 {
16 16 $this->SetTitulo( "{$this->_instituicao} i-Educar - Componentes curriculares" );
17 17 $this->processoAp = "946";
18   - $this->addEstilo("localizacaoSistema");
19 18 }
20 19 }
21 20  
... ...
ieducar/intranet/educar_componentes_serie_cad.php
  Diff comments   View file @59d80cc
... ... @@ -51,7 +51,6 @@ class clsIndexBase extends clsBase
51 51 {
52 52 $this->SetTitulo($this->_instituicao . ' i-Educar - S&eacute;rie');
53 53 $this->processoAp = '9998859';
54   - $this->addEstilo("localizacaoSistema");
55 54 }
56 55 }
57 56  
... ...
ieducar/intranet/educar_componentes_serie_lst.php
  Diff comments   View file @59d80cc
... ... @@ -49,7 +49,6 @@ class clsIndexBase extends clsBase
49 49 {
50 50 $this->SetTitulo($this->_instituicao . ' i-Educar - Componentes da série');
51 51 $this->processoAp = '9998859';
52   - $this->addEstilo("localizacaoSistema");
53 52 }
54 53 }
55 54  
... ...
ieducar/intranet/educar_consulta_movimento_geral.php
  Diff comments   View file @59d80cc
... ... @@ -8,7 +8,6 @@ class clsIndexBase extends clsBase
8 8 public function Formular()
9 9 {
10 10 $this->SetTitulo($this->_instituicao . ' i-Educar - Consulta de movimento geral');
11   - $this->addEstilo("localizacaoSistema");
12 11 $this->processoAp = 9998900;
13 12 }
14 13 }
... ...
ieducar/intranet/educar_consulta_movimento_mensal.php
  Diff comments   View file @59d80cc
... ... @@ -8,7 +8,6 @@ class clsIndexBase extends clsBase
8 8 public function Formular()
9 9 {
10 10 $this->SetTitulo($this->_instituicao . ' i-Educar - Consulta de movimento mensal');
11   - $this->addEstilo("localizacaoSistema");
12 11 $this->processoAp = 9998910;
13 12 }
14 13 }
... ...
ieducar/intranet/educar_curso_det.php
  Diff comments   View file @59d80cc
... ... @@ -49,7 +49,6 @@ class clsIndexBase extends clsBase
49 49 {
50 50 $this->SetTitulo($this->_instituicao . ' i-Educar - Curso');
51 51 $this->processoAp = '566';
52   - $this->addEstilo("localizacaoSistema");
53 52 }
54 53 }
55 54  
... ...
ieducar/intranet/educar_curso_lst.php
  Diff comments   View file @59d80cc
... ... @@ -52,7 +52,6 @@ class clsIndexBase extends clsBase
52 52 {
53 53 $this->SetTitulo($this->_instituicao . ' i-Educar - Curso');
54 54 $this->processoAp = '566';
55   - $this->addEstilo("localizacaoSistema");
56 55 }
57 56 }
58 57  
... ...
ieducar/intranet/educar_deficiencia_det.php
  Diff comments   View file @59d80cc
... ... @@ -16,7 +16,6 @@ class clsIndexBase extends clsBase
16 16 {
17 17 $this->SetTitulo( "{$this->_instituicao} i-Educar - Defici&ecirc;ncia" );
18 18 $this->processoAp = "631";
19   - $this->addEstilo("localizacaoSistema");
20 19 }
21 20 }
22 21  
... ...
ieducar/intranet/educar_deficiencia_lst.php
  Diff comments   View file @59d80cc
... ... @@ -15,7 +15,6 @@ class clsIndexBase extends clsBase
15 15 {
16 16 $this->SetTitulo( "{$this->_instituicao} i-Educar - Defici&ecirc;ncia" );
17 17 $this->processoAp = "631";
18   - $this->addEstilo("localizacaoSistema");
19 18 }
20 19 }
21 20  
... ...
ieducar/intranet/educar_disciplina_dependencia_cad.php
  Diff comments   View file @59d80cc
... ... @@ -50,7 +50,6 @@ class clsIndexBase extends clsBase
50 50 {
51 51 $this->SetTitulo($this->_instituicao . ' i-Educar - Dispensa Componente Curricular');
52 52 $this->processoAp = 578;
53   - $this->addEstilo("localizacaoSistema");
54 53 }
55 54 }
56 55  
... ...
ieducar/intranet/educar_disciplina_dependencia_det.php
  Diff comments   View file @59d80cc
... ... @@ -50,7 +50,6 @@ class clsIndexBase extends clsBase
50 50 {
51 51 $this->SetTitulo($this->_instituicao . ' i-Educar - Disciplina depend&ecirc;ncia');
52 52 $this->processoAp = 578;
53   - $this->addEstilo("localizacaoSistema");
54 53 }
55 54 }
56 55  
... ...
ieducar/intranet/educar_disciplina_dependencia_lst.php
  Diff comments   View file @59d80cc
... ... @@ -51,7 +51,6 @@ class clsIndexBase extends clsBase
51 51 {
52 52 $this->SetTitulo($this->_instituicao . ' i-Educar - Disciplina de dependência');
53 53 $this->processoAp = 578;
54   - $this->addEstilo("localizacaoSistema");
55 54 }
56 55 }
57 56  
... ...
ieducar/intranet/educar_dispensa_disciplina_det.php
  Diff comments   View file @59d80cc
... ... @@ -50,7 +50,6 @@ class clsIndexBase extends clsBase
50 50 {
51 51 $this->SetTitulo($this->_instituicao . ' i-Educar - Dispensa Componente Curricular');
52 52 $this->processoAp = 578;
53   - $this->addEstilo("localizacaoSistema");
54 53 }
55 54 }
56 55  
... ...
ieducar/intranet/educar_dispensa_disciplina_lst.php
  Diff comments   View file @59d80cc
... ... @@ -51,7 +51,6 @@ class clsIndexBase extends clsBase
51 51 {
52 52 $this->SetTitulo($this->_instituicao . ' i-Educar - Dispensa Componente Curricular');
53 53 $this->processoAp = 578;
54   - $this->addEstilo("localizacaoSistema");
55 54 }
56 55 }
57 56  
... ...
ieducar/intranet/educar_escola_ano_letivo_cad.php
  Diff comments   View file @59d80cc
... ... @@ -49,7 +49,6 @@ class clsIndexBase extends clsBase
49 49 {
50 50 $this->SetTitulo($this->_instituicao . ' i-Educar - Escola Ano Letivo');
51 51 $this->processoAp = 561;
52   - $this->addEstilo("localizacaoSistema");
53 52 }
54 53 }
55 54  
... ...
ieducar/intranet/educar_escola_localizacao_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Escola Localiza&ccedil;&atilde;o" );
14 14 $this->processoAp = "562";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_escola_localizacao_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Escola Localiza&ccedil;&atilde;o" );
13 13 $this->processoAp = "562";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_escola_localizacao_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Escola Localiza&ccedil;&atilde;o" );
13 13 $this->processoAp = "562";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_escola_rede_ensino_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Escola Rede Ensino" );
14 14 $this->processoAp = "647";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_escola_rede_ensino_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Escola Rede Ensino" );
13 13 $this->processoAp = "647";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_escola_rede_ensino_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Escola Rede Ensino" );
13 13 $this->processoAp = "647";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_escola_serie_cad.php
  Diff comments   View file @59d80cc
... ... @@ -58,7 +58,6 @@ class clsIndexBase extends clsBase
58 58 {
59 59 $this->SetTitulo($this->_instituicao . ' i-Educar - Escola S&eacute;rie');
60 60 $this->processoAp = 585;
61   - $this->addEstilo("localizacaoSistema");
62 61 }
63 62 }
64 63  
... ...
ieducar/intranet/educar_escola_serie_det.php
  Diff comments   View file @59d80cc
... ... @@ -51,7 +51,6 @@ class clsIndexBase extends clsBase
51 51 {
52 52 $this->SetTitulo($this->_instituicao . ' i-Educar - Escola S&eacute;rie');
53 53 $this->processoAp = '585';
54   - $this->addEstilo("localizacaoSistema");
55 54 }
56 55 }
57 56  
... ...
ieducar/intranet/educar_escola_serie_lst.php
  Diff comments   View file @59d80cc
... ... @@ -49,7 +49,6 @@ class clsIndexBase extends clsBase
49 49 {
50 50 $this->SetTitulo($this->_instituicao . ' i-Educar - Séries da escola');
51 51 $this->processoAp = '585';
52   - $this->addEstilo("localizacaoSistema");
53 52 }
54 53 }
55 54  
... ...
ieducar/intranet/educar_escolaridade_cad.php
  Diff comments   View file @59d80cc
... ... @@ -43,7 +43,6 @@ class clsIndexBase extends clsBase
43 43 {
44 44 $this->SetTitulo($this->_instituicao . ' Servidores - Escolaridade');
45 45 $this->processoAp = '632';
46   - $this->addEstilo("localizacaoSistema");
47 46 }
48 47 }
49 48  
... ...
ieducar/intranet/educar_escolaridade_det.php
  Diff comments   View file @59d80cc
... ... @@ -40,7 +40,6 @@ class clsIndexBase extends clsBase
40 40 {
41 41 $this->SetTitulo($this->_instituicao . ' Servidores - Escolaridade');
42 42 $this->processoAp = '632';
43   - $this->addEstilo("localizacaoSistema");
44 43 }
45 44 }
46 45  
... ...
ieducar/intranet/educar_escolaridade_lst.php
  Diff comments   View file @59d80cc
... ... @@ -39,7 +39,6 @@ class clsIndexBase extends clsBase
39 39 function Formular() {
40 40 $this->SetTitulo($this->_instituicao . ' i-Educar - Escolaridade do servidor');
41 41 $this->processoAp = '632';
42   - $this->addEstilo("localizacaoSistema");
43 42 }
44 43 }
45 44  
... ...
ieducar/intranet/educar_falecido_cad.php
  Diff comments   View file @59d80cc
... ... @@ -15,7 +15,6 @@ class clsIndexBase extends clsBase
15 15 {
16 16 $this->SetTitulo( "{$this->_instituicao} i-Educar - Transfer&ecirc;ncia Solicita&ccedil;&atilde;o" );
17 17 $this->processoAp = "578";
18   - $this->addEstilo("localizacaoSistema");
19 18 }
20 19 }
21 20  
... ...
ieducar/intranet/educar_falta_atraso_cad.php
  Diff comments   View file @59d80cc
... ... @@ -54,7 +54,6 @@ class clsIndexBase extends clsBase
54 54 {
55 55 $this->SetTitulo($this->_instituicao . ' Servidores - Falta Atraso');
56 56 $this->processoAp = 635;
57   - $this->addEstilo("localizacaoSistema");
58 57 }
59 58 }
60 59  
... ...
ieducar/intranet/educar_falta_atraso_det.php
  Diff comments   View file @59d80cc
... ... @@ -49,7 +49,6 @@ class clsIndexBase extends clsBase
49 49 {
50 50 $this->SetTitulo($this->_instituicao . ' Servidores - Falta Atraso');
51 51 $this->processoAp = 635;
52   - $this->addEstilo("localizacaoSistema");
53 52 }
54 53 }
55 54  
... ...
ieducar/intranet/educar_falta_atraso_lst.php
  Diff comments   View file @59d80cc
... ... @@ -50,7 +50,6 @@ class clsIndexBase extends clsBase
50 50 {
51 51 $this->SetTitulo($this->_instituicao . ' Servidores - Falta Atraso');
52 52 $this->processoAp = 635;
53   - $this->addEstilo("localizacaoSistema");
54 53 }
55 54 }
56 55  
... ...
ieducar/intranet/educar_funcao_cad.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} Servidores - Funções do servidor" );
13 13 $this->processoAp = "634";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_funcao_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} Servidores - Funções do servidor" );
13 13 $this->processoAp = "634";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_funcao_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} Servidores - Funções do servidor" );
13 13 $this->processoAp = "634";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_habilitacao_cad.php
  Diff comments   View file @59d80cc
... ... @@ -16,7 +16,6 @@ class clsIndexBase extends clsBase
16 16 {
17 17 $this->SetTitulo( "{$this->_instituicao} i-Educar - Habilita&ccedil;&atilde;o" );
18 18 $this->processoAp = "573";
19   - $this->addEstilo("localizacaoSistema");
20 19 }
21 20 }
22 21  
... ...
ieducar/intranet/educar_habilitacao_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Habilita&ccedil;&atilde;o" );
13 13 $this->processoAp = "573";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_habilitacao_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Habilita&ccedil;&atilde;o" );
13 13 $this->processoAp = "573";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_infra_comodo_funcao_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Tipo de ambiente" );
14 14 $this->processoAp = "572";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_infra_comodo_funcao_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Tipo de ambiente" );
13 13 $this->processoAp = "572";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_infra_comodo_funcao_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Tipo de ambiente" );
13 13 $this->processoAp = "572";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_infra_predio_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Infra Predio" );
14 14 $this->processoAp = "567";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_infra_predio_comodo_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ambiente" );
14 14 $this->processoAp = "574";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_infra_predio_comodo_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ambiente" );
13 13 $this->processoAp = "574";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_infra_predio_comodo_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ambientes " );
13 13 $this->processoAp = "574";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_infra_predio_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Infra Predio" );
13 13 $this->processoAp = "567";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_infra_predio_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Infra Predio" );
13 13 $this->processoAp = "567";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_instituicao_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Institui&ccedil;&atilde;o" );
13 13 $this->processoAp = "559";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_instituicao_lst.php
  Diff comments   View file @59d80cc
... ... @@ -36,7 +36,6 @@ class clsIndexBase extends clsBase
36 36 {
37 37 $this->SetTitulo( "{$this->_instituicao} i-Educar - Instituicao" );
38 38 $this->processoAp = "559";
39   - $this->addEstilo("localizacaoSistema");
40 39 }
41 40 }
42 41  
... ...
ieducar/intranet/educar_matricula_etapa_turma_cad.php
  Diff comments   View file @59d80cc
... ... @@ -13,7 +13,6 @@ class clsIndexBase extends clsBase
13 13 {
14 14 $this->SetTitulo("{$this->_instituicao} i-Educar - Etapa do aluno");
15 15 $this->processoAp = "578";
16   - $this->addEstilo("localizacaoSistema");
17 16 }
18 17 }
19 18  
... ...
ieducar/intranet/educar_matricula_ocorrencia_disciplinar_cad.php
  Diff comments   View file @59d80cc
... ... @@ -13,7 +13,6 @@ class clsIndexBase extends clsBase
13 13 {
14 14 $this->SetTitulo("{$this->_instituicao} i-Educar - Ocorr&ecirc;ncia Disciplinar");
15 15 $this->processoAp = '578';
16   - $this->addEstilo('localizacaoSistema');
17 16 }
18 17 }
19 18  
... ...
ieducar/intranet/educar_matricula_ocorrencia_disciplinar_det.php
  Diff comments   View file @59d80cc
... ... @@ -37,7 +37,6 @@ class clsIndexBase extends clsBase
37 37 {
38 38 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ocorr&ecirc;ncia Disciplinar" );
39 39 $this->processoAp = "578";
40   - $this->addEstilo("localizacaoSistema");
41 40 }
42 41 }
43 42  
... ...
ieducar/intranet/educar_matricula_ocorrencia_disciplinar_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ocorr&ecirc;ncia Disciplinar" );
13 13 $this->processoAp = "578";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_matricula_reclassificar_cad.php
  Diff comments   View file @59d80cc
... ... @@ -17,7 +17,6 @@ class clsIndexBase extends clsBase
17 17 {
18 18 $this->SetTitulo( "{$this->_instituicao} i-Educar - Reclassificar Matr&iacute;cula" );
19 19 $this->processoAp = "578";
20   - $this->addEstilo("localizacaoSistema");
21 20 }
22 21 }
23 22  
... ...
ieducar/intranet/educar_matricula_turma_tipo_aee_cad.php
  Diff comments   View file @59d80cc
... ... @@ -18,7 +18,6 @@ class clsIndexBase extends clsBase
18 18 {
19 19 $this->SetTitulo("{$this->_instituicao} i-Educar - Tipo do AEE do aluno");
20 20 $this->processoAp = "578";
21   - $this->addEstilo("localizacaoSistema");
22 21 }
23 22 }
24 23  
... ...
ieducar/intranet/educar_matricula_turma_turno_cad.php
  Diff comments   View file @59d80cc
... ... @@ -13,7 +13,6 @@ class clsIndexBase extends clsBase
13 13 {
14 14 $this->SetTitulo("{$this->_instituicao} i-Educar - Turno do aluno");
15 15 $this->processoAp = "578";
16   - $this->addEstilo("localizacaoSistema");
17 16 }
18 17 }
19 18  
... ...
ieducar/intranet/educar_modulo_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Etapa" );
14 14 $this->processoAp = "584";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_modulo_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo("{$this->_instituicao} i-Educar - Etapa");
13 13 $this->processoAp = "584";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_modulo_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo("{$this->_instituicao} i-Educar - Etapa");
13 13 $this->processoAp = "584";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_nivel_ensino_cad.php
  Diff comments   View file @59d80cc
... ... @@ -16,7 +16,6 @@ class clsIndexBase extends clsBase
16 16 {
17 17 $this->SetTitulo( "{$this->_instituicao} i-Educar - N&iacute;vel Ensino" );
18 18 $this->processoAp = "571";
19   - $this->addEstilo("localizacaoSistema");
20 19 }
21 20 }
22 21  
... ...
ieducar/intranet/educar_nivel_ensino_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Nivel Ensino" );
13 13 $this->processoAp = "571";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_nivel_ensino_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - N&iacute;vel Ensino" );
13 13 $this->processoAp = "571";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_ordenar_alunos_turma.php
  Diff comments   View file @59d80cc
... ... @@ -51,7 +51,6 @@ class clsIndexBase extends clsBase
51 51 {
52 52 $this->SetTitulo($this->_instituicao . ' i-Educar - S&eacute;rie');
53 53 $this->processoAp = '586';
54   - $this->addEstilo("localizacaoSistema");
55 54 }
56 55 }
57 56  
... ...
ieducar/intranet/educar_parecer_turma_cad.php
  Diff comments   View file @59d80cc
... ... @@ -13,7 +13,6 @@ class clsIndexBase extends clsBase
13 13 {
14 14 $this->SetTitulo( "{$this->_instituicao} i-Educar - Parecer da turma" );
15 15 $this->processoAp = "586";
16   - $this->addEstilo("localizacaoSistema");
17 16 }
18 17 }
19 18  
... ...
ieducar/intranet/educar_projeto_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Projeto" );
14 14 $this->processoAp = "21250";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_projeto_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Projeto" );
13 13 $this->processoAp = "21250";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_projeto_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Projeto" );
13 13 $this->processoAp = "21250";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_raca_cad.php
  Diff comments   View file @59d80cc
... ... @@ -13,7 +13,6 @@ class clsIndexBase extends clsBase
13 13 {
14 14 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ra&ccedil;a" );
15 15 $this->processoAp = "678";
16   - $this->addEstilo("localizacaoSistema");
17 16 }
18 17 }
19 18  
... ...
ieducar/intranet/educar_raca_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ra&ccedil;a" );
13 13 $this->processoAp = "678";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_raca_lst.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Ra&ccedil;a" );
13 13 $this->processoAp = "678";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...
ieducar/intranet/educar_religiao_cad.php
  Diff comments   View file @59d80cc
... ... @@ -12,7 +12,6 @@ class clsIndexBase extends clsBase
12 12 {
13 13 $this->SetTitulo( "{$this->_instituicao} i-Educar - Religiao" );
14 14 $this->processoAp = "579";
15   - $this->addEstilo("localizacaoSistema");
16 15 }
17 16 }
18 17  
... ...
ieducar/intranet/educar_religiao_det.php
  Diff comments   View file @59d80cc
... ... @@ -11,7 +11,6 @@ class clsIndexBase extends clsBase
11 11 {
12 12 $this->SetTitulo( "{$this->_instituicao} i-Educar - Religiao" );
13 13 $this->processoAp = "579";
14   - $this->addEstilo("localizacaoSistema");
15 14 }
16 15 }
17 16  
... ...