From 4db96fe80154513e49060582bd63668a64afafca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Kieras?= <jpkieras.oliveira@gmail.com>
Date: Tue, 27 Sep 2022 10:05:28 -0300
Subject: [PATCH] Update filter city (test)
---
src/libs/routes/studentsAee.js | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/libs/routes/studentsAee.js b/src/libs/routes/studentsAee.js
index 6b2d3f84..31db6ff5 100644
--- a/src/libs/routes/studentsAee.js
+++ b/src/libs/routes/studentsAee.js
@@ -71,7 +71,7 @@ rqf.addField({
name: 'dims',
field: true,
where: false
-}).addValueToField({
+}).addValueToField({ // working
name: 'state',
table: 'estado',
tableField: ['sigla', 'id'],
@@ -90,13 +90,12 @@ rqf.addField({
}, 'filter').addValueToField({
name: 'city',
table: 'municipio',
- tableField: 'nome',
- resultField: 'city_name',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
where: {
relation: '=',
type: 'integer',
- field: 'id',
- table: 'numero_estudantes_aee'
+ field: 'id'
},
join: {
primary: 'id',
@@ -130,7 +129,7 @@ rqf.addField({
field: 'id'
},
}, 'filter').addValueToField({
- name: 'locale_id',
+ name: 'locale_id', // working
table: 'numero_estudantes_aee',
tableField: 'localizacao_id',
resultField: 'locale_id',
@@ -140,7 +139,7 @@ rqf.addField({
field: 'localizacao_id'
}
}, 'filter').addValue({
- name: 'ethnic_group',
+ name: 'ethnic_group', // working
table: 'numero_estudantes_aee',
tableField: 'cor_raca_id',
resultField: 'ethnic_group_id',
@@ -150,7 +149,7 @@ rqf.addField({
field: 'cor_raca_id'
}
}).addValue({
- name: 'adm_dependency',
+ name: 'adm_dependency', // working
table: 'numero_estudantes_aee',
tableField: 'dependencia_adm_id',
resultField: 'adm_dependency_id',
@@ -160,7 +159,7 @@ rqf.addField({
field: 'dependencia_adm_id'
}
}).addValue({
- name:'age_range_all',
+ name:'age_range_all', // working
table: 'numero_estudantes_aee',
tableField: 'faixa_etaria_31_03',
resultField: 'age_range_all_id',
@@ -170,7 +169,7 @@ rqf.addField({
field: 'faixa_etaria_31_03'
}
}).addValue({
- name: 'gender',
+ name: 'gender', // working
table: 'numero_estudantes_aee',
tableField: 'sexo',
resultField: 'gender_id',
@@ -180,7 +179,7 @@ rqf.addField({
field: 'sexo'
}
}).addValue({
- name: 'activity_days',
+ name: 'activity_days', // working
table: 'numero_estudantes_aee',
tableField: 'dias_atividade',
resultField: 'activity_days_id',
@@ -190,7 +189,7 @@ rqf.addField({
field: 'dias_atividade'
}
}).addField({
- name: 'special_service',
+ name: 'special_service', // working
table: 'numero_estudantes_aee',
tableField: 'disc_atendimento_especiais',
resultField: 'special_service_id',
--
GitLab