Commit c16b23d6 authored by ns17's avatar ns17

fix ordering of employees routes and enrollment

parent 5e5addbf
Pipeline #24261 failed with stage
in 2 minutes
......@@ -581,7 +581,7 @@ employeesApp.get('/', rqfSchool.parse(), (req, res, next) => {
}
next();
}, rqfSchool.build(), query, rqfSchool.parse(), id2str.transform(), (req, res, next) => {
}, rqfSchool.build(), query, addMissing(rqfSchool), rqfSchool.parse(), id2str.transform(), (req, res, next) => {
req.allTeacher = req.result;
req.resetSql();
......@@ -617,7 +617,7 @@ employeesApp.get('/', rqfSchool.parse(), (req, res, next) => {
}
next();
}, rqfSchool.build(), query, rqfSchool.parse(), id2str.transform(), (req, res, next) => {
}, rqfSchool.build(), query, addMissing(rqfSchool), rqfSchool.parse(), id2str.transform(), (req, res, next) => {
if ("function" in req.dims) {
let aux_employes = formatFunction(req.result, req.dims);
......
......@@ -598,7 +598,7 @@ enrollmentApp.get('/', rqf.parse(), (req, res, next) => {
.order('matricula.ano_censo')
.where('((matricula.tipo<=3 OR matricula.tipo IS NULL) AND (matricula.tipo_atendimento_turma IS NULL OR matricula.tipo_atendimento_turma <= 2))');
next();
}, rqf.build(), query, id2str.transform(false), addMissing(rqf), response('enrollment'));
}, rqf.build(), query, addMissing(rqf), id2str.transform(false), addMissing(rqf), response('enrollment'));
enrollmentApp.get('/diagnosis', rqf.parse(), (req, res, next) => {
req.dims = {};
......@@ -617,7 +617,7 @@ enrollmentApp.get('/diagnosis', rqf.parse(), (req, res, next) => {
.where('matricula.tipo<=3');
next();
}, rqf.build(), query, id2str.transform(), (req, res, next) => {
}, rqf.build(), query, addMissing(rqf), id2str.transform(), (req, res, next) => {
let enrollments = req.result;
// Gera a relação etapa de ensino X ano escolar
......@@ -836,7 +836,7 @@ enrollmentApp.get('/projection', rqf.parse(), (req, res, next) => {
.where('matricula.tipo<=3');
next();
}, rqf.build(), query, id2str.transform(), (req, res, next) => {
}, rqf.build(), query, addMissing(rqf), id2str.transform(), (req, res, next) => {
let enrollments = req.result;
// Gera a relação etapa de ensino X ano escolar
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment