From f0e8427bf5fda7f39320e43b56fd863aca110646 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 16:02:58 -0300 Subject: [PATCH 01/38] Remove `census_students` --- ...2022_11_17_152958_drop_census_students_view.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2022_11_17_152958_drop_census_students_view.php diff --git a/database/migrations/remove/2022_11_17_152958_drop_census_students_view.php b/database/migrations/remove/2022_11_17_152958_drop_census_students_view.php deleted file mode 100644 index 4e5fae5e67..0000000000 --- a/database/migrations/remove/2022_11_17_152958_drop_census_students_view.php +++ /dev/null @@ -1,14 +0,0 @@ -dropView('census_students'); - } -}; From 16ce0f6e63f5458990d70751fb71f1207306c13a Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 16:08:13 -0300 Subject: [PATCH 02/38] Remove migrations do schema `urbano` --- .../Postgres/DatabaseServiceProvider.php | 2 +- .../legacy/2020_01_01_000000_create_schemas.php | 2 -- .../legacy/2020_01_01_160000_search_path.php | 6 +++--- ...20_082028_remove_functions_schema_urbano.php | 17 ----------------- ...remove_view_urbano_cep_logradouro_bairro.php | 16 ---------------- ...40052_remove_view_urbano_tipo_logradouro.php | 16 ---------------- ...142708_remove_view_urbano_cep_logradouro.php | 16 ---------------- .../2022_11_20_143021_remove_schema_urbano.php | 16 ---------------- 8 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 database/migrations/remove/2022_11_20_082028_remove_functions_schema_urbano.php delete mode 100644 database/migrations/remove/2022_11_20_134219_remove_view_urbano_cep_logradouro_bairro.php delete mode 100644 database/migrations/remove/2022_11_20_140052_remove_view_urbano_tipo_logradouro.php delete mode 100644 database/migrations/remove/2022_11_20_142708_remove_view_urbano_cep_logradouro.php delete mode 100644 database/migrations/remove/2022_11_20_143021_remove_schema_urbano.php diff --git a/app/Providers/Postgres/DatabaseServiceProvider.php b/app/Providers/Postgres/DatabaseServiceProvider.php index 329190d9ce..3705769742 100644 --- a/app/Providers/Postgres/DatabaseServiceProvider.php +++ b/app/Providers/Postgres/DatabaseServiceProvider.php @@ -19,7 +19,7 @@ public function register() Connection::resolverFor('pgsql', function ($connection, $database, $prefix, $config) { $connection = new PostgresConnection($connection, $database, $prefix, $config); - $connection->getPdo()->exec('SET search_path = "$user", public, portal, cadastro, pmieducar, urbano, modules;'); + $connection->getPdo()->exec('SET search_path = "$user", public, portal, cadastro, pmieducar, modules;'); return $connection; }); diff --git a/database/migrations/legacy/2020_01_01_000000_create_schemas.php b/database/migrations/legacy/2020_01_01_000000_create_schemas.php index 36ef38f594..1a86972ba6 100644 --- a/database/migrations/legacy/2020_01_01_000000_create_schemas.php +++ b/database/migrations/legacy/2020_01_01_000000_create_schemas.php @@ -19,7 +19,6 @@ public function up() CREATE SCHEMA pmieducar; CREATE SCHEMA portal; CREATE SCHEMA relatorio; - CREATE SCHEMA urbano; ' ); } @@ -38,7 +37,6 @@ public function down() DROP SCHEMA pmieducar; DROP SCHEMA portal; DROP SCHEMA relatorio; - DROP SCHEMA urbano; ' ); } diff --git a/database/migrations/legacy/2020_01_01_160000_search_path.php b/database/migrations/legacy/2020_01_01_160000_search_path.php index 1e36f947bc..bf8341e72b 100644 --- a/database/migrations/legacy/2020_01_01_160000_search_path.php +++ b/database/migrations/legacy/2020_01_01_160000_search_path.php @@ -16,9 +16,9 @@ public function up() DB::unprepared( ' - ALTER DATABASE ' . $database . ' - SET search_path = "$user", public, portal, cadastro, - pmieducar, urbano, modules; + ALTER DATABASE ' . $database . ' + SET search_path = "$user", public, portal, cadastro, + pmieducar, modules; ' ); } diff --git a/database/migrations/remove/2022_11_20_082028_remove_functions_schema_urbano.php b/database/migrations/remove/2022_11_20_082028_remove_functions_schema_urbano.php deleted file mode 100644 index 29bea9e6a5..0000000000 --- a/database/migrations/remove/2022_11_20_082028_remove_functions_schema_urbano.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 23 Dec 2024 16:09:20 -0300 Subject: [PATCH 03/38] Remove views --- ..._11_21_203649_remove_view_v_funcionario.php | 18 ------------------ ...1_22_015306_remove_view_v_pessoa_fisica.php | 16 ---------------- ...22_024017_remove_view_v_pessoa_juridica.php | 16 ---------------- 3 files changed, 50 deletions(-) delete mode 100644 database/migrations/remove/2022_11_21_203649_remove_view_v_funcionario.php delete mode 100644 database/migrations/remove/2022_11_22_015306_remove_view_v_pessoa_fisica.php delete mode 100644 database/migrations/remove/2022_11_22_024017_remove_view_v_pessoa_juridica.php diff --git a/database/migrations/remove/2022_11_21_203649_remove_view_v_funcionario.php b/database/migrations/remove/2022_11_21_203649_remove_view_v_funcionario.php deleted file mode 100644 index 3aa16f8252..0000000000 --- a/database/migrations/remove/2022_11_21_203649_remove_view_v_funcionario.php +++ /dev/null @@ -1,18 +0,0 @@ - Date: Mon, 23 Dec 2024 16:13:08 -0300 Subject: [PATCH 04/38] Remove `cadastro.religioes` --- ..._12_07_230133_remove_table_cadastro_religioes.php | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 database/migrations/remove/2022_12_07_230133_remove_table_cadastro_religioes.php diff --git a/database/migrations/remove/2022_12_07_230133_remove_table_cadastro_religioes.php b/database/migrations/remove/2022_12_07_230133_remove_table_cadastro_religioes.php deleted file mode 100644 index d1ce3ad4ee..0000000000 --- a/database/migrations/remove/2022_12_07_230133_remove_table_cadastro_religioes.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 16:22:51 -0300 Subject: [PATCH 05/38] Remove `pmieducar.escola_rede_ensino` --- ...ate_pmieducar_escola_rede_ensino_table.php | 61 ------------------- ...1_110000_create_pmieducar_escola_table.php | 3 - ..._in_pmieducar_escola_rede_ensino_table.php | 36 ----------- ...foreign_keys_in_pmieducar_escola_table.php | 7 --- ...2_145132_update_field_and_table_school.php | 26 -------- ...09_091721_remove_field_in_table_escola.php | 16 ----- 6 files changed, 149 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_escola_rede_ensino_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_rede_ensino_table.php delete mode 100644 database/migrations/misc/2022_09_12_145132_update_field_and_table_school.php delete mode 100644 database/migrations/remove/2022_12_09_091721_remove_field_in_table_escola.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_escola_rede_ensino_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_escola_rede_ensino_table.php deleted file mode 100644 index 47154c80a9..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_escola_rede_ensino_table.php +++ /dev/null @@ -1,61 +0,0 @@ -foreign('ref_cod_instituicao') - ->references('cod_instituicao') - ->on('pmieducar.instituicao') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.escola_rede_ensino', function (Blueprint $table) { - $table->dropForeign(['ref_cod_instituicao']); - }); - } -} diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_table.php index 8402499fe7..6a057a94e8 100644 --- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_table.php +++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_escola_table.php @@ -34,12 +34,6 @@ public function up() ->onUpdate('restrict') ->onDelete('restrict'); - $table->foreign('ref_cod_escola_rede_ensino') - ->references('cod_escola_rede_ensino') - ->on('pmieducar.escola_rede_ensino') - ->onUpdate('restrict') - ->onDelete('restrict'); - $table->foreign('codigo_ies') ->references('id') ->on('modules.educacenso_ies'); @@ -58,7 +52,6 @@ public function down() $table->dropForeign(['ref_idpes_gestor']); $table->dropForeign(['ref_idpes']); $table->dropForeign(['ref_cod_instituicao']); - $table->dropForeign(['ref_cod_escola_rede_ensino']); $table->dropForeign(['codigo_ies']); }); } diff --git a/database/migrations/misc/2022_09_12_145132_update_field_and_table_school.php b/database/migrations/misc/2022_09_12_145132_update_field_and_table_school.php deleted file mode 100644 index b645ec9010..0000000000 --- a/database/migrations/misc/2022_09_12_145132_update_field_and_table_school.php +++ /dev/null @@ -1,26 +0,0 @@ -dropColumn('ref_cod_escola_rede_ensino'); - }); - } -}; From b636123bae5b15903954b9b244c4d6588e588506 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 16:30:07 -0300 Subject: [PATCH 06/38] Remove `pmieducar.infra_predio_comodo` --- ...te_pmieducar_infra_predio_comodo_table.php | 58 ------------------- ...01_110000_create_pmieducar_turma_table.php | 1 - ...in_pmieducar_infra_predio_comodo_table.php | 43 -------------- ..._foreign_keys_in_pmieducar_turma_table.php | 7 --- ..._09_090912_remove_field_in_table_turma.php | 16 ----- ...91200_remove_table_infra_predio_comodo.php | 12 ---- ieducar/intranet/educar_escola_comodo_xml.php | 30 ---------- .../pmieducar/clsPmieducarTurma.inc.php | 2 +- .../modules/Api/Views/EscolaController.php | 2 +- 9 files changed, 2 insertions(+), 169 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_comodo_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php delete mode 100644 database/migrations/remove/2022_12_09_090912_remove_field_in_table_turma.php delete mode 100644 database/migrations/remove/2022_12_09_091200_remove_table_infra_predio_comodo.php delete mode 100644 ieducar/intranet/educar_escola_comodo_xml.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_comodo_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_comodo_table.php deleted file mode 100644 index b403d46576..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_comodo_table.php +++ /dev/null @@ -1,58 +0,0 @@ -foreign('ref_cod_infra_predio') - ->references('cod_infra_predio') - ->on('pmieducar.infra_predio') - ->onUpdate('restrict') - ->onDelete('restrict'); - - $table->foreign('ref_cod_infra_comodo_funcao') - ->references('cod_infra_comodo_funcao') - ->on('pmieducar.infra_comodo_funcao') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.infra_predio_comodo', function (Blueprint $table) { - $table->dropForeign(['ref_cod_infra_predio']); - $table->dropForeign(['ref_cod_infra_comodo_funcao']); - }); - } -} diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_table.php index e7ba1ebfb0..0f7b4efaa6 100644 --- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_table.php +++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_turma_table.php @@ -44,12 +44,6 @@ public function up() ->onUpdate('restrict') ->onDelete('restrict'); - $table->foreign('ref_cod_infra_predio_comodo') - ->references('cod_infra_predio_comodo') - ->on('pmieducar.infra_predio_comodo') - ->onUpdate('restrict') - ->onDelete('restrict'); - $table->foreign('ref_cod_curso') ->references('cod_curso') ->on('pmieducar.curso') @@ -81,7 +75,6 @@ public function down() $table->dropForeign(['ref_ref_cod_escola', 'ref_ref_cod_serie']); $table->dropForeign(['ref_cod_regente', 'ref_cod_instituicao_regente']); $table->dropForeign(['ref_cod_instituicao']); - $table->dropForeign(['ref_cod_infra_predio_comodo']); $table->dropForeign(['ref_cod_curso']); $table->dropForeign(['ref_ref_cod_serie_mult', 'ref_ref_cod_escola_mult']); $table->dropForeign(['ref_cod_disciplina_dispensada']); diff --git a/database/migrations/remove/2022_12_09_090912_remove_field_in_table_turma.php b/database/migrations/remove/2022_12_09_090912_remove_field_in_table_turma.php deleted file mode 100644 index 60e8317524..0000000000 --- a/database/migrations/remove/2022_12_09_090912_remove_field_in_table_turma.php +++ /dev/null @@ -1,16 +0,0 @@ -dropColumn('ref_cod_infra_predio_comodo'); - }); - } -}; diff --git a/database/migrations/remove/2022_12_09_091200_remove_table_infra_predio_comodo.php b/database/migrations/remove/2022_12_09_091200_remove_table_infra_predio_comodo.php deleted file mode 100644 index d6c84cc545..0000000000 --- a/database/migrations/remove/2022_12_09_091200_remove_table_infra_predio_comodo.php +++ /dev/null @@ -1,12 +0,0 @@ -\n\n"; -if (is_numeric($_GET['esc'])) { - $db = new clsBanco(); - $db->Consulta(" - SELECT - cod_infra_predio_comodo, - i.nm_predio || ' - ' || c.nm_comodo - FROM - pmieducar.infra_predio i, - pmieducar.infra_predio_comodo c - WHERE - i.ref_cod_escola = '{$_GET['esc']}' - AND i.cod_infra_predio = c.ref_cod_infra_predio - AND i.ativo = 1 - AND c.ativo = 1 - ORDER BY nm_predio ASC, nm_comodo ASC - "); - while ($db->ProximoRegistro()) { - [$cod, $nome] = $db->Tupla(); - echo " {$cod}\n"; - echo " {$nome}\n"; - } -} -echo ''; diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php index 934a5e14d5..a952506e85 100644 --- a/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php +++ b/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php @@ -24,7 +24,7 @@ class clsPmieducarTurma extends Model public $ref_ref_cod_escola; - public $ref_cod_infra_predio_comodo; + public $ref_cod_infra_predio_comodo; // TODO: remover no futuro public $nm_turma; diff --git a/ieducar/modules/Api/Views/EscolaController.php b/ieducar/modules/Api/Views/EscolaController.php index 708abc9894..b54136fa10 100644 --- a/ieducar/modules/Api/Views/EscolaController.php +++ b/ieducar/modules/Api/Views/EscolaController.php @@ -357,7 +357,7 @@ public function _getMaxAlunoTurno($escolaId) $int_ref_usuario_cad = null, $int_ref_ref_cod_serie = $this->getRequest()->serie_id, $int_ref_ref_cod_escola = $escolaId, - $int_ref_cod_infra_predio_comodo = null, + $int_ref_cod_infra_predio_comodo = null, // TODO: remover no futuro $str_nm_turma = null, $str_sgl_turma = null, $int_max_aluno = null, From 132f11e30171e6d43bfadff3782a1c72f6604e45 Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 16:31:20 -0300 Subject: [PATCH 07/38] Remove `pmieducar.infra_comodo_funcao` --- ...te_pmieducar_infra_comodo_funcao_table.php | 56 ------------------- ...in_pmieducar_infra_comodo_funcao_table.php | 36 ------------ ...91202_remove_table_infra_comodo_funcao.php | 12 ---- 3 files changed, 104 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_comodo_funcao_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php delete mode 100644 database/migrations/remove/2022_12_09_091202_remove_table_infra_comodo_funcao.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_comodo_funcao_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_comodo_funcao_table.php deleted file mode 100644 index b1a0ac2862..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_comodo_funcao_table.php +++ /dev/null @@ -1,56 +0,0 @@ -foreign('ref_cod_escola') - ->references('cod_escola') - ->on('pmieducar.escola') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.infra_comodo_funcao', function (Blueprint $table) { - $table->dropForeign(['ref_cod_escola']); - }); - } -} diff --git a/database/migrations/remove/2022_12_09_091202_remove_table_infra_comodo_funcao.php b/database/migrations/remove/2022_12_09_091202_remove_table_infra_comodo_funcao.php deleted file mode 100644 index 642c3d4c6a..0000000000 --- a/database/migrations/remove/2022_12_09_091202_remove_table_infra_comodo_funcao.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 16:32:22 -0300 Subject: [PATCH 08/38] Remove `pmieducar.infra_predio` --- ...00_create_pmieducar_infra_predio_table.php | 57 ------------------- ...n_keys_in_pmieducar_infra_predio_table.php | 36 ------------ ...12_09_091440_remove_table_infra_predio.php | 12 ---- 3 files changed, 105 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_table.php delete mode 100644 database/migrations/remove/2022_12_09_091440_remove_table_infra_predio.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_table.php deleted file mode 100644 index 2c308a8aeb..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_infra_predio_table.php +++ /dev/null @@ -1,57 +0,0 @@ -foreign('ref_cod_escola') - ->references('cod_escola') - ->on('pmieducar.escola') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.infra_predio', function (Blueprint $table) { - $table->dropForeign(['ref_cod_escola']); - }); - } -} diff --git a/database/migrations/remove/2022_12_09_091440_remove_table_infra_predio.php b/database/migrations/remove/2022_12_09_091440_remove_table_infra_predio.php deleted file mode 100644 index 2ca3cd9f71..0000000000 --- a/database/migrations/remove/2022_12_09_091440_remove_table_infra_predio.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 16:36:27 -0300 Subject: [PATCH 09/38] Remove `pmieducar.subnivel` --- ...110000_create_pmieducar_servidor_table.php | 5 -- ...110000_create_pmieducar_subnivel_table.php | 57 ------------------- ...reign_keys_in_pmieducar_servidor_table.php | 7 --- ...reign_keys_in_pmieducar_subnivel_table.php | 43 -------------- ..._093206_remove_field_in_table_servidor.php | 16 ------ ...022_12_09_093330_remove_table_subnivel.php | 12 ---- .../functions/pmieducar.unifica_pessoas.sql | 2 +- .../pmieducar/clsPmieducarServidor.inc.php | 2 +- 8 files changed, 2 insertions(+), 142 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_subnivel_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_subnivel_table.php delete mode 100644 database/migrations/remove/2022_12_09_093206_remove_field_in_table_servidor.php delete mode 100644 database/migrations/remove/2022_12_09_093330_remove_table_subnivel.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_table.php index d4a6bbf50e..43889d7366 100644 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_table.php +++ b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_table.php @@ -23,7 +23,6 @@ public function up() data_cadastro timestamp without time zone NOT NULL, data_exclusao timestamp without time zone, ativo smallint DEFAULT (1)::smallint NOT NULL, - ref_cod_subnivel integer, situacao_curso_superior_1 smallint, formacao_complementacao_pedagogica_1 smallint, codigo_curso_superior_1 integer, @@ -52,10 +51,6 @@ public function up() ALTER TABLE ONLY pmieducar.servidor ADD CONSTRAINT servidor_pkey PRIMARY KEY (cod_servidor, ref_cod_instituicao); - CREATE INDEX fki_servidor_ref_cod_subnivel ON pmieducar.servidor USING btree (ref_cod_subnivel); - - CREATE INDEX fki_servidor_ref_cod_subnivel_ ON pmieducar.servidor USING btree (ref_cod_subnivel); - CREATE INDEX servidor_idx ON pmieducar.servidor USING btree (cod_servidor, ref_cod_instituicao, ativo); ' ); diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_subnivel_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_subnivel_table.php deleted file mode 100644 index 5de3908a9d..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_subnivel_table.php +++ /dev/null @@ -1,57 +0,0 @@ -onUpdate('restrict') ->onDelete('restrict'); - $table->foreign('ref_cod_subnivel') - ->references('cod_subnivel') - ->on('pmieducar.subnivel') - ->onUpdate('restrict') - ->onDelete('restrict'); - $table->foreign('ref_cod_instituicao') ->references('cod_instituicao') ->on('pmieducar.instituicao') @@ -74,7 +68,6 @@ public function down() { Schema::table('pmieducar.servidor', function (Blueprint $table) { $table->dropForeign(['ref_idesco']); - $table->dropForeign(['ref_cod_subnivel']); $table->dropForeign(['ref_cod_instituicao']); $table->dropForeign(['instituicao_curso_superior_3']); $table->dropForeign(['instituicao_curso_superior_2']); diff --git a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_subnivel_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_subnivel_table.php deleted file mode 100644 index b94a2973c4..0000000000 --- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_subnivel_table.php +++ /dev/null @@ -1,43 +0,0 @@ -foreign('ref_cod_subnivel_anterior') - ->references('cod_subnivel') - ->on('pmieducar.subnivel') - ->onUpdate('restrict') - ->onDelete('restrict'); - - $table->foreign('ref_cod_nivel') - ->references('cod_nivel') - ->on('pmieducar.nivel') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.subnivel', function (Blueprint $table) { - $table->dropForeign(['ref_cod_subnivel_anterior']); - $table->dropForeign(['ref_cod_nivel']); - }); - } -} diff --git a/database/migrations/remove/2022_12_09_093206_remove_field_in_table_servidor.php b/database/migrations/remove/2022_12_09_093206_remove_field_in_table_servidor.php deleted file mode 100644 index 5ff87556ad..0000000000 --- a/database/migrations/remove/2022_12_09_093206_remove_field_in_table_servidor.php +++ /dev/null @@ -1,16 +0,0 @@ -dropColumn('ref_cod_subnivel'); - }); - } -}; diff --git a/database/migrations/remove/2022_12_09_093330_remove_table_subnivel.php b/database/migrations/remove/2022_12_09_093330_remove_table_subnivel.php deleted file mode 100644 index bcc3293577..0000000000 --- a/database/migrations/remove/2022_12_09_093330_remove_table_subnivel.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 16:38:22 -0300 Subject: [PATCH 10/38] Remove `pmieducar.nivel` --- ...01_110000_create_pmieducar_nivel_table.php | 57 ------------------- ..._foreign_keys_in_pmieducar_nivel_table.php | 43 -------------- .../2022_12_09_093335_remove_table_nivel.php | 12 ---- 3 files changed, 112 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_nivel_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_table.php delete mode 100644 database/migrations/remove/2022_12_09_093335_remove_table_nivel.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_nivel_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_nivel_table.php deleted file mode 100644 index 018c30b6ca..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_nivel_table.php +++ /dev/null @@ -1,57 +0,0 @@ -foreign('ref_cod_nivel_anterior') - ->references('cod_nivel') - ->on('pmieducar.nivel') - ->onUpdate('restrict') - ->onDelete('restrict'); - - $table->foreign('ref_cod_categoria_nivel') - ->references('cod_categoria_nivel') - ->on('pmieducar.categoria_nivel') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.nivel', function (Blueprint $table) { - $table->dropForeign(['ref_cod_nivel_anterior']); - $table->dropForeign(['ref_cod_categoria_nivel']); - }); - } -} diff --git a/database/migrations/remove/2022_12_09_093335_remove_table_nivel.php b/database/migrations/remove/2022_12_09_093335_remove_table_nivel.php deleted file mode 100644 index a31c401e72..0000000000 --- a/database/migrations/remove/2022_12_09_093335_remove_table_nivel.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 16:39:53 -0300 Subject: [PATCH 11/38] Remove `pmieducar.categoria_nivel` --- ...create_pmieducar_categoria_nivel_table.php | 54 ------------------- ...09_093340_remove_table_categoria_nivel.php | 12 ----- 2 files changed, 66 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_categoria_nivel_table.php delete mode 100644 database/migrations/remove/2022_12_09_093340_remove_table_categoria_nivel.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_categoria_nivel_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_categoria_nivel_table.php deleted file mode 100644 index 70ba90a33f..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_categoria_nivel_table.php +++ /dev/null @@ -1,54 +0,0 @@ - Date: Mon, 23 Dec 2024 16:40:36 -0300 Subject: [PATCH 12/38] Remove `pmieducar.serie_pre_requisito` --- ..._12_22_101508_remove_table_serie_pre_requisito.php | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 database/migrations/remove/2022_12_22_101508_remove_table_serie_pre_requisito.php diff --git a/database/migrations/remove/2022_12_22_101508_remove_table_serie_pre_requisito.php b/database/migrations/remove/2022_12_22_101508_remove_table_serie_pre_requisito.php deleted file mode 100644 index e36e9c4c08..0000000000 --- a/database/migrations/remove/2022_12_22_101508_remove_table_serie_pre_requisito.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Mon, 23 Dec 2024 16:41:22 -0300 Subject: [PATCH 13/38] Remove `pmieducar.operador` --- .../2022_12_22_102130_remove_table_operador.php | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 database/migrations/remove/2022_12_22_102130_remove_table_operador.php diff --git a/database/migrations/remove/2022_12_22_102130_remove_table_operador.php b/database/migrations/remove/2022_12_22_102130_remove_table_operador.php deleted file mode 100644 index 8215cf7d5e..0000000000 --- a/database/migrations/remove/2022_12_22_102130_remove_table_operador.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 16:41:38 -0300 Subject: [PATCH 14/38] Remove `pmieducar.v_matricula_matricula_turma` --- ...e_view_pmieducar_v_matricula_matricula_turma.php | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 database/migrations/remove/2023_01_04_154659_remove_view_pmieducar_v_matricula_matricula_turma.php diff --git a/database/migrations/remove/2023_01_04_154659_remove_view_pmieducar_v_matricula_matricula_turma.php b/database/migrations/remove/2023_01_04_154659_remove_view_pmieducar_v_matricula_matricula_turma.php deleted file mode 100644 index 9effd271fc..0000000000 --- a/database/migrations/remove/2023_01_04_154659_remove_view_pmieducar_v_matricula_matricula_turma.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Mon, 23 Dec 2024 16:42:27 -0300 Subject: [PATCH 15/38] Remove `pmieducar.nota_aluno` --- ..._04_155031_remove_table_pmieducar_nota_aluno.php | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 database/migrations/remove/2023_01_04_155031_remove_table_pmieducar_nota_aluno.php diff --git a/database/migrations/remove/2023_01_04_155031_remove_table_pmieducar_nota_aluno.php b/database/migrations/remove/2023_01_04_155031_remove_table_pmieducar_nota_aluno.php deleted file mode 100644 index 2cf24e7c1f..0000000000 --- a/database/migrations/remove/2023_01_04_155031_remove_table_pmieducar_nota_aluno.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Mon, 23 Dec 2024 16:43:21 -0300 Subject: [PATCH 16/38] Remove `pmieducar.servidor_titulo_concurso` --- ...ieducar_servidor_titulo_concurso_table.php | 51 ------------------- ...ieducar_servidor_titulo_concurso_table.php | 36 ------------- ...ble_pmieducar_servidor_titulo_concurso.php | 11 ---- 3 files changed, 98 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_titulo_concurso_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_titulo_concurso_table.php delete mode 100644 database/migrations/remove/2023_02_08_154750_drop_table_pmieducar_servidor_titulo_concurso.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_titulo_concurso_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_titulo_concurso_table.php deleted file mode 100644 index a32398b70e..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_titulo_concurso_table.php +++ /dev/null @@ -1,51 +0,0 @@ -foreign('ref_cod_formacao') - ->references('cod_formacao') - ->on('pmieducar.servidor_formacao') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.servidor_titulo_concurso', function (Blueprint $table) { - $table->dropForeign(['ref_cod_formacao']); - }); - } -} diff --git a/database/migrations/remove/2023_02_08_154750_drop_table_pmieducar_servidor_titulo_concurso.php b/database/migrations/remove/2023_02_08_154750_drop_table_pmieducar_servidor_titulo_concurso.php deleted file mode 100644 index 272b76822e..0000000000 --- a/database/migrations/remove/2023_02_08_154750_drop_table_pmieducar_servidor_titulo_concurso.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Mon, 23 Dec 2024 16:46:50 -0300 Subject: [PATCH 17/38] Remove `pmieducar.servidor_curso` --- ..._create_pmieducar_servidor_curso_table.php | 52 ------------------- ...keys_in_pmieducar_servidor_curso_table.php | 36 ------------- ...36_drop_table_pmieducar_servidor_curso.php | 11 ---- 3 files changed, 99 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_curso_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php delete mode 100644 database/migrations/remove/2023_02_08_154836_drop_table_pmieducar_servidor_curso.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_curso_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_curso_table.php deleted file mode 100644 index 96d4abee24..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_curso_table.php +++ /dev/null @@ -1,52 +0,0 @@ -foreign('ref_cod_formacao') - ->references('cod_formacao') - ->on('pmieducar.servidor_formacao') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.servidor_curso', function (Blueprint $table) { - $table->dropForeign(['ref_cod_formacao']); - }); - } -} diff --git a/database/migrations/remove/2023_02_08_154836_drop_table_pmieducar_servidor_curso.php b/database/migrations/remove/2023_02_08_154836_drop_table_pmieducar_servidor_curso.php deleted file mode 100644 index 68fe64838f..0000000000 --- a/database/migrations/remove/2023_02_08_154836_drop_table_pmieducar_servidor_curso.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Mon, 23 Dec 2024 16:47:43 -0300 Subject: [PATCH 18/38] Remove `pmieducar.servidor_formacao` --- ...eate_pmieducar_servidor_formacao_table.php | 58 ------------------- ...s_in_pmieducar_servidor_formacao_table.php | 36 ------------ ...drop_table_pmieducar_servidor_formacao.php | 11 ---- ieducar/lib/App/Unificacao/Servidor.php | 4 -- 4 files changed, 109 deletions(-) delete mode 100644 database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_formacao_table.php delete mode 100644 database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php delete mode 100644 database/migrations/remove/2023_02_08_161318_drop_table_pmieducar_servidor_formacao.php diff --git a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_formacao_table.php b/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_formacao_table.php deleted file mode 100644 index 7c6ecc01df..0000000000 --- a/database/migrations/legacy/2020_01_01_110000_create_pmieducar_servidor_formacao_table.php +++ /dev/null @@ -1,58 +0,0 @@ -foreign(['ref_cod_servidor', 'ref_ref_cod_instituicao']) - ->references(['cod_servidor', 'ref_cod_instituicao']) - ->on('pmieducar.servidor') - ->onUpdate('restrict') - ->onDelete('restrict'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('pmieducar.servidor_formacao', function (Blueprint $table) { - $table->dropForeign(['ref_cod_servidor', 'ref_ref_cod_instituicao']); - }); - } -} diff --git a/database/migrations/remove/2023_02_08_161318_drop_table_pmieducar_servidor_formacao.php b/database/migrations/remove/2023_02_08_161318_drop_table_pmieducar_servidor_formacao.php deleted file mode 100644 index a0c4cdcb18..0000000000 --- a/database/migrations/remove/2023_02_08_161318_drop_table_pmieducar_servidor_formacao.php +++ /dev/null @@ -1,11 +0,0 @@ - 'pmieducar.falta_atraso_compensado', 'coluna' => 'ref_cod_servidor', ], - [ - 'tabela' => 'pmieducar.servidor_formacao', - 'coluna' => 'ref_cod_servidor', - ], [ 'tabela' => 'pmieducar.servidor_afastamento', 'coluna' => 'ref_cod_servidor', From 84d6771d846a5be1b19617d81ac3781265240a7d Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 16:48:04 -0300 Subject: [PATCH 19/38] Remove `pmieducar.tipo_avaliacao_valores` --- ..._remove_table_pmieducar_tipo_avaliacao_valores.php | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 database/migrations/remove/2023_02_15_012205_remove_table_pmieducar_tipo_avaliacao_valores.php diff --git a/database/migrations/remove/2023_02_15_012205_remove_table_pmieducar_tipo_avaliacao_valores.php b/database/migrations/remove/2023_02_15_012205_remove_table_pmieducar_tipo_avaliacao_valores.php deleted file mode 100644 index 1200eb2cc5..0000000000 --- a/database/migrations/remove/2023_02_15_012205_remove_table_pmieducar_tipo_avaliacao_valores.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Mon, 23 Dec 2024 16:52:25 -0300 Subject: [PATCH 20/38] Remove `pmieducar.tipo_avaliacao` --- ..._012405_remove_table_pmieducar_tipo_avaliacao.php | 11 ----------- ieducar/intranet/educar_curso_lst_v.php | 3 +-- ieducar/intranet/educar_matricula_cad.php | 5 ----- .../educar_matricula_cad_curso_segue_padrao.php | 12 ------------ .../include/pmieducar/clsPmieducarCurso.inc.php | 4 ++-- phpunit.xml | 1 - 6 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 database/migrations/remove/2023_02_15_012405_remove_table_pmieducar_tipo_avaliacao.php delete mode 100644 ieducar/intranet/educar_matricula_cad_curso_segue_padrao.php diff --git a/database/migrations/remove/2023_02_15_012405_remove_table_pmieducar_tipo_avaliacao.php b/database/migrations/remove/2023_02_15_012405_remove_table_pmieducar_tipo_avaliacao.php deleted file mode 100644 index 4abc0afb82..0000000000 --- a/database/migrations/remove/2023_02_15_012405_remove_table_pmieducar_tipo_avaliacao.php +++ /dev/null @@ -1,11 +0,0 @@ -lista( int_ref_cod_tipo_regime: $this->ref_cod_nivel_ensino, int_ref_cod_nivel_ensino: $this->ref_cod_tipo_ensino, - int_ref_cod_tipo_avaliacao: $this->nm_curso, date_data_cadastro_fim: 1 ); diff --git a/ieducar/intranet/educar_matricula_cad.php b/ieducar/intranet/educar_matricula_cad.php index f18dab08ee..0400ab1036 100644 --- a/ieducar/intranet/educar_matricula_cad.php +++ b/ieducar/intranet/educar_matricula_cad.php @@ -180,11 +180,6 @@ public function Gerar() if (is_numeric(value: $this->ref_cod_curso)) { $obj_curso = new clsPmieducarCurso(cod_curso: $this->ref_cod_curso); $det_curso = $obj_curso->detalhe(); - - if (is_numeric(value: $det_curso['ref_cod_tipo_avaliacao'])) { - $this->campoOculto(nome: 'apagar_radios', valor: $det_curso['padrao_ano_escolar']); - $this->campoOculto(nome: 'is_padrao', valor: $det_curso['padrao_ano_escolar']); - } } $this->acao_enviar = 'formUtils.submit()'; diff --git a/ieducar/intranet/educar_matricula_cad_curso_segue_padrao.php b/ieducar/intranet/educar_matricula_cad_curso_segue_padrao.php deleted file mode 100644 index 336f0ca6f5..0000000000 --- a/ieducar/intranet/educar_matricula_cad_curso_segue_padrao.php +++ /dev/null @@ -1,12 +0,0 @@ -detalhe(); - if (is_numeric(value: $det_curso['ref_cod_tipo_avaliacao'])) { - echo $det_curso['padrao_ano_escolar']; - } else { - echo 1; - } -} diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarCurso.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarCurso.inc.php index 908d0138d3..980a117806 100644 --- a/ieducar/intranet/include/pmieducar/clsPmieducarCurso.inc.php +++ b/ieducar/intranet/include/pmieducar/clsPmieducarCurso.inc.php @@ -54,7 +54,7 @@ public function __construct( $ref_cod_tipo_regime = null, $ref_cod_nivel_ensino = null, $ref_cod_tipo_ensino = null, - $ref_cod_tipo_avaliacao = null, + $ref_cod_tipo_avaliacao = null, // TODO: remover no futuro $nm_curso = null, $sgl_curso = null, $qtd_etapas = null, @@ -467,7 +467,7 @@ public function lista( $int_ref_cod_tipo_regime = null, $int_ref_cod_nivel_ensino = null, $int_ref_cod_tipo_ensino = null, - $int_ref_cod_tipo_avaliacao = null, + $int_ref_cod_tipo_avaliacao = null, // TODO: remover no futuro $str_nm_curso = null, $str_sgl_curso = null, $int_qtd_etapas = null, diff --git a/phpunit.xml b/phpunit.xml index 88eeea7838..7a6e27ffe0 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -46,7 +46,6 @@ ieducar/intranet/educar_calendario_pesquisas.php ieducar/intranet/educar_consulta_movimento_geral_lst.php ieducar/intranet/educar_consulta_movimento_mensal_lst.php - ieducar/intranet/educar_matricula_cad_curso_segue_padrao.php ieducar/intranet/educar_quadro_horarios_pesquisas.php ieducar/intranet/educar_tombo_automatico.ajax.php ieducar/intranet/include/pmieducar/educar_campo_lista.php From be1b0ce0f1a5899df2d89d9659e7f1baffa2366f Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 16:53:07 -0300 Subject: [PATCH 21/38] =?UTF-8?q?C=C3=B3digo=20morto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ieducar/intranet/educar_matricula_cad.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ieducar/intranet/educar_matricula_cad.php b/ieducar/intranet/educar_matricula_cad.php index 0400ab1036..1bf502e845 100644 --- a/ieducar/intranet/educar_matricula_cad.php +++ b/ieducar/intranet/educar_matricula_cad.php @@ -177,11 +177,6 @@ public function Gerar() ); } - if (is_numeric(value: $this->ref_cod_curso)) { - $obj_curso = new clsPmieducarCurso(cod_curso: $this->ref_cod_curso); - $det_curso = $obj_curso->detalhe(); - } - $this->acao_enviar = 'formUtils.submit()'; } From 4c41aba18fc238c05151dff572cb8e431c048e8c Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 16:53:36 -0300 Subject: [PATCH 22/38] Remove `pmieducar.pre_requisito` --- ...15_025338_remove_table_pmieducar_pre_requisito.php | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 database/migrations/remove/2023_02_15_025338_remove_table_pmieducar_pre_requisito.php diff --git a/database/migrations/remove/2023_02_15_025338_remove_table_pmieducar_pre_requisito.php b/database/migrations/remove/2023_02_15_025338_remove_table_pmieducar_pre_requisito.php deleted file mode 100644 index 916107e02c..0000000000 --- a/database/migrations/remove/2023_02_15_025338_remove_table_pmieducar_pre_requisito.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Mon, 23 Dec 2024 16:53:53 -0300 Subject: [PATCH 23/38] Remove `pmieducar.serie_vaga` --- ...03_06_164514_remove_table_pmieducar_serie_vaga.php | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 database/migrations/remove/2023_03_06_164514_remove_table_pmieducar_serie_vaga.php diff --git a/database/migrations/remove/2023_03_06_164514_remove_table_pmieducar_serie_vaga.php b/database/migrations/remove/2023_03_06_164514_remove_table_pmieducar_serie_vaga.php deleted file mode 100644 index c19d967743..0000000000 --- a/database/migrations/remove/2023_03_06_164514_remove_table_pmieducar_serie_vaga.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Mon, 23 Dec 2024 16:54:07 -0300 Subject: [PATCH 24/38] Remove `pmieducar.habilitacao_curso` --- ...5416_remove_table_pmieducar_habilitacao_curso.php | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 database/migrations/remove/2023_03_08_135416_remove_table_pmieducar_habilitacao_curso.php diff --git a/database/migrations/remove/2023_03_08_135416_remove_table_pmieducar_habilitacao_curso.php b/database/migrations/remove/2023_03_08_135416_remove_table_pmieducar_habilitacao_curso.php deleted file mode 100644 index 3f89381c5a..0000000000 --- a/database/migrations/remove/2023_03_08_135416_remove_table_pmieducar_habilitacao_curso.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 16:59:35 -0300 Subject: [PATCH 25/38] Remove `pmieducar.habilitacao` --- app/Console/Commands/LegacyCreateTestsCommand.php | 3 --- ...08_135548_remove_table_pmieducar_habilitacao.php | 13 ------------- database/sqls/inserts/public.menus.sql | 1 - ieducar/intranet/educar_curso_det.php | 2 +- ieducar/intranet/educar_curso_lst.php | 2 +- ieducar/intranet/educar_nivel_ensino_cad_pop.php | 9 --------- ieducar/intranet/educar_tipo_ensino_cad_pop.php | 9 --------- ieducar/intranet/educar_tipo_regime_cad_pop.php | 9 --------- ieducar/intranet/educar_turma_tipo_cad_pop.php | 9 --------- .../scripts/extra/educar-habilitacao-cad-pop.js | 9 --------- 10 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 database/migrations/remove/2023_03_08_135548_remove_table_pmieducar_habilitacao.php delete mode 100644 ieducar/intranet/scripts/extra/educar-habilitacao-cad-pop.js diff --git a/app/Console/Commands/LegacyCreateTestsCommand.php b/app/Console/Commands/LegacyCreateTestsCommand.php index e922c623c7..db19fbe954 100644 --- a/app/Console/Commands/LegacyCreateTestsCommand.php +++ b/app/Console/Commands/LegacyCreateTestsCommand.php @@ -273,9 +273,6 @@ private function excludeClasseNameList() 'EducarFaltaNotaAlunoDet', 'EducarFonteDet', 'EducarFuncaoDet', - 'EducarHabilitacaoDet', - 'EducarHabilitacaoCad', - 'EducarHabilitacaoLst', 'EducarHistoricoEscolarDet', 'EducarHistoricoEscolarLst', 'EducarFaltaNotaAlunoLst', diff --git a/database/migrations/remove/2023_03_08_135548_remove_table_pmieducar_habilitacao.php b/database/migrations/remove/2023_03_08_135548_remove_table_pmieducar_habilitacao.php deleted file mode 100644 index 9e69dba3d1..0000000000 --- a/database/migrations/remove/2023_03_08_135548_remove_table_pmieducar_habilitacao.php +++ /dev/null @@ -1,13 +0,0 @@ -title = 'Nível Ensino'; diff --git a/ieducar/intranet/educar_tipo_ensino_cad_pop.php b/ieducar/intranet/educar_tipo_ensino_cad_pop.php index be94136937..4b5d69244d 100644 --- a/ieducar/intranet/educar_tipo_ensino_cad_pop.php +++ b/ieducar/intranet/educar_tipo_ensino_cad_pop.php @@ -102,15 +102,6 @@ public function Editar() {} public function Excluir() {} - public function makeExtra() - { - if (!$_GET['precisa_lista']) { - return file_get_contents(__DIR__ . '/scripts/extra/educar-habilitacao-cad-pop.js'); - } - - return ''; - } - public function Formular() { $this->title = 'Tipo Ensino'; diff --git a/ieducar/intranet/educar_tipo_regime_cad_pop.php b/ieducar/intranet/educar_tipo_regime_cad_pop.php index 4fe21960ae..e271992a49 100644 --- a/ieducar/intranet/educar_tipo_regime_cad_pop.php +++ b/ieducar/intranet/educar_tipo_regime_cad_pop.php @@ -91,15 +91,6 @@ public function Editar() {} public function Excluir() {} - public function makeExtra() - { - if (!$_GET['precisa_lista']) { - return file_get_contents(__DIR__ . '/scripts/extra/educar-habilitacao-cad-pop.js'); - } - - return ''; - } - public function Formular() { $this->title = 'Tipo Regime'; diff --git a/ieducar/intranet/educar_turma_tipo_cad_pop.php b/ieducar/intranet/educar_turma_tipo_cad_pop.php index 5cb7129518..dff71fe3e5 100644 --- a/ieducar/intranet/educar_turma_tipo_cad_pop.php +++ b/ieducar/intranet/educar_turma_tipo_cad_pop.php @@ -103,15 +103,6 @@ public function Editar() {} public function Excluir() {} - public function makeExtra() - { - if (!$_GET['precisa_lista']) { - return file_get_contents(__DIR__ . '/scripts/extra/educar-habilitacao-cad-pop.js'); - } - - return ''; - } - public function Formular() { $this->title = 'Turma Tipo'; diff --git a/ieducar/intranet/scripts/extra/educar-habilitacao-cad-pop.js b/ieducar/intranet/scripts/extra/educar-habilitacao-cad-pop.js deleted file mode 100644 index 678e965e23..0000000000 --- a/ieducar/intranet/scripts/extra/educar-habilitacao-cad-pop.js +++ /dev/null @@ -1,9 +0,0 @@ - - - Event.observe(window, 'load', Init, false); - - function Init() { - $('ref_cod_instituicao').value = parent.document.getElementById('ref_cod_instituicao').value; - } - - From 94161753e9ccd6ad0ff3904341dfb3c7b4ae8b7e Mon Sep 17 00:00:00 2001 From: Eder Soares Date: Mon, 23 Dec 2024 17:00:12 -0300 Subject: [PATCH 26/38] Remove `modules.docente_licenciatura` --- ...4_remove_table_modules_docente_licenciatura.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2023_03_17_083324_remove_table_modules_docente_licenciatura.php diff --git a/database/migrations/remove/2023_03_17_083324_remove_table_modules_docente_licenciatura.php b/database/migrations/remove/2023_03_17_083324_remove_table_modules_docente_licenciatura.php deleted file mode 100644 index d9d10d75d4..0000000000 --- a/database/migrations/remove/2023_03_17_083324_remove_table_modules_docente_licenciatura.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 23 Dec 2024 17:00:32 -0300 Subject: [PATCH 27/38] Remove `modules.falta_geral_max` --- ...7_111137_remove_table_modules_falta_geral_max.php | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 database/migrations/remove/2023_03_17_111137_remove_table_modules_falta_geral_max.php diff --git a/database/migrations/remove/2023_03_17_111137_remove_table_modules_falta_geral_max.php b/database/migrations/remove/2023_03_17_111137_remove_table_modules_falta_geral_max.php deleted file mode 100644 index 81c33ce310..0000000000 --- a/database/migrations/remove/2023_03_17_111137_remove_table_modules_falta_geral_max.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 17:00:43 -0300 Subject: [PATCH 28/38] Remove `modules.falta_geral_min` --- ...7_112146_remove_table_modules_falta_geral_min.php | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 database/migrations/remove/2023_03_17_112146_remove_table_modules_falta_geral_min.php diff --git a/database/migrations/remove/2023_03_17_112146_remove_table_modules_falta_geral_min.php b/database/migrations/remove/2023_03_17_112146_remove_table_modules_falta_geral_min.php deleted file mode 100644 index 5771c464b9..0000000000 --- a/database/migrations/remove/2023_03_17_112146_remove_table_modules_falta_geral_min.php +++ /dev/null @@ -1,12 +0,0 @@ - Date: Mon, 23 Dec 2024 17:01:07 -0300 Subject: [PATCH 29/38] Remove `modules.uniforme_aluno` --- ...0_091509_remove_table_modules_uniforme_aluno.php | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 database/migrations/remove/2023_03_20_091509_remove_table_modules_uniforme_aluno.php diff --git a/database/migrations/remove/2023_03_20_091509_remove_table_modules_uniforme_aluno.php b/database/migrations/remove/2023_03_20_091509_remove_table_modules_uniforme_aluno.php deleted file mode 100644 index 86d068f337..0000000000 --- a/database/migrations/remove/2023_03_20_091509_remove_table_modules_uniforme_aluno.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Mon, 23 Dec 2024 17:01:25 -0300 Subject: [PATCH 30/38] Remove `pmieducar.disciplina_topico` --- ...emove_table_pmieducar_disciplina_topico.php | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 database/migrations/remove/2023_03_20_184831_remove_table_pmieducar_disciplina_topico.php diff --git a/database/migrations/remove/2023_03_20_184831_remove_table_pmieducar_disciplina_topico.php b/database/migrations/remove/2023_03_20_184831_remove_table_pmieducar_disciplina_topico.php deleted file mode 100644 index 8a0795c8a9..0000000000 --- a/database/migrations/remove/2023_03_20_184831_remove_table_pmieducar_disciplina_topico.php +++ /dev/null @@ -1,18 +0,0 @@ - Date: Mon, 23 Dec 2024 17:02:11 -0300 Subject: [PATCH 31/38] Remove `pmieducar.material_didatico` --- ...08_remove_table_pmieducar_material_didatico.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2023_03_23_135408_remove_table_pmieducar_material_didatico.php diff --git a/database/migrations/remove/2023_03_23_135408_remove_table_pmieducar_material_didatico.php b/database/migrations/remove/2023_03_23_135408_remove_table_pmieducar_material_didatico.php deleted file mode 100644 index d4572bd3ef..0000000000 --- a/database/migrations/remove/2023_03_23_135408_remove_table_pmieducar_material_didatico.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 23 Dec 2024 17:02:28 -0300 Subject: [PATCH 32/38] Remove `pmieducar.material_tipo` --- ...135420_remove_table_pmieducar_material_tipo.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2023_03_23_135420_remove_table_pmieducar_material_tipo.php diff --git a/database/migrations/remove/2023_03_23_135420_remove_table_pmieducar_material_tipo.php b/database/migrations/remove/2023_03_23_135420_remove_table_pmieducar_material_tipo.php deleted file mode 100644 index 5a2815431b..0000000000 --- a/database/migrations/remove/2023_03_23_135420_remove_table_pmieducar_material_tipo.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 23 Dec 2024 17:02:55 -0300 Subject: [PATCH 33/38] Remove `pmieducar.matricula_excessao` --- ...4_remove_table_pmieducar_matricula_excessao.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2023_03_23_171814_remove_table_pmieducar_matricula_excessao.php diff --git a/database/migrations/remove/2023_03_23_171814_remove_table_pmieducar_matricula_excessao.php b/database/migrations/remove/2023_03_23_171814_remove_table_pmieducar_matricula_excessao.php deleted file mode 100644 index 8f63392e30..0000000000 --- a/database/migrations/remove/2023_03_23_171814_remove_table_pmieducar_matricula_excessao.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 23 Dec 2024 17:03:12 -0300 Subject: [PATCH 34/38] Remove `pmieducar.quantidade_reserva_externa` --- ...e_table_pmieducar_quantidade_reserva_externa.php | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 database/migrations/remove/2023_03_24_093618_remove_table_pmieducar_quantidade_reserva_externa.php diff --git a/database/migrations/remove/2023_03_24_093618_remove_table_pmieducar_quantidade_reserva_externa.php b/database/migrations/remove/2023_03_24_093618_remove_table_pmieducar_quantidade_reserva_externa.php deleted file mode 100644 index ed61c03ef7..0000000000 --- a/database/migrations/remove/2023_03_24_093618_remove_table_pmieducar_quantidade_reserva_externa.php +++ /dev/null @@ -1,13 +0,0 @@ - Date: Mon, 23 Dec 2024 17:04:12 -0300 Subject: [PATCH 35/38] Remove `public.users` --- ...2023_03_24_104404_remove_table_public_users.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2023_03_24_104404_remove_table_public_users.php diff --git a/database/migrations/remove/2023_03_24_104404_remove_table_public_users.php b/database/migrations/remove/2023_03_24_104404_remove_table_public_users.php deleted file mode 100644 index 94af7a57b6..0000000000 --- a/database/migrations/remove/2023_03_24_104404_remove_table_public_users.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 23 Dec 2024 17:04:41 -0300 Subject: [PATCH 36/38] Remove `pmieducar.falta_aluno` --- ...4_144927_remove_table_pmieducar_falta_aluno.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2023_03_24_144927_remove_table_pmieducar_falta_aluno.php diff --git a/database/migrations/remove/2023_03_24_144927_remove_table_pmieducar_falta_aluno.php b/database/migrations/remove/2023_03_24_144927_remove_table_pmieducar_falta_aluno.php deleted file mode 100644 index 4517b5378d..0000000000 --- a/database/migrations/remove/2023_03_24_144927_remove_table_pmieducar_falta_aluno.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 23 Dec 2024 17:05:09 -0300 Subject: [PATCH 37/38] Remove `pmieducar.faltas` --- ..._03_24_145105_remove_table_pmieducar_faltas.php | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 database/migrations/remove/2023_03_24_145105_remove_table_pmieducar_faltas.php diff --git a/database/migrations/remove/2023_03_24_145105_remove_table_pmieducar_faltas.php b/database/migrations/remove/2023_03_24_145105_remove_table_pmieducar_faltas.php deleted file mode 100644 index ee1cf65085..0000000000 --- a/database/migrations/remove/2023_03_24_145105_remove_table_pmieducar_faltas.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Mon, 23 Dec 2024 17:05:28 -0300 Subject: [PATCH 38/38] =?UTF-8?q?Migrations=20para=20remo=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Providers/AppServiceProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index b8e3d2c910..a663af0abb 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -65,7 +65,6 @@ public function boot() database_path('migrations/educacenso'), database_path('migrations/exporter'), database_path('migrations/misc'), - database_path('migrations/remove'), database_path('migrations/report'), database_path('migrations/table'), ]);