diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js index 2481892e1a5703cce4a614931ecd31f2728802d2..743a8443b57a1f3d06fff84c9cf4f4daf6fdfbac 100644 --- a/src/libs/routes/enrollment.js +++ b/src/libs/routes/enrollment.js @@ -241,13 +241,18 @@ rqf.addField({ } }).addValue({ name: 'ethnic_group', - table: 'matricula', - tableField: 'cor_raca', - resultField: 'ethnic_group_id', + table: 'cor_raca', + tableField: 'name', + resultField: 'ethnic_group_name', where: { relation: '=', type: 'integer', - field: 'ethnic_group_id' + field: 'id' + }, + join: { + primary: 'id', + foreign: 'cor_raca_id', + foreignTable: 'matricula' } }).addValue({ name: 'period', @@ -290,32 +295,6 @@ enrollmentApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { } delete result.gender_id; } - if(typeof result.ethnic_group_id !== 'undefined') { - switch (result.ethnic_group) { - case 0: - result.ethnic_group_name = 'Não declarada'; - break; - case 1: - result.ethnic_group_name = 'Branca'; - break; - case 2: - result.ethnic_group_name = 'Preta'; - break; - case 3: - result.ethnic_group_name = 'Parda'; - break; - case 4: - result.ethnic_group_name = 'Amarela'; - break; - case 5: - result.ethnic_group_name = 'IndÃgena'; - break; - default: - result.ethnic_group_name = 'Não declarada'; - break; - } - delete result.ethnic_group_id; - } if(typeof result.period_id !== 'undefined') { switch (result.period_id) { case 1: