Skip to content
Snippets Groups Projects
Commit 6c691252 authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Alter education_level_mod count for teacher route

parent 4be7a043
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!75Alter education_level_mod count for teacher route
Pipeline #
...@@ -198,9 +198,9 @@ class ReqQueryFields { ...@@ -198,9 +198,9 @@ class ReqQueryFields {
build() { build() {
// "Constrói" o SQL // "Constrói" o SQL
return (req, res, next) => { return (req, res, next) => {
// Foreach no campos
let hasJoined = {}; let hasJoined = {};
let thisTable = req.sql.tableFrom; let thisTable = req.sql.tableFrom;
// Foreach no campos
Object.keys(this.fields).forEach((key) => { Object.keys(this.fields).forEach((key) => {
// Campo // Campo
let field = this.fields[key]; let field = this.fields[key];
......
...@@ -336,16 +336,51 @@ rqf.addField({ ...@@ -336,16 +336,51 @@ rqf.addField({
} }
}); });
teacherApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { teacherApp.get('/', rqf.parse(), (req, res, next) => {
req.sql.field('COUNT(DISTINCT docente.id)', 'total') req.sql.field('COUNT(DISTINCT docente.id)', 'total')
.field("'Brasil'", 'name') .field("'Brasil'", 'name')
.field('docente.ano_censo', 'year') .field('docente.ano_censo', 'year')
.from('docente') .from('docente')
.join('turma', null, 'docente.turma_id=turma.id AND docente.ano_censo=turma.ano_censo') .join('turma', null, 'docente.turma_id=turma.id AND docente.ano_censo=turma.ano_censo')
.group('docente.ano_censo') .group('docente.ano_censo')
.order('docente.ano_censo') .order('docente.ano_censo')
.where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)'); .where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)');
next();
}, query, id2str.transform(), response('teacher')); if("education_level_mod" in req.dims) {
delete req.dims.education_level_mod;
req.hadEducationLevelMod = true;
req.sql.field('docente.etapas_mod_ensino_segmento_id', 'education_level_mod_id')
.where('docente.etapas_mod_ensino_segmento_id < 11')
.group('docente.etapas_mod_ensino_segmento_id');
}
next();
}, rqf.build(), query, (req, res, next) => {
if(req.hadEducationLevelMod) {
req.oldResult = req.result;
req.sql = squel.select()
.field('COUNT(DISTINCT docente.id)', 'total')
.field("'Brasil'", 'name')
.field('docente.ano_censo', 'year')
.from('docente')
.join('turma', null, 'docente.turma_id=turma.id AND docente.ano_censo=turma.ano_censo')
.group('docente.ano_censo')
.order('docente.ano_censo')
.where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)')
.where('docente.profissionalizante = 1');
next();
} else {
next();
}
}, rqf.build(), query, (req, res, next) => {
req.result.forEach((result) => {
result.education_level_mod_id = 11;
req.oldResult.push(result);
});
req.result = req.oldResult;
next();
}, id2str.transform(), response('teacher'));
module.exports = teacherApp; module.exports = teacherApp;
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