Commit 576e5a68 authored by Pietro Cavassin's avatar Pietro Cavassin
Browse files

Merge branch 'issue792_Pietro' into 'dev'

Issue792 pietro

See merge request !316
parents f143e932 66e88d8e
......@@ -26,7 +26,8 @@ module.exports = function nightTime(id) {
return 'Não';
case 1:
return 'Sim';
case 9:
default:
return 'Curso a distância';
return 'Curso à distância';
}
};
\ No newline at end of file
......@@ -192,7 +192,7 @@ courseCountApp.get('/academic_level', (req, res, next) => {
courseCountApp.get('/upper_education_mod', (req, res, next) => {
req.result = [];
for(let i = 1; i <= 3; ++i) {
for(let i = 1; i <= 2; ++i) {
req.result.push({
id: i,
name: id2str.upperEducationMod(i)
......@@ -211,11 +211,16 @@ courseCountApp.get('/is_free', (req, res, next) => {
}, response('is_free'));
courseCountApp.get('/night_time', (req, res, next) => {
req.result = [
{id: null, name: 'Não Classificado'},
{id: 0, name: 'Não'},
{id: 1, name: 'Sim'}
];
req.result = [{
id: 9,
name: id2str.nightTime(9)
}];
for(let i = 0; i <= 1; ++i) {
req.result.push({
id: i,
name: id2str.nightTime(i)
})
}
next();
}, response('night_time'));
......@@ -659,7 +664,7 @@ rqf.addField({
resultField: 'night_time_id',
where: {
relation: '=',
type: 'boolean',
type: 'integer',
field: 'noturno_curso_t'
}
}).addValue({
......
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