Skip to content
Snippets Groups Projects
Commit 613e743b authored by Guiusepe's avatar Guiusepe
Browse files

adding new diff_location to auxiliar route

parent ed610b3f
No related branches found
No related tags found
3 merge requests!309Merge new updates into master,!287Homologa,!284Diff location routes
...@@ -101,27 +101,22 @@ auxiliarApp.get('/adm_dependency', (req, res, next) => { ...@@ -101,27 +101,22 @@ auxiliarApp.get('/adm_dependency', (req, res, next) => {
}, response('adm_dependency')); }, response('adm_dependency'));
auxiliarApp.get('/location', (req, res, next) => { auxiliarApp.get('/location', (req, res, next) => {
req.result = []; req.result = [
for(let i = 1; i <= 2; ++i) { {id: 1, name: 'Urbana'},
req.result.push({ {id: 2, name: 'Rural'}
id: i, ];
name: id2str.location(i)
});
};
next(); next();
}, response('location')); }, response('location'));
auxiliarApp.get('/rural_location', (req, res, next) => { auxiliarApp.get('/diff_location', (req, res, next) => {
req.result = [ req.result = [
{id: 1, name: "Urbana"}, {id: 0, name: "A escola não está em localidade diferenciada"},
{id: 2, name: "Rural"}, {id: 1, name: "Área de assentamento"},
{id: 3, name: "Rural - Área de assentamento"}, {id: 2, name: "Terra indígena"},
{id: 4, name: "Rural - Terra indígena"}, {id: 3, name: "Terra remanescente de quilombos"},
{id: 5, name: "Rural - Área remanescente de quilombos"},
{id: 6, name: "Rural - Unidade de uso sustentável"}
]; ];
next(); next();
}, response('rural_location')); }, response('diff_location'));
auxiliarApp.get('/education_level_mod', (req, res, next) => { auxiliarApp.get('/education_level_mod', (req, res, next) => {
req.result = []; req.result = [];
...@@ -316,6 +311,16 @@ rqf.addField({ ...@@ -316,6 +311,16 @@ rqf.addField({
type: 'integer', type: 'integer',
field: 'localizacao_id' field: 'localizacao_id'
} }
}).addValue({
name: 'diff_location',
table: 'docente',
tableField: 'localizacao_diferenciada_par',
resultField: 'diff_location_id',
where: {
relation: '=',
type: 'integer',
field: 'localizacao_diferenciada_par'
}
}).addValue({ }).addValue({
name: 'min_year', name: 'min_year',
table: 'docente', table: 'docente',
......
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