Skip to content
Snippets Groups Projects
Commit 9c7176ac authored by Leon A. Okida Gonçalves's avatar Leon A. Okida Gonçalves
Browse files

Fix routes to use escola_id field instead of id, removed unnecessary console logs

parent fd0274da
No related branches found
No related tags found
4 merge requests!377prd_version of simcaq,!373merge dev -> homologa,!367Add functional version of middleware, add flag to check whether it runs...,!366Add functional version of middleware, add flag to check whether it runs...
...@@ -136,7 +136,7 @@ const courseStudents = require(`${libs}/routes_v2/courseStudents`); ...@@ -136,7 +136,7 @@ const courseStudents = require(`${libs}/routes_v2/courseStudents`);
const simcaqFirstReport = require(`${libs}/routes_v2/simcaqFirstReport`); const simcaqFirstReport = require(`${libs}/routes_v2/simcaqFirstReport`);
const enrollmentDiagnosis = require(`${libs}/routes_v2/enrollment_diagnosis`); const simcaqEnrollmentDiagnosis = require(`${libs}/routes_v2/simcaqEnrollmentDiagnosis`);
const simcaqSecondReport = require(`${libs}/routes_v2/simcaqSecondReport`); const simcaqSecondReport = require(`${libs}/routes_v2/simcaqSecondReport`);
...@@ -199,7 +199,7 @@ api.use('/universityLocalOffer', universityLocalOffer); ...@@ -199,7 +199,7 @@ api.use('/universityLocalOffer', universityLocalOffer);
api.use('/message', message); api.use('/message', message);
api.use('/course_students', courseStudents); api.use('/course_students', courseStudents);
api.use('/simcaq_first_report', simcaqFirstReport); api.use('/simcaq_first_report', simcaqFirstReport);
api.use('/enrollment_diagnosis', enrollmentDiagnosis); api.use('/simcaq_enrollment_diagnosis', simcaqEnrollmentDiagnosis);
api.use('/simcaq_second_report', simcaqSecondReport); api.use('/simcaq_second_report', simcaqSecondReport);
module.exports = api; module.exports = api;
...@@ -20,7 +20,7 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>. ...@@ -20,7 +20,7 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
const express = require('express'); const express = require('express');
const enrollmentDiagnosisApp = express.Router(); const simcaqEnrollmentDiagnosisApp = express.Router();
const libs = `${process.cwd()}/libs`; const libs = `${process.cwd()}/libs`;
...@@ -40,7 +40,7 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i ...@@ -40,7 +40,7 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i
let rqf = new ReqQueryFields(); let rqf = new ReqQueryFields();
enrollmentDiagnosisApp.use(cache('15 day')); simcaqEnrollmentDiagnosisApp.use(cache('15 day'));
rqf.addField({ rqf.addField({
name: 'filter', name: 'filter',
...@@ -76,11 +76,11 @@ rqf.addField({ ...@@ -76,11 +76,11 @@ rqf.addField({
}).addValue({ }).addValue({
name: 'school', name: 'school',
table: 'simcaq_diagnostico_de_matricula', table: 'simcaq_diagnostico_de_matricula',
tableField: 'id', tableField: 'escola_id',
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
field: 'id' field: 'escola_id'
} }
}).addValue({ }).addValue({
name: 'stage', name: 'stage',
...@@ -111,7 +111,7 @@ rqf.addField({ ...@@ -111,7 +111,7 @@ rqf.addField({
} }
}); });
enrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { simcaqEnrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
req.sql.from('simcaq_diagnostico_de_matricula') req.sql.from('simcaq_diagnostico_de_matricula')
.field('simcaq_diagnostico_de_matricula.etapa', 'stage') .field('simcaq_diagnostico_de_matricula.etapa', 'stage')
.field('SUM(simcaq_diagnostico_de_matricula.total)', 'total') .field('SUM(simcaq_diagnostico_de_matricula.total)', 'total')
...@@ -125,9 +125,7 @@ enrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -125,9 +125,7 @@ enrollmentDiagnosisApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field('SUM(simcaq_diagnostico_de_matricula.matriculas_urbana)', 'urban_enrollments') .field('SUM(simcaq_diagnostico_de_matricula.matriculas_urbana)', 'urban_enrollments')
.field('SUM(simcaq_diagnostico_de_matricula.matriculas_rural)', 'rural_enrollments') .field('SUM(simcaq_diagnostico_de_matricula.matriculas_rural)', 'rural_enrollments')
.group('simcaq_diagnostico_de_matricula.etapa'); .group('simcaq_diagnostico_de_matricula.etapa');
console.log(req.sql.toString());
next(); next();
}, query, response('enrollmentDiagnosis')); }, query, response('enrollmentDiagnosis'));
module.exports = enrollmentDiagnosisApp; module.exports = simcaqEnrollmentDiagnosisApp;
...@@ -85,11 +85,11 @@ rqf.addField({ ...@@ -85,11 +85,11 @@ rqf.addField({
}).addValue({ }).addValue({
name: 'school', name: 'school',
table: 'simcaq_relatorio_1', table: 'simcaq_relatorio_1',
tableField: 'id', tableField: 'escola_id',
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
field: 'id' field: 'escola_id'
} }
}).addValue({ }).addValue({
name: 'location', name: 'location',
......
...@@ -58,11 +58,11 @@ rqf.addField({ ...@@ -58,11 +58,11 @@ rqf.addField({
}).addValue({ }).addValue({
name: 'school', name: 'school',
table: 'simcaq_relatorio_2', table: 'simcaq_relatorio_2',
tableField: 'id', tableField: 'escola_id',
where: { where: {
relation: '=', relation: '=',
type: 'integer', type: 'integer',
field: 'id' field: 'escola_id'
} }
}).addValue({ }).addValue({
name: 'city', name: 'city',
......
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