diff --git a/src/libs/convert/integralTime.js b/src/libs/convert/integralTime.js new file mode 100644 index 0000000000000000000000000000000000000000..4014da94c8cdc5dcbb380488b72cca544b1f817a --- /dev/null +++ b/src/libs/convert/integralTime.js @@ -0,0 +1,8 @@ +module.exports = function admDependency(id) { + if (id == null) + return 'Não DisponÃvel'; + else if (id == false) + return 'Não'; + else if (id == true) + return 'Sim'; +}; diff --git a/src/libs/middlewares/id2str.js b/src/libs/middlewares/id2str.js index 99bb7793c456fb5823bb30f3adc26b3bd7895266..9384bf28f759490fd404518f00a5a8f9413813af 100644 --- a/src/libs/middlewares/id2str.js +++ b/src/libs/middlewares/id2str.js @@ -5,6 +5,7 @@ const schoolYear = require(`${libs}/convert/schoolYear`); const admDependency = require(`${libs}/convert/admDependency`); const location = require(`${libs}/convert/location`); const ethnicGroup = require(`${libs}/convert/ethnicGroup`); +const integralTime = require(`${libs}/convert/integralTime`); const educationLevel = require(`${libs}/convert/educationLevel`); const educationLevelMod = require(`${libs}/convert/educationLevelMod`); @@ -17,7 +18,8 @@ const ids = { adm_dependency_id: admDependency, adm_dependency_detailed_id: admDependency, location_id: location, - ethnic_group_id: ethnicGroup + ethnic_group_id: ethnicGroup, + integral_time_id: integralTime }; function transform(removeId=false) { @@ -44,6 +46,7 @@ module.exports = { admDependency, location, ethnicGroup, + integralTime, educationLevel, educationLevelMod }; diff --git a/src/libs/routes/class.js b/src/libs/routes/class.js index 14471b11c3c82c3aa32d2f0e535e97ac356b8f71..6de499d9fda8f7f63ff66320b6518082ce2eb7eb 100644 --- a/src/libs/routes/class.js +++ b/src/libs/routes/class.js @@ -60,7 +60,8 @@ classApp.get('/period', (req, res, next) => { // Returns integral-time avaible classApp.get('/integral_time', (req, res, next) => { - req.result = [ + req.result = [ + {id: null, name: 'Não DisponÃvel'}, {id: 0, name: 'Não'}, {id: 1, name: 'Sim'} ]; @@ -204,7 +205,7 @@ rqfCount.addField({ name:'integral_time', table: 'turma', tableField: 'tempo_integral', - resultField: 'integral_time_name', + resultField: 'integral_time_id', where: { relation: '=', type: 'boolean',