Merge branch 'add_filter_teacher' into development

src/libs/convert/contractType.js

+module.exports = function idhmLevel(id) {
+    switch (id) {
+        case 1:
+        return 'Concursado/Efetivo/Estavél';
+        case 2:
+        return 'Contrato temporário';
+        case 3:
+        return 'Contrato terceirizado';
+        case 4:
+        return 'Contrato CLT';
+        default:
+        return 'Não classificado';
+    }
+};

src/libs/middlewares/id2str.js

@@ -17,6 +17,7 @@ const citySize = require(`${libs}/convert/citySize`);
 const incomeLevel = require(`${libs}/convert/incomeLevel`);
 const idhmLevel = require(`${libs}/convert/idhmLevel`);
 const stateName = require(`${libs}/convert/stateName`);
+const contractType = require(`${libs}/convert/contractType`);
 
 const ids = {
     gender_id: gender,
@@ -45,7 +46,8 @@ const ids = {
     income_level_id: incomeLevel,
     city_size_id: citySize,
     idhm_level_id: idhmLevel,
-    state_id: stateName
+    state_id: stateName,
+    contract_type_id: contractType
 };
 
 function transform(removeId=false) {
@@ -100,5 +102,6 @@ module.exports = {
     incomeLevel,
     citySize,
     idhmLevel,
-    stateName
+    stateName,
+    contractType
 };

src/libs/routes/teacher.js

@@ -16,7 +16,7 @@ const ReqQueryFields = require(`${libs}/middlewares/reqQueryFields`);
 
 const id2str = require(`${libs}/middlewares/id2str`);
 
-const config = require(`${libs}/config`); 
+const config = require(`${libs}/config`);
 
 const request = require(`request`);
 
@@ -132,6 +132,17 @@ teacherApp.get('/gender', (req, res, next) => {
     next();
 }, response('gender'));
 
+
+teacherApp.get('/contract_type', (req, res, next) => {
+    req.result = [
+        {id: 1, name: 'Concursado/Efetivo/Estável'},
+        {id: 2, name: 'Contrato temporário'},
+        {id: 3, name: 'Contrato terceirizado'},
+        {id: 4, name: 'Contrato CLT'}
+    ];
+    next();
+}, response('contract_type'));
+
 teacherApp.get('/ethnic_group', (req, res, next) => {
     req.result = [];
     for(let i = 0; i <=5; ++i) {
@@ -171,6 +182,16 @@ rqf.addField({
         type: 'integer',
         field: 'dependencia_adm_priv'
     }
+}).addValue({
+    name: 'contract_type',
+    table: 'docente',
+    tableField: 'tipo_contratacao',
+    resultField: 'contract_type_id',
+    where: {
+        relation: '=',
+        type: 'integer',
+        field: 'tipo_contratacao'
+    }
 }).addValue({
     name: 'education_level_mod',
     table: 'docente',

src/test/schoolCount.js

@@ -301,4 +301,17 @@ describe('request schools count', () => {
                 done();
             });
     });
+
+    it('should list school with dimension agreement', (done) => {
+        chai.request(server)
+            .get('/api/v1/school/count?dims=agreement')
+            .end((err, res) => {
+                res.should.have.status(200);
+                res.should.be.json;
+                res.body.should.have.property('result');
+                res.body.result.should.be.a('array');
+                res.body.result[0].should.have.property('agreement_name');
+                done();
+            });
+    });
 });

src/test/teacher.js

@@ -134,6 +134,20 @@ describe('request teachers', () => {
             });
     });
 
+    it('should list the contract type', (done) => {
+        chai.request(server)
+            .get('/api/v1/teacher/contract_type')
+            .end((err, res) => {
+                res.should.have.status(200);
+                res.should.be.json;
+                res.body.should.have.property('result');
+                res.body.result.should.be.a('array');
+                res.body.result[0].should.have.property('id');
+                res.body.result[0].should.have.property('name');
+                done();
+            });
+    });
+
     it('should list the administrative dependencies', (done) => {
         chai.request(server)
             .get('/api/v1/teacher/adm_dependency')
@@ -397,4 +411,19 @@ describe('request teachers', () => {
                 done();
             });
     });
+
+
+
+    it('should list teacher count with dimension contract type', (done) => {
+        chai.request(server)
+            .get('/api/v1/teacher?filter=state:41&dims=contract_type')
+            .end((err, res) => {
+                res.should.have.status(200);
+                res.should.be.json;
+                res.body.should.have.property('result');
+                res.body.result.should.be.a('array');
+                res.body.result[0].should.have.property('contract_type_name');
+                done();
+            });
+    });
 });