Merge branch 'fix_gloss_ratio' into development

src/libs/routes/glossEnrollmentRatio.js

@@ -299,7 +299,7 @@ glossEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
     .group('matricula.ano_censo')
     .order('matricula.ano_censo')
     .where('matricula.tipo <= 3')
-    
+
     if ( "education_level_basic" in req.dims ) {
         req.sql.field('matricula.etapas_mod_ensino_segmento_id', 'age_range')
         req.sql.where('matricula.etapas_mod_ensino_segmento_id = 1 OR matricula.etapas_mod_ensino_segmento_id = 2 OR matricula.etapas_mod_ensino_segmento_id = 4 OR matricula.etapas_mod_ensino_segmento_id = 5 OR matricula.etapas_mod_ensino_segmento_id = 6')
@@ -338,6 +338,8 @@ glossEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
             }
             string_query = string_query + convert(req.filter.education_level_basic[req.filter.education_level_basic.length - 1]);
             req.sql.where(string_query);
+            req.sql.field('pnad.faixa_etaria_31_03','age_range')
+            req.sql.group('pnad.faixa_etaria_31_03', 'age_range')
         }
     } else if ( "education_level_basic" in req.dims ) {
         req.sql.field('pnad.faixa_etaria_31_03','age_range')
@@ -368,10 +370,10 @@ glossEnrollmentRatioApp.get('/', rqf.parse(),(req, res, next) => {
             req.denominator[i].age_range = req.denominator[i].age_range + 1;
         }
     }
-    log.debug("Numerador");
-    log.debug(req.numerator);
-    log.debug("Denominador");
-    log.debug(req.denominator);
+    // log.debug("Numerador");
+    // log.debug(req.numerator);
+    // log.debug("Denominador");
+    // log.debug(req.denominator);
     req.result = []
     let glossEnrollment = matchQueries(req.denominator, req.numerator);
     req.result = glossEnrollment;