Merge branch 'integral_time' into 'development'

Integral time treatment

See merge request !43

src/libs/convert/integralTime.js

+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';
+};

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
 };

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',