From 5fd24d6091e45dca530aa18df8b3ea558b6cf8e3 Mon Sep 17 00:00:00 2001
From: Fernando Erd <fce15@inf.ufpr.br>
Date: Fri, 18 Aug 2017 10:02:32 -0300
Subject: [PATCH] Change route school
---
src/libs/middlewares/id2str.js | 21 --
src/libs/routes/school.js | 422 ++++++++++++++++-----------------
2 files changed, 211 insertions(+), 232 deletions(-)
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index 99c03e2d..9d35063d 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -33,23 +33,6 @@ const ids = {
agreement_id: agreement,
integral_time_id: booleanVariable,
government_agreement_id: booleanVariable,
- building_school_id: booleanVariable,
- informatics_lab_id: booleanVariable,
- science_lab_id: booleanVariable,
- directors_room_id: booleanVariable,
- teacher_room_id: booleanVariable,
- cook_room_id: booleanVariable,
- playground_id: booleanVariable,
- indor_sports_court_id: booleanVariable,
- nusery_id: booleanVariable,
- special_attendence_room_id: booleanVariable,
- toilet_inside_building_id: booleanVariable,
- denpendency_pne_id: booleanVariable,
- restroom_pne_id: booleanVariable,
- broadband_id: booleanVariable,
- energy_id: booleanVariable,
- water_id: booleanVariable,
- wastepipe_id: booleanVariable,
education_day_care_child_id: booleanVariable,
education_preschool_child_id: booleanVariable,
education_begin_elementary_school_id: booleanVariable,
@@ -57,10 +40,6 @@ const ids = {
education_middle_school_id: booleanVariable,
education_professional_id: booleanVariable,
education_eja_id: booleanVariable,
- library_reading_room_id: booleanVariable,
- library_id: booleanVariable,
- reading_room_id: booleanVariable,
- water_id: booleanVariable,
education_type_id: educationType,
income_level_id: incomeLevel,
city_size_id: citySize,
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 94ecbb54..e08eca58 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -509,26 +509,26 @@ rqfCount.addField({
type: 'integer',
field: 'cod_localizacao'
}
-}).addValue({
- name: 'rural_location',
- table: 'escola',
- tableField: 'localidade_area_rural',
- resultField: 'rural_location_id',
- where: {
- relation: '=',
- type: 'integer',
- field: 'localidade_area_rural'
- }
-}).addValue({
- name: 'cook_room',
- table: 'escola',
- tableField: 'cozinha',
- resultField: 'cook_room_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'cozinha'
- }
+// }).addValue({
+// name: 'rural_location',
+// table: 'escola',
+// tableField: 'localidade_area_rural',
+// resultField: 'rural_location_id',
+// where: {
+// relation: '=',
+// type: 'integer',
+// field: 'localidade_area_rural'
+// }
+// }).addValue({
+// name: 'cook_room',
+// table: 'escola',
+// tableField: 'cozinha',
+// resultField: 'cook_room_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'cozinha'
+// }
}).addValue({
name: 'government_agreement',
table: 'escola',
@@ -539,46 +539,46 @@ rqfCount.addField({
type: 'boolean',
field: 'conveniada_pp'
}
-}).addValue({
- name: 'informatics_lab',
- table: 'escola',
- tableField: 'lab_informatica',
- resultField: 'informatics_lab_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'lab_informatica'
- }
-}).addValue({
- name: 'science_lab',
- table: 'escola',
- tableField: 'lab_ciencias',
- resultField: 'science_lab_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'lab_ciencias'
- }
-}).addValue({
- name: 'special_attendence_room',
- table: 'escola',
- tableField: 'sala_atendimento_especial',
- resultField: 'special_attendence_room_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'sala_atendimento_especial'
- }
-}).addValue({
- name: 'indor_sports_court',
- table: 'escola',
- tableField: 'quadra_esportes_coberta',
- resultField: 'indor_sports_court_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'quadra_esportes_coberta'
- }
+// }).addValue({
+// name: 'informatics_lab',
+// table: 'escola',
+// tableField: 'lab_informatica',
+// resultField: 'informatics_lab_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'lab_informatica'
+// }
+// }).addValue({
+// name: 'science_lab',
+// table: 'escola',
+// tableField: 'lab_ciencias',
+// resultField: 'science_lab_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'lab_ciencias'
+// }
+// }).addValue({
+// name: 'special_attendence_room',
+// table: 'escola',
+// tableField: 'sala_atendimento_especial',
+// resultField: 'special_attendence_room_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'sala_atendimento_especial'
+// }
+// }).addValue({
+// name: 'indor_sports_court',
+// table: 'escola',
+// tableField: 'quadra_esportes_coberta',
+// resultField: 'indor_sports_court_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'quadra_esportes_coberta'
+// }
}).addValue({
name: 'education_eja',
table: 'escola',
@@ -649,116 +649,116 @@ rqfCount.addField({
type: 'boolean',
field: 'reg_infantil_creche'
}
-}).addValue({
- name: 'directors_room',
- table: 'escola',
- tableField: 'sala_diretoria',
- resultField: 'directors_room_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'sala_diretoria'
- }
-}).addValue({
- name: 'teacher_room',
- table: 'escola',
- tableField: 'sala_professor',
- resultField: 'teacher_room_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'sala_professor'
- }
-}).addValue({
- name: 'playground',
- table: 'escola',
- tableField: 'parque_infantil',
- resultField: 'playground_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'parque_infantil'
- }
-}).addValue({
- name: 'nusery',
- table: 'escola',
- tableField: 'bercario',
- resultField: 'nusery_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'bercario'
- }
-}).addValue({
- name: 'toilet_inside_building',
- table: 'escola',
- tableField: 'sanitario_dentro_predio',
- resultField: 'toilet_inside_building_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'sanitario_dentro_predio'
- }
-}).addValue({
- name: 'wastepipe',
- table: 'escola',
- tableField: 'esgoto_sanitario',
- resultField: 'wastepipe_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'esgoto_sanitario'
- }
-}).addValue({
- name: 'water',
- table: 'escola',
- tableField: 'fornecimento_agua',
- resultField: 'water_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'fornecimento_agua '
- }
-}).addValue({
- name: 'energy',
- table: 'escola',
- tableField: 'fornecimento_energia',
- resultField: 'energy_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'fornecimento_energia '
- }
-}).addValue({
- name: 'broadband',
- table: 'escola',
- tableField: 'internet_banda_larga',
- resultField: 'broadband_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'internet_banda_larga '
- }
-}).addValue({
- name: 'restroom_pne',
- table: 'escola',
- tableField: 'sanitario_pne',
- resultField: 'restroom_pne_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'sanitario_pne '
- }
-}).addValue({
- name: 'denpendency_pne',
- table: 'escola',
- tableField: 'dependencias_pne',
- resultField: 'denpendency_pne_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'dependencias_pne '
- }
+// }).addValue({
+// name: 'directors_room',
+// table: 'escola',
+// tableField: 'sala_diretoria',
+// resultField: 'directors_room_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'sala_diretoria'
+// }
+// }).addValue({
+// name: 'teacher_room',
+// table: 'escola',
+// tableField: 'sala_professor',
+// resultField: 'teacher_room_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'sala_professor'
+// }
+// }).addValue({
+// name: 'playground',
+// table: 'escola',
+// tableField: 'parque_infantil',
+// resultField: 'playground_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'parque_infantil'
+// }
+// }).addValue({
+// name: 'nusery',
+// table: 'escola',
+// tableField: 'bercario',
+// resultField: 'nusery_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'bercario'
+// }
+// }).addValue({
+// name: 'toilet_inside_building',
+// table: 'escola',
+// tableField: 'sanitario_dentro_predio',
+// resultField: 'toilet_inside_building_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'sanitario_dentro_predio'
+// }
+// }).addValue({
+// name: 'wastepipe',
+// table: 'escola',
+// tableField: 'esgoto_sanitario',
+// resultField: 'wastepipe_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'esgoto_sanitario'
+// }
+// }).addValue({
+// name: 'water',
+// table: 'escola',
+// tableField: 'fornecimento_agua',
+// resultField: 'water_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'fornecimento_agua '
+// }
+// }).addValue({
+// name: 'energy',
+// table: 'escola',
+// tableField: 'fornecimento_energia',
+// resultField: 'energy_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'fornecimento_energia '
+// }
+// }).addValue({
+// name: 'broadband',
+// table: 'escola',
+// tableField: 'internet_banda_larga',
+// resultField: 'broadband_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'internet_banda_larga '
+// }
+// }).addValue({
+// name: 'restroom_pne',
+// table: 'escola',
+// tableField: 'sanitario_pne',
+// resultField: 'restroom_pne_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'sanitario_pne '
+// }
+// }).addValue({
+// name: 'denpendency_pne',
+// table: 'escola',
+// tableField: 'dependencias_pne',
+// resultField: 'denpendency_pne_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'dependencias_pne '
+// }
}).addValue({
name: 'agreement',
table: 'escola',
@@ -769,47 +769,47 @@ rqfCount.addField({
type: 'integer',
field: 'tipo_convenio_pp'
}
-}).addValue({
- name: 'building_school',
- table: 'escola',
- tableField: 'local_func_predio_escolar',
- resultField: 'building_school_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'local_func_predio_escolar'
- }
-}).addValue({
- name: 'library',
- table: 'escola',
- tableField: 'biblioteca',
- resultField: 'library_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'biblioteca'
- }
-}).addValue({
- name: 'reading_room',
- table: 'escola',
- tableField: 'sala_leitura',
- resultField: 'reading_room_id',
- where: {
- relation: '=',
- type: 'boolean',
- field: 'sala_leitura'
- }
-}).addValue({
- name: 'library_reading_room',
- table: 'escola',
- tableField: 'biblioteca_sala_leitura',
- resultField: 'library_reading_room_id',
- where: {
- relation: '=',
- type: 'boolean',
- condition: 'or',
- field: 'biblioteca_sala_leitura'
- }
+// }).addValue({
+// name: 'building_school',
+// table: 'escola',
+// tableField: 'local_func_predio_escolar',
+// resultField: 'building_school_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'local_func_predio_escolar'
+// }
+// }).addValue({
+// name: 'library',
+// table: 'escola',
+// tableField: 'biblioteca',
+// resultField: 'library_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'biblioteca'
+// }
+// }).addValue({
+// name: 'reading_room',
+// table: 'escola',
+// tableField: 'sala_leitura',
+// resultField: 'reading_room_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// field: 'sala_leitura'
+// }
+// }).addValue({
+// name: 'library_reading_room',
+// table: 'escola',
+// tableField: 'biblioteca_sala_leitura',
+// resultField: 'library_reading_room_id',
+// where: {
+// relation: '=',
+// type: 'boolean',
+// condition: 'or',
+// field: 'biblioteca_sala_leitura'
+// }
}).addValue({
name: 'min_year',
table: 'escola',
--
GitLab