Merge branch 'adm_dependency_dim' into 'development'

Adm dependency dim

See merge request !350

src/libs/routes_v1/classroomCount.js

@@ -116,8 +116,8 @@ rqf.addField({
 }, 'dims').addValueToField({
     name: 'school',
     table: 'escola',
-    tableField: ['nome_escola', 'id'],
-    resultField: ['school_name', 'school_id'],
+    tableField: ['nome_escola', 'id', 'dependencia_adm_id'], // Dado de dependencia administrativa sempre deve ser retornado com escola
+    resultField: ['school_name', 'school_id', 'adm_dependency_id'],
     where: {
         relation: '=',
         type: 'integer',
@@ -432,6 +432,8 @@ 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
+                obj.adm_dependency_name = integral_time.adm_dependency_name
             }
             req.integral_time[code] = obj
             currentCodeObj = obj;
@@ -517,7 +519,9 @@ 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,
+                obj.adm_dependency_name = classroom.adm_dependency_name
             }
             if (req.teacherCalc)
                 obj.percentage_teacher_career = [];