diff --git a/src/libs/app.js b/src/libs/app.js
index 97c2683afc278eaa23034809338dae644a12a115..662b3e9d21e8c328bf6efef8e700ee00c16f8765 100644
--- a/src/libs/app.js
+++ b/src/libs/app.js
@@ -32,6 +32,13 @@ app.use(methodOverride());
// Middleware tha adds the squel object to req
app.use((req, res, next) => {
req.sql = squel.select();
+ // HACK to know wich table we are using
+ req.sql.oldFrom = req.sql.from;
+ req.sql.from = (name, alias = null) => {
+ req.sql.oldFrom(name, alias || null);
+ req.sql.tableFrom = name;
+ return req.sql;
+ };
next();
});
app.use((req, res, next) => {
@@ -52,6 +59,7 @@ app.use((req, res, next) => {
app.use((err, req, res, next) => {
res.status(err.status || 500);
log.error('%s %d %s', req.method, res.statusCode, err.message);
+ log.error(err);
res.json({ error: err.message }).end();
});
diff --git a/src/libs/convert/educationLevelShort.js b/src/libs/convert/educationLevelShort.js
new file mode 100644
index 0000000000000000000000000000000000000000..3d543ee98690179952ab97b3b9a9ad6056741a3f
--- /dev/null
+++ b/src/libs/convert/educationLevelShort.js
@@ -0,0 +1,20 @@
+module.exports = function educationLevelShort(id) {
+ switch (id) {
+ case 1:
+ return 'Creche';
+ case 2:
+ return 'Pré-Escola';
+ case 3:
+ return 'Ensino Fundamental - anos iniciais';
+ case 4:
+ return 'Ensino Fundamental - anos finais';
+ case 5:
+ return 'Ensino Médio';
+ case 6:
+ return 'EJA';
+ case 7:
+ return 'EE exclusiva';
+ default:
+ return 'Não classificado';
+ }
+};
diff --git a/src/libs/convert/ruralLocation.js b/src/libs/convert/ruralLocation.js
new file mode 100644
index 0000000000000000000000000000000000000000..7fa97d527a5001cf8d8ebf2f0a2fac4fcdd6cfe5
--- /dev/null
+++ b/src/libs/convert/ruralLocation.js
@@ -0,0 +1,16 @@
+module.exports = function ruralLocation(id) {
+ switch (id) {
+ case 1:
+ return 'Urbana';
+ case 2:
+ return 'Rural';
+ case 3:
+ return 'Rural - Ãrea de assentamento';
+ case 4:
+ return 'Rural - Terra indÃgena';
+ case 5:
+ return 'Rural - Ãrea remanescente de quilombos';
+ case 6:
+ return 'Rural - Unidade de uso sustentável';
+ }
+};
diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js
index ae9ae4634767e7a14a2ea197335d05169ea10618..9304758c47e84a553e37f6c0f9d644addb785208 100644
--- a/src/libs/middlewares/id2str.js
+++ b/src/libs/middlewares/id2str.js
@@ -4,11 +4,13 @@ const period = require(`${libs}/convert/period`);
const schoolYear = require(`${libs}/convert/schoolYear`);
const admDependency = require(`${libs}/convert/admDependency`);
const location = require(`${libs}/convert/location`);
+const ruralLocation = require(`${libs}/convert/ruralLocation`);
const ethnicGroup = require(`${libs}/convert/ethnicGroup`);
const agreement = require(`${libs}/convert/agreement`);
const booleanVariable = require(`${libs}/convert/booleanVariable`);
const educationLevel = require(`${libs}/convert/educationLevel`);
const educationLevelMod = require(`${libs}/convert/educationLevelMod`);
+const educationLevelShort = require(`${libs}/convert/educationLevelShort`);
const educationType = require(`${libs}/convert/educationType`);
const ids = {
@@ -17,9 +19,11 @@ const ids = {
school_year_id: schoolYear,
education_level_id: educationLevel,
education_level_mod_id: educationLevelMod,
+ education_level_short_id: educationLevelShort,
adm_dependency_id: admDependency,
adm_dependency_detailed_id: admDependency,
location_id: location,
+ rural_location_id: ruralLocation,
ethnic_group_id: ethnicGroup,
agreement_id: agreement,
integral_time_id: booleanVariable,
diff --git a/src/libs/middlewares/reqQueryFields.js b/src/libs/middlewares/reqQueryFields.js
index 8dcf018b0cd7285312dca6e2f257aa8b03375f5b..664d166eaa83b48c1d8f6ff8ba1e2f86b8e60afd 100644
--- a/src/libs/middlewares/reqQueryFields.js
+++ b/src/libs/middlewares/reqQueryFields.js
@@ -200,6 +200,7 @@ class ReqQueryFields {
return (req, res, next) => {
// Foreach no campos
let hasJoined = {};
+ let thisTable = req.sql.tableFrom;
Object.keys(this.fields).forEach((key) => {
// Campo
let field = this.fields[key];
@@ -217,6 +218,7 @@ class ReqQueryFields {
if(!hasJoined[value.table] && typeof value.join !== 'undefined') {
let foreignTable = '';
if(value.join.foreignTable) foreignTable = value.join.foreignTable+'.';
+ if(value.join.foreignTable === '@') foreignTable = thisTable+'.';
// Fazemos o join
let onClause = '';
if(Array.isArray(value.join.primary)) {
@@ -237,15 +239,18 @@ class ReqQueryFields {
// Se o valor é um campo a ser incluÃdo no SELECT
if(typeof field.field !== 'undefined' && field.field) {
log.debug('SELECT');
+ let table = value.table;
+ if(table === '@') table = thisTable;
if (Array.isArray(value.resultField)) {
value.tableField.forEach((f, i) => {
- req.sql.field(value.table+'.'+f, value.resultField[i] || f)
- .group(value.table+'.'+f);
+ req.sql.field(table+'.'+f, value.resultField[i] || f)
+ .group(table+'.'+f)
+ .order(table+'.'+f);
})
}else{
- req.sql.field(value.table+'.'+value.tableField, value.resultField || value.tableField)
- .order(value.table+'.'+value.tableField)
- .group(value.table+'.'+value.tableField);
+ req.sql.field(table+'.'+value.tableField, value.resultField || value.tableField)
+ .order(table+'.'+value.tableField)
+ .group(table+'.'+value.tableField);
}
}
// Se o valor é um campo para ser usado no WHERE
@@ -259,6 +264,7 @@ class ReqQueryFields {
log.debug(`Where value é array? ${Array.isArray(whereValue)}`);
let tbl = value.where.table || value.table;
+ if (tbl === '@') tbl = thisTable;
// multiple where, only tested for boolean filds
if (Array.isArray(value.tableField)) {
let lower = (value.where.type === 'string') ? ' LOWER(?) ' : ' ? ';
diff --git a/src/libs/routes/class.js b/src/libs/routes/class.js
index 39291ddc4ab0073823c2b34972638da0e2f751ed..382121b5f5f3de1cb47c80b6abc75297846beebc 100644
--- a/src/libs/routes/class.js
+++ b/src/libs/routes/class.js
@@ -30,10 +30,23 @@ classApp.get('/location', (req, res, next) => {
req.sql = squel.select()
.field('id')
.field('descricao', 'name')
- .from('localizacao');
+ .from('localizacao')
+ .where('localizacao.id <= 2');
next();
}, query, response('location'));
+classApp.get('/rural_location', (req, res, next) => {
+ req.result = [
+ {id: 1, name: "Urbana"},
+ {id: 2, name: "Rural"},
+ {id: 3, name: "Rural - Ãrea de assentamento"},
+ {id: 4, name: "Rural - Terra indÃgena"},
+ {id: 5, name: "Rural - Ãrea remanescente de quilombos"},
+ {id: 6, name: "Rural - Unidade de uso sustentável"}
+ ];
+ next();
+}, response('rural_location'));
+
// Returns all adm dependencies
classApp.get('/adm_dependency', (req, res, next) => {
req.sql.from('dependencia_adm')
@@ -76,6 +89,20 @@ classApp.get('/education_level_mod', (req, res, next) => {
next();
}, query, response('education_level_mod'));
+classApp.get('/education_level_short', (req, res, next) => {
+ req.result = [
+ {id: null, name: 'Não Classificado'},
+ {id: 1, name: 'Creche'},
+ {id: 2, name: 'Pré-Escola'},
+ {id: 3, name: 'Ensino Fundamental - anos iniciais'},
+ {id: 4, name: 'Ensino Fundamental - anos finais'},
+ {id: 5, name: 'Ensino Médio'},
+ {id: 6, name: 'EJA'},
+ {id: 7, name: 'EE exclusiva'}
+ ];
+ next();
+}, response('education_level_short'));
+
rqfCount.addField({
name: 'filter',
field: false,
@@ -84,7 +111,23 @@ rqfCount.addField({
name: 'dims',
field: true,
where: false
-}).addValue({
+}).addValueToField({
+ name: 'city',
+ table: 'municipio',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'municipio_id',
+ table: 'turma'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'municipio_id',
+ foreignTable: 'turma'
+ }
+}, 'dims').addValueToField({
name: 'city',
table: 'municipio',
tableField: 'nome',
@@ -100,7 +143,7 @@ rqfCount.addField({
foreign: 'municipio_id',
foreignTable: 'turma'
}
-}).addValue({
+}, 'filter').addValue({
name: 'state',
table: 'estado',
tableField: 'nome',
@@ -171,6 +214,16 @@ rqfCount.addField({
type: 'integer',
field: 'localizacao_id'
}
+}).addValue({
+ name: 'rural_location',
+ table: 'turma',
+ tableField: 'localidade_area_rural',
+ resultField: 'rural_location_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'localidade_area_rural'
+ }
}).addValue({
name:'education_level_mod',
table: 'turma',
@@ -181,6 +234,16 @@ rqfCount.addField({
type: 'integer',
field: 'etapas_mod_ensino_segmento_id'
}
+}).addValue({
+ name: 'education_level_short',
+ table: 'turma',
+ tableField: 'etapa_resumida',
+ resultField: 'education_level_short_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'etapa_resumida'
+ }
}).addValue({
name: 'adm_dependency_detailed',
table: 'turma',
@@ -239,6 +302,6 @@ classApp.get('/', rqfCount.parse(), rqfCount.build(), (req, res, next) => {
.order('turma.ano_censo')
.where('turma.tipo_turma_id = 0 OR turma.tipo_turma_id = 1 OR turma.tipo_turma_id = 2 OR turma.tipo_turma_id = 3');
next();
-}, query, id2str.transform(true), response('class'));
+}, query, id2str.transform(), response('class'));
module.exports = classApp;
diff --git a/src/libs/routes/classroom.js b/src/libs/routes/classroom.js
index 7140bba1b34a03138bbac1fccdf73f07c721ebe6..58599f19a8e94761d76a2de3e1f21d56456a17de 100644
--- a/src/libs/routes/classroom.js
+++ b/src/libs/routes/classroom.js
@@ -67,7 +67,23 @@ rqf.addField({
type: 'integer',
field: 'id'
}
-}).addValue({
+}).addValueToField({
+ name: 'city',
+ table: 'municipio',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'municipio_id',
+ table: 'escola'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'municipio_id',
+ foreignTable: 'escola'
+ }
+}, 'dims').addValueToField({
name: 'city',
table: 'municipio',
tableField: 'nome',
@@ -83,7 +99,7 @@ rqf.addField({
foreign: 'municipio_id',
foreignTable: 'escola'
}
-}).addValue({
+}, 'filter').addValue({
name: 'state',
table: 'estado',
tableField: 'nome',
@@ -176,6 +192,6 @@ classroomApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.order('escola.ano_censo')
.where('escola.situacao_de_funcionamento = 1 AND escola.local_func_predio_escolar = 1');
next();
-}, query, id2str.transform(true), response('classroom'));
+}, query, id2str.transform(), response('classroom'));
module.exports = classroomApp;
diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index c4d13a9820d137e5f101dfc40a1a8220a04d72e2..b7dc9b170db18b294fcdb222d4f9f24a88980e25 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -31,10 +31,23 @@ enrollmentApp.get('/location', (req, res, next) => {
req.sql = squel.select()
.field('id')
.field('descricao', 'name')
- .from('localizacao');
+ .from('localizacao')
+ .where('localizacao.id <= 2');
next();
}, query, response('location'));
+enrollmentApp.get('/rural_location', (req, res, next) => {
+ req.result = [
+ {id: 1, name: "Urbana"},
+ {id: 2, name: "Rural"},
+ {id: 3, name: "Rural - Ãrea de assentamento"},
+ {id: 4, name: "Rural - Terra indÃgena"},
+ {id: 5, name: "Rural - Ãrea remanescente de quilombos"},
+ {id: 6, name: "Rural - Unidade de uso sustentável"}
+ ];
+ next();
+}, response('rural_location'));
+
// Returns all school years available
enrollmentApp.get('/school_year', (req, res, next) => {
req.sql.from('serie_ano')
@@ -59,6 +72,20 @@ enrollmentApp.get('/education_level_mod', (req, res, next) => {
next();
}, query, response('education_level_mod'));
+enrollmentApp.get('/education_level_short', (req, res, next) => {
+ req.result = [
+ {id: null, name: 'Não Classificado'},
+ {id: 1, name: 'Creche'},
+ {id: 2, name: 'Pré-Escola'},
+ {id: 3, name: 'Ensino Fundamental - anos iniciais'},
+ {id: 4, name: 'Ensino Fundamental - anos finais'},
+ {id: 5, name: 'Ensino Médio'},
+ {id: 6, name: 'EJA'},
+ {id: 7, name: 'EE exclusiva'}
+ ];
+ next();
+}, response('education_level_short'));
+
// Returns all adm dependencies
enrollmentApp.get('/adm_dependency', (req, res, next) => {
req.sql.from('dependencia_adm')
@@ -109,7 +136,6 @@ enrollmentApp.get('/integral_time', (req, res, next) => {
next();
}, response('integral_time'));
-
rqf.addField({
name: 'filter',
field: false,
@@ -168,6 +194,16 @@ rqf.addField({
type: 'integer',
field: 'etapas_mod_ensino_segmento_id'
}
+}).addValue({
+ name: 'education_level_short',
+ table: 'matricula',
+ tableField: 'etapa_resumida',
+ resultField: 'education_level_short_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'etapa_resumida'
+ }
}).addValue({
name: 'region',
table: 'regiao',
@@ -198,7 +234,22 @@ rqf.addField({
foreign: 'estado_id',
foreignTable: 'matricula'
}
-}).addValue({
+}).addValueToField({
+ name: 'city',
+ table: 'municipio',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'id'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'municipio_id',
+ foreignTable: 'matricula'
+ }
+}, 'dims').addValueToField({
name: 'city',
table: 'municipio',
tableField: 'nome',
@@ -213,7 +264,22 @@ rqf.addField({
foreign: 'municipio_id',
foreignTable: 'matricula'
}
-}).addValue({
+}, 'filter').addValueToField({
+ name: 'school',
+ table: 'escola',
+ tableField: ['nome_escola', 'id'],
+ resultField: ['school_name', 'school_id'],
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'id'
+ },
+ join: {
+ primary: ['id', 'ano_censo'],
+ foreign: ['escola_id', 'ano_censo'],
+ foreignTable: 'matricula'
+ }
+}, 'dims').addValueToField({
name: 'school',
table: 'escola',
tableField: 'nome_escola',
@@ -228,7 +294,7 @@ rqf.addField({
foreign: ['escola_id', 'ano_censo'],
foreignTable: 'matricula'
}
-}).addValue({
+}, 'filter').addValue({
name: 'location',
table: 'matricula',
tableField: 'localizacao_id',
@@ -238,6 +304,16 @@ rqf.addField({
type: 'integer',
field: 'localizacao_id'
}
+}).addValue({
+ name: 'rural_location',
+ table: 'matricula',
+ tableField: 'localidade_area_rural',
+ resultField: 'rural_location_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'localidade_area_rural'
+ }
}).addValue({
name: 'min_year',
table: 'matricula',
@@ -310,7 +386,7 @@ enrollmentApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.order('matricula.ano_censo')
.where('matricula.tipo<=3');
next();
-}, query, id2str.transform(true), response('enrollment'));
+}, query, id2str.transform(false), response('enrollment'));
let simRqf = new ReqQueryFields();
diff --git a/src/libs/routes/region.js b/src/libs/routes/region.js
index 1d4344ab95ca3f142d36207ea2fcca976eb3c093..7b08ddea57d429c8c0307cba7acf62e9f93f7de0 100644
--- a/src/libs/routes/region.js
+++ b/src/libs/routes/region.js
@@ -22,13 +22,13 @@ rqf.addField({
where: true
}).addValue({
name: 'id',
- table: 'regiao',
+ table: '@',
tableField: 'id',
where: {
relation: '=',
type: 'integer',
field: 'id',
- table: 'regiao'
+ table: '@'
}
}).addField({
name: 'search',
@@ -36,22 +36,23 @@ rqf.addField({
where: true
}).addValueToField({
name: 'name',
- table: 'regiao',
+ table: '@',
tableField: 'nome',
where: {
relation: 'LIKE',
type: 'string',
field: 'nome',
- table: 'regiao'
+ table: '@'
}
}, 'search');
-regionApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
+regionApp.get('/', rqf.parse(), (req, res, next) => {
req.sql.from('regiao')
.field('id')
.field('nome', 'name');
+ console.log(req.sql.toString());
next();
-}, query, response('region'));
+}, rqf.build(), query, response('region'));
const agenda = require(`${libs}/agenda`);
diff --git a/src/libs/routes/school.js b/src/libs/routes/school.js
index 659730083c3c49928eb8a6d4adb241a1940f7614..5320c29fbb3810d6c0b8b71492bbfe64e25c208a 100644
--- a/src/libs/routes/school.js
+++ b/src/libs/routes/school.js
@@ -33,6 +33,18 @@ schoolApp.get('/location', (req, res, next) => {
next();
}, response('location'));
+schoolApp.get('/rural_location', (req, res, next) => {
+ req.result = [
+ {id: 1, name: "Urbana"},
+ {id: 2, name: "Rural"},
+ {id: 3, name: "Rural - Ãrea de assentamento"},
+ {id: 4, name: "Rural - Terra indÃgena"},
+ {id: 5, name: "Rural - Ãrea remanescente de quilombos"},
+ {id: 6, name: "Rural - Unidade de uso sustentável"}
+ ];
+ next();
+}, response('rural_location'));
+
schoolApp.get('/adm_dependency', (req, res, next) => {
req.sql.from('dependencia_adm')
.field('id')
@@ -385,7 +397,23 @@ rqfCount.addField({
type: 'integer',
field: 'id'
}
-}).addValue({
+}).addValueToField({
+ name: 'city',
+ table: 'municipio',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'municipio_id',
+ table: 'escola'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'municipio_id',
+ foreignTable: 'escola'
+ }
+}, 'dims').addValueToField({
name: 'city',
table: 'municipio',
tableField: 'nome',
@@ -401,7 +429,7 @@ rqfCount.addField({
foreign: 'municipio_id',
foreignTable: 'escola'
}
-}).addValue({
+}, 'filter').addValue({
name: 'state',
table: 'estado',
tableField: 'nome',
@@ -483,6 +511,16 @@ rqfCount.addField({
type: 'integer',
field: 'cod_localizacao'
}
+}).addValue({
+ name: 'rural_location',
+ table: 'escola',
+ tableField: 'localidade_area_rural',
+ resultField: 'rural_location_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'localidade_area_rural'
+ }
}).addValue({
name: 'cook_room',
table: 'escola',
@@ -835,8 +873,8 @@ schoolApp.get('/count', rqfCount.parse(), rqfCount.build(), (req, res, next) =>
.field('escola.ano_censo', 'year')
.group('escola.ano_censo')
.order('escola.ano_censo')
- .where('escola.situacao_de_funcionamento = 1 AND escola.ensino_regular = 1');
+ .where('escola.situacao_de_funcionamento = 1 AND (escola.ensino_regular = 1 OR escola.ensino_eja=1 or escola.educacao_profissional=1)');
next();
-}, query, id2str.transform(true), response('school'));
+}, query, id2str.transform(), response('school'));
module.exports = schoolApp;
diff --git a/src/libs/routes/teacher.js b/src/libs/routes/teacher.js
index 130bd9fa3b30d793922b5795f2e519062fbd2689..12cd08c12d98571bffd986478491a06de023e111 100644
--- a/src/libs/routes/teacher.js
+++ b/src/libs/routes/teacher.js
@@ -48,6 +48,20 @@ teacherApp.get('/education_level_mod', (req, res, next) => {
next();
}, query, response('education_level_mod'));
+teacherApp.get('/education_level_short', (req, res, next) => {
+ req.result = [
+ {id: null, name: 'Não Classificado'},
+ {id: 1, name: 'Creche'},
+ {id: 2, name: 'Pré-Escola'},
+ {id: 3, name: 'Ensino Fundamental - anos iniciais'},
+ {id: 4, name: 'Ensino Fundamental - anos finais'},
+ {id: 5, name: 'Ensino Médio'},
+ {id: 6, name: 'EJA'},
+ {id: 7, name: 'EE exclusiva'}
+ ];
+ next();
+}, response('education_level_short'));
+
teacherApp.get('/location', (req, res, next) => {
req.sql.from('localizacao')
.field('id')
@@ -56,6 +70,18 @@ teacherApp.get('/location', (req, res, next) => {
next();
}, query, response('location'));
+teacherApp.get('/rural_location', (req, res, next) => {
+ req.result = [
+ {id: 1, name: "Urbana"},
+ {id: 2, name: "Rural"},
+ {id: 3, name: "Rural - Ãrea de assentamento"},
+ {id: 4, name: "Rural - Terra indÃgena"},
+ {id: 5, name: "Rural - Ãrea remanescente de quilombos"},
+ {id: 6, name: "Rural - Unidade de uso sustentável"}
+ ];
+ next();
+}, response('rural_location'));
+
teacherApp.get('/education_type', (req, res, next) => {
req.sql.from('docente')
.field('DISTINCT nivel_tipo_formacao', 'id')
@@ -121,6 +147,16 @@ rqf.addField({
type: 'integer',
field: 'etapas_mod_ensino_segmento_id'
}
+}).addValue({
+ name: 'education_level_short',
+ table: 'docente',
+ tableField: 'etapa_resumida',
+ resultField: 'education_level_short_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'etapa_resumida'
+ }
}).addValue({
name: 'education_type',
table: 'docente',
@@ -161,7 +197,22 @@ rqf.addField({
foreign: 'escola_estado_id',
foreignTable: 'docente'
}
-}).addValue({
+}).addValueToField({
+ name: 'city',
+ table: 'municipio',
+ tableField: ['nome', 'id'],
+ resultField: ['city_name', 'city_id'],
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'id'
+ },
+ join: {
+ primary: 'id',
+ foreign: 'escola_municipio_id',
+ foreignTable: 'docente'
+ }
+}, 'dims').addValueToField({
name: 'city',
table: 'municipio',
tableField: 'nome',
@@ -176,7 +227,7 @@ rqf.addField({
foreign: 'escola_municipio_id',
foreignTable: 'docente'
}
-}).addValue({
+}, 'filter').addValue({
name: 'school',
table: 'escola',
tableField: 'nome_escola',
@@ -201,6 +252,16 @@ rqf.addField({
type: 'integer',
field: 'cod_localizacao'
}
+}).addValue({
+ name: 'rural_location',
+ table: 'docente',
+ tableField: 'localidade_area_rural',
+ resultField: 'rural_location_id',
+ where: {
+ relation: '=',
+ type: 'integer',
+ field: 'localidade_area_rural'
+ }
}).addValue({
name: 'min_year',
table: 'docente',
@@ -239,7 +300,7 @@ rqf.addField({
where: {
relation: '=',
type: 'integer',
- field: 'cor_raca_id'
+ field: 'cor_raca'
}
});
@@ -253,6 +314,6 @@ teacherApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.order('docente.ano_censo')
.where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)');
next();
-}, query, id2str.transform(true), response('teacher'));
+}, query, id2str.transform(), response('teacher'));
module.exports = teacherApp;
diff --git a/src/test/class.js b/src/test/class.js
index 32f89e3bacec3313f59067b8ff1102da230b037b..c6fd205a5c0c48fd72c6d49d1846fc1682269159 100644
--- a/src/test/class.js
+++ b/src/test/class.js
@@ -38,6 +38,20 @@ describe('request class', () => {
});
});
+ it('should list the rural locations', (done) => {
+ chai.request(server)
+ .get('/api/v1/class/rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
+ done();
+ });
+ });
+
it('should list the education level', (done) => {
chai.request(server)
.get('/api/v1/class/education_level_mod')
@@ -52,6 +66,20 @@ describe('request class', () => {
});
});
+ it('should list the education level short', (done) => {
+ chai.request(server)
+ .get('/api/v1/class/education_level_short')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
+ done();
+ });
+ });
+
it('should list the administrative dependencies', (done) => {
chai.request(server)
.get('/api/v1/class/adm_dependency_detailed')
@@ -170,4 +198,30 @@ describe('request class', () => {
done();
});
});
+
+ it('should list class with dimension rural_location', (done) => {
+ chai.request(server)
+ .get('/api/v1/class?dims=rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('rural_location_name');
+ done();
+ });
+ });
+
+ it('should list enrollment with dimension education_level_short', (done) => {
+ chai.request(server)
+ .get('/api/v1/class?dims=education_level_short')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('education_level_short_name');
+ done();
+ });
+ });
});
diff --git a/src/test/enrollment.js b/src/test/enrollment.js
index ca4bf0314fc8335147d7b35b20d510e49e772b20..55a47628f5b7a5655f9bbd5eeec8feba43a31425 100644
--- a/src/test/enrollment.js
+++ b/src/test/enrollment.js
@@ -52,6 +52,20 @@ describe('request enrollments', () => {
});
});
+ it('should list the rural locations', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment/rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
+ done();
+ });
+ });
+
it('should list the school year', (done) => {
chai.request(server)
.get('/api/v1/enrollment/school_year')
@@ -94,6 +108,20 @@ describe('request enrollments', () => {
});
});
+ it('should list the education level short', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment/education_level_short')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
+ done();
+ });
+ });
+
it('should list the administrative dependencies', (done) => {
chai.request(server)
.get('/api/v1/enrollment/adm_dependency')
@@ -220,23 +248,6 @@ describe('request enrollments', () => {
});
});
- it('should list enrollments with valid dimensions', (done) => {
- chai.request(server)
- .get('/api/v1/enrollment?dims=region,state,adm_dependency,location,gender,period,school_year,location,ethnic_group')
- .end((err, res) => {
- res.should.have.status(200);
- res.should.be.json;
- res.body.should.have.property('result');
- res.body.result.should.be.a('array');
- res.body.result[0].should.have.property('region_name');
- res.body.result[0].should.have.property('state_name');
- res.body.result[0].should.have.property('adm_dependency_name');
- res.body.result[0].should.have.property('location_name');
- res.body.result[0].should.have.property('total');
- done();
- });
- });
-
it('should list enrollments with invalid dimensions', (done) => {
chai.request(server)
.get('/api/v1/enrollment?dims=foo,bar')
@@ -292,7 +303,19 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('location_name');
- res.body.result[0].should.not.have.property('location_id');
+ done();
+ });
+ });
+
+ it('should list enrollment with dimension rural_location', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?dims=rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('rural_location_name');
done();
});
});
@@ -306,7 +329,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('school_year_name');
- res.body.result[0].should.not.have.property('school_year_id');
done();
});
});
@@ -320,7 +342,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('education_level_name');
- res.body.result[0].should.not.have.property('education_level_id');
done();
});
});
@@ -334,7 +355,19 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('education_level_mod_name');
- res.body.result[0].should.not.have.property('education_level_mod_id');
+ done();
+ });
+ });
+
+ it('should list enrollment with dimension education_level_short', (done) => {
+ chai.request(server)
+ .get('/api/v1/enrollment?dims=education_level_short')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('education_level_short_name');
done();
});
});
@@ -348,7 +381,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('adm_dependency_name');
- res.body.result[0].should.not.have.property('adm_dependency_id');
done();
});
});
@@ -362,7 +394,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('adm_dependency_detailed_name');
- res.body.result[0].should.not.have.property('adm_dependency_detailed_id');
done();
});
});
@@ -376,7 +407,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('gender_name');
- res.body.result[0].should.not.have.property('gender_id');
done();
});
});
@@ -390,7 +420,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('ethnic_group_name');
- res.body.result[0].should.not.have.property('ethnic_group_id');
done();
});
});
@@ -404,7 +433,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('period_name');
- res.body.result[0].should.not.have.property('period_id');
done();
});
});
@@ -418,7 +446,6 @@ describe('request enrollments', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('integral_time_name');
- res.body.result[0].should.not.have.property('integral_time_id');
done();
});
});
diff --git a/src/test/schoolCount.js b/src/test/schoolCount.js
index 0a94f2d7a9b235cef2d2136f5d52f75ad6cfe12d..59c100000b03263bab56c12fc895339a08d764f6 100644
--- a/src/test/schoolCount.js
+++ b/src/test/schoolCount.js
@@ -39,6 +39,20 @@ describe('request schools count', () => {
});
});
+ it('should list the rural locations', (done) => {
+ chai.request(server)
+ .get('/api/v1/school/rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
+ done();
+ });
+ });
+
it('should list the administrative dependencies', (done) => {
chai.request(server)
.get('/api/v1/school/adm_dependency')
@@ -637,4 +651,17 @@ describe('request schools count', () => {
done();
});
});
+
+ it('should list school with dimension rural_location', (done) => {
+ chai.request(server)
+ .get('/api/v1/school/count?dims=rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('rural_location_name');
+ done();
+ });
+ });
});
diff --git a/src/test/teacher.js b/src/test/teacher.js
index 0b3cb7bdd528ddde998d5fc35e1aabd35e95b1c9..d32c93e9ad505484de1e3f943fd13d86d8514ba6 100644
--- a/src/test/teacher.js
+++ b/src/test/teacher.js
@@ -52,6 +52,20 @@ describe('request teachers', () => {
});
});
+ it('should list the rural locations', (done) => {
+ chai.request(server)
+ .get('/api/v1/teacher/rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
+ done();
+ });
+ });
+
it('should list the education level mod', (done) => {
chai.request(server)
.get('/api/v1/teacher/education_level_mod')
@@ -66,6 +80,20 @@ describe('request teachers', () => {
});
});
+ it('should list the education level short', (done) => {
+ chai.request(server)
+ .get('/api/v1/teacher/education_level_short')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('id');
+ res.body.result[0].should.have.property('name');
+ done();
+ });
+ });
+
it('should list the education type', (done) => {
chai.request(server)
.get('/api/v1/teacher/education_type')
@@ -236,7 +264,19 @@ describe('request teachers', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('location_name');
- res.body.result[0].should.not.have.property('location_id');
+ done();
+ });
+ });
+
+ it('should list teacher count with dimension rural_location', (done) => {
+ chai.request(server)
+ .get('/api/v1/teacher?dims=rural_location')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('rural_location_name');
done();
});
});
@@ -250,7 +290,19 @@ describe('request teachers', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('education_level_mod_name');
- res.body.result[0].should.not.have.property('education_level_mod_id');
+ done();
+ });
+ });
+
+ it('should list enrollment with dimension education_level_short', (done) => {
+ chai.request(server)
+ .get('/api/v1/teacher?dims=education_level_short')
+ .end((err, res) => {
+ res.should.have.status(200);
+ res.should.be.json;
+ res.body.should.have.property('result');
+ res.body.result.should.be.a('array');
+ res.body.result[0].should.have.property('education_level_short_name');
done();
});
});
@@ -264,7 +316,6 @@ describe('request teachers', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('education_type_name');
- res.body.result[0].should.not.have.property('education_type_id');
done();
});
});
@@ -278,7 +329,6 @@ describe('request teachers', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('adm_dependency_name');
- res.body.result[0].should.not.have.property('adm_dependency_id');
done();
});
});
@@ -292,7 +342,6 @@ describe('request teachers', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('adm_dependency_detailed_name');
- res.body.result[0].should.not.have.property('adm_dependency_detailed_id');
done();
});
});
@@ -306,7 +355,6 @@ describe('request teachers', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('gender_name');
- res.body.result[0].should.not.have.property('gender_id');
done();
});
});
@@ -320,7 +368,6 @@ describe('request teachers', () => {
res.body.should.have.property('result');
res.body.result.should.be.a('array');
res.body.result[0].should.have.property('ethnic_group_name');
- res.body.result[0].should.not.have.property('ethnic_group_id');
done();
});
});