From cb22a43abdc10dc0764e21ab9e848c295c9061ef Mon Sep 17 00:00:00 2001
From: Fernando Erd <fernandoerd2012@gmail.com>
Date: Thu, 10 May 2018 10:08:20 -0300
Subject: [PATCH] Fix gloss enrollment ratio
---
src/libs/routes/glossEnrollmentRatio.js | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/libs/routes/glossEnrollmentRatio.js b/src/libs/routes/glossEnrollmentRatio.js
index 159f73ba..041a93ad 100644
--- a/src/libs/routes/glossEnrollmentRatio.js
+++ b/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;
--
GitLab