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/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'),
]);
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_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 @@
-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/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php
deleted file mode 100644
index 8aa4d096c3..0000000000
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_comodo_funcao_table.php
+++ /dev/null
@@ -1,36 +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/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php
deleted file mode 100644
index 47c39905f7..0000000000
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_comodo_table.php
+++ /dev/null
@@ -1,43 +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_infra_predio_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_table.php
deleted file mode 100644
index e9045abfea..0000000000
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_infra_predio_table.php
+++ /dev/null
@@ -1,36 +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/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_table.php
deleted file mode 100644
index af3fe48377..0000000000
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_nivel_table.php
+++ /dev/null
@@ -1,43 +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/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php
deleted file mode 100644
index 9e754318ef..0000000000
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_curso_table.php
+++ /dev/null
@@ -1,36 +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/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php
deleted file mode 100644
index 3e167672ca..0000000000
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_formacao_table.php
+++ /dev/null
@@ -1,36 +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/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_table.php
index ab2644323d..4625957d3c 100644
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_table.php
+++ b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_table.php
@@ -20,12 +20,6 @@ public function up()
->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_servidor_titulo_concurso_table.php b/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_titulo_concurso_table.php
deleted file mode 100644
index 79532fc150..0000000000
--- a/database/migrations/legacy/2020_01_01_120000_add_foreign_keys_in_pmieducar_servidor_titulo_concurso_table.php
+++ /dev/null
@@ -1,36 +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/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/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/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/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 @@
-dropView('census_students');
- }
-};
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 @@
-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 @@
-dropColumn('ref_cod_escola_rede_ensino');
- });
- }
-};
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 @@
-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_escola_comodo_xml.php b/ieducar/intranet/educar_escola_comodo_xml.php
deleted file mode 100644
index 5960223277..0000000000
--- a/ieducar/intranet/educar_escola_comodo_xml.php
+++ /dev/null
@@ -1,30 +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/educar_matricula_cad.php b/ieducar/intranet/educar_matricula_cad.php
index f18dab08ee..1bf502e845 100644
--- a/ieducar/intranet/educar_matricula_cad.php
+++ b/ieducar/intranet/educar_matricula_cad.php
@@ -177,16 +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();
-
- 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/educar_nivel_ensino_cad_pop.php b/ieducar/intranet/educar_nivel_ensino_cad_pop.php
index d2b99dc8e2..9b6fa3032c 100644
--- a/ieducar/intranet/educar_nivel_ensino_cad_pop.php
+++ b/ieducar/intranet/educar_nivel_ensino_cad_pop.php
@@ -101,15 +101,6 @@ public function Editar() {}
public function Excluir() {}
- public function makeExtra()
- {
- if (!$_GET['ref_cod_instituicao']) {
- return file_get_contents(__DIR__ . '/scripts/extra/educar-habilitacao-cad-pop.js');
- }
-
- return '';
- }
-
public function Formular()
{
$this->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/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/ieducar/intranet/include/pmieducar/clsPmieducarServidor.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarServidor.inc.php
index af539b6c34..4d537e27a5 100644
--- a/ieducar/intranet/include/pmieducar/clsPmieducarServidor.inc.php
+++ b/ieducar/intranet/include/pmieducar/clsPmieducarServidor.inc.php
@@ -375,7 +375,7 @@ public function lista(
$int_identificador = null,
$int_ref_cod_curso = null,
$int_ref_cod_disciplina = null,
- $int_ref_cod_subnivel = null,
+ $int_ref_cod_subnivel = null, // TODO: remover no futuro
$bool_servidor_sem_alocacao = false,
$ano_alocacao = null,
$matricula_funcionario = null
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/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;
- }
-
-
diff --git a/ieducar/lib/App/Unificacao/Servidor.php b/ieducar/lib/App/Unificacao/Servidor.php
index e732222f56..83a2ec04a9 100644
--- a/ieducar/lib/App/Unificacao/Servidor.php
+++ b/ieducar/lib/App/Unificacao/Servidor.php
@@ -26,10 +26,6 @@ class App_Unificacao_Servidor extends App_Unificacao_Base
'tabela' => 'pmieducar.falta_atraso_compensado',
'coluna' => 'ref_cod_servidor',
],
- [
- 'tabela' => 'pmieducar.servidor_formacao',
- 'coluna' => 'ref_cod_servidor',
- ],
[
'tabela' => 'pmieducar.servidor_afastamento',
'coluna' => 'ref_cod_servidor',
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,
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