Merge branch 'uptade_enrollment_to_master' into v1.6.0

src/libs/middlewares/id2str.js

@@ -20,6 +20,7 @@ const stateName = require(`${libs}/convert/stateName`);
 const contractType = require(`${libs}/convert/contractType`);
 const ethnicGroupPnad = require(`${libs}/convert/ethnicGroupPnad`);
 const ageRange = require(`${libs}/convert/ageRange`);
+const ageRangeAll = require(`${libs}/convert/ageRangeAll`);
 const fullAgeRange = require(`${libs}/convert/fullAgeRange`);
 const genderPnad = require(`${libs}/convert/genderPnad`);
 const fifthHouseholdIncome = require(`${libs}/convert/fifthHouseholdIncome`);
@@ -28,6 +29,8 @@ const educationLevelBasic = require(`${libs}/convert/educationLevelBasic`);
 const useTransport = require(`${libs}/convert/booleanVariable`);
 const useTransportPublic = require(`${libs}/convert/booleanVariable`);
 const transportationManager = require(`${libs}/convert/transportationManager`);
+const specialClass = require(`${libs}/convert/booleanVariable`);
+
 
 const ids = {
     gender_id: gender,
@@ -61,13 +64,15 @@ const ids = {
     contract_type_id: contractType,
     ethnic_group_pnad_id: ethnicGroupPnad,
     age_range_id: ageRange,
+    age_range_all_id: ageRangeAll,
     full_age_range_id: fullAgeRange,
     gender_pnad_id: genderPnad,
     fifth_household_income_id: fifthHouseholdIncome,
     extremes_household_income_id: extremesHouseholdIncome,
     use_transport_id: useTransport,
     use_transport_public_id: useTransportPublic,
-    transportation_manager_id: transportationManager
+    transportation_manager_id: transportationManager,
+    special_class_id: specialClass
 };
 
 function transform(removeId=false) {
@@ -130,10 +135,12 @@ module.exports = {
     contractType,
     ethnicGroupPnad,
     ageRange,
+    ageRangeAll,
     fullAgeRange,
     genderPnad,
     fifthHouseholdIncome,
     extremesHouseholdIncome,
     useTransport,
-    transportationManager
+    transportationManager,
+    specialClass
 };

src/libs/routes/enrollment.js

@@ -214,6 +214,33 @@ enrollmentApp.get('/integral_time', (req, res, next) => {
     next();
 }, response('integral_time'));
 
+enrollmentApp.get('/special_class', (req, res, next) => {
+    req.result = [
+        {id: null, name: 'Não Declarado'},
+        {id: 0, name: 'Não'},
+        {id: 1, name: 'Sim'}
+    ];
+    next();
+}, response('special_class'));
+
+enrollmentApp.get('/age_range_all', (req, res, next) => {
+    req.result = [
+        {id: 1, name: '0 a 3 anos'},
+        {id: 2, name: '4 a 5 anos'},
+        {id: 3, name: '6 a 10 anos'},
+        {id: 4, name: '11 a 14 anos'},
+        {id: 5, name: '15 a 17 anos'},
+        {id: 6, name: '18 a 24 anos'},
+        {id: 7, name: '25 a 29 anos'},
+        {id: 8, name: '30 a 40 anos'},
+        {id: 9, name: '41 a 50 anos'},
+        {id: 10, name: '51 a 64 anos'},
+        {id: 11, name: 'Mais que 64 anos'}
+    ];
+    next();
+}, response('age_range_all'));
+
+
 rqf.addField({
     name: 'filter',
     field: false,
@@ -452,6 +479,26 @@ rqf.addField({
       type: 'boolean',
       field: 'tempo_integral'
   }
+}).addValue({
+  name:'age_range_all',
+  table: 'matricula',
+  tableField: 'faixa_etaria_31_03',
+  resultField: 'age_range_all_id',
+  where: {
+      relation: '=',
+      type: 'integer',
+      field: 'faixa_etaria_31_03'
+  }
+}).addValue({
+  name:'special_class',
+  table: 'matricula',
+  tableField: 'exclusiva_especial',
+  resultField: 'special_class_id',
+  where: {
+      relation: '=',
+      type: 'boolean',
+      field: 'exclusiva_especial'
+  }
 });
 
 enrollmentApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {