Skip to content
Snippets Groups Projects
Commit a1a27edd authored by es23's avatar es23 :coffee:
Browse files

fix income range null field

parent 5b39f39b
No related branches found
No related tags found
3 merge requests!489dev -> hom,!487Development,!485Es23 students receiving aid tax
......@@ -578,8 +578,21 @@ function matchQueries(queryPartial, queryTotal) {
return match;
}
function whereCondition(req) {
let where = "";
const dims = req.query.dims;
if (dims && dims.includes("income_range")){
where += `pnad_novo.faixa_rendimento_aux_tx is not null`;
}
return where;
}
studentsReceivingAidTaxApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.querySet = [];
let where = whereCondition(req);
// Subquery para total_pop_maior_25 com filtros dinâmicos
let totalEstudantesQueRecebemAuxilio = req.sql.clone();
......@@ -587,6 +600,7 @@ studentsReceivingAidTaxApp.get('/', rqf.parse(), rqf.build(), (req, res, next) =
.field("ano_ref", "year")
.field("SUM(peso_domicilio_pessoas_com_cal)", "total")
.where("recebeu_rendimentos_de_programa_bolsa_familia = 1")
.where(`${where}`)
.where("frequenta_escola = 1")
.where("ano_ref >= 2019")
.group("ano_ref")
......@@ -598,7 +612,9 @@ studentsReceivingAidTaxApp.get('/', rqf.parse(), rqf.build(), (req, res, next) =
totalEstudantes.from("pnad_novo")
.field("ano_ref", "year")
.field("SUM(peso_domicilio_pessoas_com_cal)", "total")
.where(`${where}`)
.where("frequenta_escola = 1")
.where("ano_ref >= 2019")
.group("ano_ref")
.order("ano_ref");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment