Skip to content
Snippets Groups Projects
Commit b0655310 authored by Fernando Erd's avatar Fernando Erd :ok_hand:
Browse files

Fix Rate School

parent a8a9aaba
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!103Change rate school
Pipeline #
......@@ -277,28 +277,32 @@ rateSchoolApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.queryIndex = {};
log.debug(req.sql.toParam());
let freq_total = req.sql.clone();
freq_total.field('sum(pnad.peso)', 'total')
.field('pnad.ano_censo','year')
.from('pnad')
.group('pnad.ano_censo')
.order('pnad.ano_censo')
req.queryIndex.freq_total = req.querySet.push(freq_total) - 1;
let freq_nursery = req.sql.clone();
freq_nursery.field('sum(pnad.peso)', 'total')
.field('pnad.ano_censo','year')
.from('pnad')
.group('pnad.ano_censo')
.order('pnad.ano_censo')
.where('pnad.frequenta_escola_creche = 2')
req.queryIndex.freq_nursery = req.querySet.push(freq_nursery) - 1;
if ("age_range" in req.filter) {
let freq_total = req.sql.clone();
freq_total.field('sum(pnad.peso)', 'total')
.field('pnad.ano_censo','year')
.from('pnad')
.group('pnad.ano_censo')
.order('pnad.ano_censo')
req.queryIndex.freq_total = req.querySet.push(freq_total) - 1;
let freq_nursery = req.sql.clone();
freq_nursery.field('sum(pnad.peso)', 'total')
.field('pnad.ano_censo','year')
.from('pnad')
.group('pnad.ano_censo')
.order('pnad.ano_censo')
.where('pnad.frequenta_escola_creche = 2')
req.queryIndex.freq_nursery = req.querySet.push(freq_nursery) - 1;
}
next();
}, multiQuery, (req, res, next) => {
let school_attendance_rate = matchQueries(req.result[req.queryIndex.freq_total], req.result[req.queryIndex.freq_nursery]);
req.result = school_attendance_rate;
if ("age_range" in req.filter) {
let school_attendance_rate = matchQueries(req.result[req.queryIndex.freq_total], req.result[req.queryIndex.freq_nursery]);
req.result = school_attendance_rate;
} else {
req.result = [];
}
next();
}, id2str.transform(false), response('rateSchool'));
......
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