From 7c3dd69878604323f434bf673f0722ccc676b90b Mon Sep 17 00:00:00 2001 From: fgs21 <fgs21@inf.ufpr.br> Date: Wed, 8 Mar 2023 09:54:14 -0300 Subject: [PATCH] adm_dependency dim added in classroom count --- src/libs/routes_v2/classroomCount.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/routes_v2/classroomCount.js b/src/libs/routes_v2/classroomCount.js index 95e1d693..59fc53c8 100644 --- a/src/libs/routes_v2/classroomCount.js +++ b/src/libs/routes_v2/classroomCount.js @@ -117,7 +117,7 @@ rqf.addField({ name: 'school', table: 'escola', tableField: ['nome_escola', 'id', 'dependencia_adm_id'], // Dado de dependencia administrativa sempre deve ser retornado com escola - resultField: ['school_name', 'school_id', 'adm_dependcy_id'], + resultField: ['school_name', 'school_id', 'adm_dependency_id'], where: { relation: '=', type: 'integer', @@ -432,6 +432,7 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => { if (req.dims.school){ obj.school_id = integral_time.school_id obj.school_name = integral_time.school_name + obj.adm_dependency_id = integral_time.adm_dependency_id } req.integral_time[code] = obj currentCodeObj = obj; @@ -517,7 +518,8 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => { }; if (req.dims.school){ obj.school_id = classroom.school_id, - obj.school_name = classroom.school_name + obj.school_name = classroom.school_name, + obj.adm_dependency_id = classroom.adm_dependency_id } if (req.teacherCalc) obj.percentage_teacher_career = []; -- GitLab