.gitignore

@@ -22,3 +22,15 @@ build/*
 config.json
 docs/
 .vscode/
+
+package-lock.json
+
+Dockerfile
+DockerfileAntigo
+src/libs/db/postgres.js
+docker-compose.yml
+entrypoint.sh
+gulpfile*
+gulpfile.template.js
+gulpfile.babel.js
+

.gitlab-ci.yml

-stages:
-  - test
-
-services:
-  - mongo:latest
-
-variables:
-  MONGO_URI: 'mongodb://mongo/app_name'
-  NODE_ENV: 'test'
-
-before_script:
-  - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint
-  - npm install
-
-run_tests:
-  stage: test
-  script:
-    - ping -W1 -c1 mongo
-    - mv config.json.example config.json
-    - sed -i -e 's/false/true/g' config.json
-    - gulp build
-    - gulp test
-  tags:
-    - node

CHANGELOG.md

@@ -4,6 +4,390 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.15.7 - 2020-11-11
+#Changes
+- Fix Universitys in first step in course and enrollment indicators
+- Fix Clear filters
+
+## 1.15.6 - 2020-10-06
+## Fix
+- Change json subroute in university enrollment
+
+## 1.15.5 - 2020-10-02
+## Fix
+- Employees indicator with school filter
+
+## 1.15.4 - 2020-09-30
+## Changed
+- Remove next in univsersity enrollment
+
+## 1.15.3 - 2020-09-30
+## Changed
+- Change result finish university
+
+## 1.15.2 - 2020-09-21
+## Changed
+- Add localoffer in dims location in university enrollment
+
+## 1.15.1 - 2020-07-31
+## Changed
+- Classroom_count final result is now rounded to 2 decimals intead of using ceil
+
+## 1.15.0 - 2020-07-16
+## Added
+- Route location
+## Changed
+- Dim income_level in route pibpercapita now uses a different table, pib_quintis
+- Population now uses ibge_pib table
+
+## 1.14.2 - 2020-07-14
+## Changed
+- Courses route
+- Addmissing
+
+## 1.14.1 - 2020-06-24
+- Fix gross and liquid enrollment ratio indicators
+
+## 1.14.0 - 2020-06-17
+## Added
+- Route school_location
+- Route mesoregion
+- Route microregion
+## Changed
+- City route now returns microregion_id and mesoregion_id
+- Update classCount base filters
+- Update classroom base query
+- Update classroomCount base filters in school
+- Removed addMissing from cub route
+- Changed dailyChargeAmount filter pattern
+- Enrollment now has mesoregion/microregion dims/filters
+- Changed reqFilters in outOfSchool route
+- School now has mesoregion/microregion dims/filters
+- Teacher now has mesoregion/microregion dims/filters
+- UnivesityEnrollment now has mesoregion/microregion dims/filters
+
+## 1.13.4 - 2020-06-05
+- Arrangment filter in school indicator 2007-2019
+- Employees Indicator 2007-2019
+
+## 1.13.3 - 2020-05-21
+
+## 1.13.2 - 2020-05-21
+## Changed
+- Rename rural category
+
+## 1.13.1 - 2020-05-12
+## Changed
+- Fix dot error
+
+## 1.13.0 - 2020-04-XX
+## Added
+- Added 2019 data
+- Added Goverment agreement in school
+- Added Arrangment dims in school
+## Changed
+- Updated 2007-2018
+- Updated education level mod
+- Updated adm_dependency_detailed filter
+- Updated rural_location filter
+- Updated period labels
+- AddMissing will now force ordination by id
+- Updated all routes to contain id in region, state and city dims
+
+## 1.12.6 - 2020-02-02
+## Changed
+- Fix teacher education mod dimension
+- Fix text
+
+## 1.12.5 - 2020-01-27
+## Changed
+- Fix duplicated cities in courseCount
+
+## 1.12.4 - 2020-01-27
+## Changed
+- Fix addMissing
+
+## 1.12.3 - 2019-12-20
+## Changed
+- Fix new categories in education type for teacher
+
+## 1.12.2 - 2019-12-19
+## Changed
+- Fix addMissing
+- Add new categories in education type for teacher
+
+## 1.12.1 - 2019-12-12
+## Changed
+- Added categories to adm dependency
+
+## 1.12.0 - 2019-11-25
+## Changed
+- Add teacher count to classroom_count route
+
+## 1.11.17 - 2019-10-08
+## Changed
+- Fix query\_exec
+
+## 1.11.16 - 2019-10-30
+## Changed
+- University Teacher updated
+
+## 1.11.15 - 2019-10-16
+## Changed
+- Fix addMissing for classCount route
+
+## 1.11.14 - 2019-10-13
+## Changed
+- OCDE updated
+
+## 1.11.13 - 2019-09-11
+## Changed
+- Classroom with dim location and city filter, will always return both locations
+
+## 1.11.12 - 2019-09-10
+## Changed
+- Changed classroom filters to match classroomCount
+
+## 1.11.11 - 2019-09-09
+## Changed
+- Changed classroomCount filters
+
+## 1.11.10 - 2019-08-23
+## Changed
+- Removed year limitation
+- Updated existing variables
+
+## 1.11.9 - 2019-07-25
+## Changed
+- Course count order fix
+- Course count missing fix
+
+## 1.11.8 = 2019-07-19
+## Changed
+- Remove /user route
+
+## 1.11.7 - 2019-07-12
+## Changed
+- EnrollmentProjection now returns empty values with 0
+
+## 1.11.6 - 2019-07-11
+## Changed
+- Return haveSportsCourtCoverage and haveCourtyardCoverage = [] in route school_infrastructure 
+
+## 1.11.5 - 2019-07-09
+## Changed
+ - Fix integral time
+ - Fix match queries in school_infrastructure
+
+## 1.11.4 - 2019-06-17
+## Changed
+- Changed enrollment variable
+- Added location and latitude to state and city
+- Changed courseCount variables
+- Removed 'Not classified' from teacher
+
+## 1.11.3 - 2019-06-17
+## Changed
+- Changed variables from university
+- Removed year limitation from university
+
+## 1.11.2 - 2019-06-17
+## Changed
+- transport now uses an aggregate table
+
+## 1.11.1 - 2019-06-10
+## Changed
+- ClassroomCount now uses an aggregate table
+
+## 1.11.0 - 2019-05-24
+## Changed
+- Add university teacher indicator for 2017
+
+## 1.10.5 - 2019-05-23
+## Changed
+- Revert api.js
+
+## 1.10.4 - 2019-05-23
+## Changed
+- Fix order in enrollment indicator
+## Added
+- Added university enrollment indicator
+- Added course count indicator
+
+## 1.10.3 - 2019-05-22
+## Changed
+- Fix schoolInfrastructure.js
+
+## 1.10.2 - 2019-05-10
+## Changed
+- Fix api.js
+
+## 1.10.0 - 2019-05-10
+## Added
+- Added university indicator
+
+## 1.9.8 - 2019-08-02
+## Changed
+- Fix bug duplicate city name in classroom count
+
+## 1.9.7 - 2019-05-02
+## Changed
+- Fix enrollment projection
+- Fix enrollment number in classroom count
+- Fix error in class count
+
+## 1.9.6 - 2019-04-02
+## Changed
+- Fix null in integral time
+
+## 1.9.5 - 2019-03-15
+## Changed
+- Fix join's in class count route
+
+## 1.9.4 - 2019-03-12
+## Changed
+- Change docente.id to docente.id_docente
+
+## 1.9.3 - 2019-03-12
+## Changed
+- Fix addMissing function
+
+## 1.9.2 - 2019-02-20
+## Changed
+- Fix location variable in table
+
+## 1.9.1 - 2019-02-14
+## Changed
+- Fix join's in financial route
+
+## 1.9.0 - 2018-11-24
+## Changed
+- Fix school infrastructure results when partial or needed schools query return empty
+- Block 2 or more dimensions in daily_charge_amount/average
+
+## 1.8.3 - 2018-11-24
+### Changed
+- Fixed reulst return in classroom count
+
+## 1.8.2 - 2018-11-23
+### Changed
+- Fixed class count route
+- Fixed classroom count school year bug
+
+## 1.8.1 - 2018-11-13
+### Changed
+- Fixed bug in id2str with inexistent convert function
+
+## 1.8.0 - 2018-11-13
+### Added
+- Add financial route
+- Add employees route
+### Changed
+- Fix school route
+- Fix transport route
+- Fix return where integral time is null
+- Classroom count route returns school year results for education level 1
+
+## 1.7.0 - 2018-09-20
+### Changed
+- Fix return string in contract type id 1
+- Fix out of school route
+- Fix pib-per-capita route
+- Fix filters in infrastructure route
+- Remove filters in transport route
+
+## 1.6.1 - 2018-08-23
+### Changed
+- Fix return json name in transport route
+
+## 1.6.0 - 2018-08-17
+### Added
+- Dimension state in route `enrollment` now returns state name and id
+- `school` route now has a `search` parameter. You can search by city name or state abbreviation
+- Added all age range convertion
+- Added special class and all age range to id2str
+- Added `school infratructure` route
+- Added `INEP` route for Portal MEC
+### Changed
+- Fix `auxiliar` indicator
+- Add property "don't group" in RQF to dismiss the group by and order by clause
+- Change RQF filters in `auxiliar` route
+- Fix total classrooms needed bug in classroom count
+- Add special class and all age range to enrollment route
+
+## 1.5.0 - 2018-07-30
+### Added
+- Add portaMec route
+- Fix bug in diagnosis and projection routes
+
+## 1.4.2 - 2018-07-23
+### Added
+- Added new url's in daily charge amount indicator
+### Changed
+- Fix variable name and url in daily charge amount indicator
+
+## 1.4.1 - 2018-07-03
+### Changed
+- Fix duplicate in transport indicator
+
+## 1.4.0 - 2018-06-27
+### Added
+- Add school building filter/dimension to school count route
+- Add transport indicator
+- Add cub route
+### Changed
+- Fixed CSV output when result objects have nested arrays and/or objects
+- Limit year range to 2007-2015 in out of school indicator
+- Fix auxiliar indicator
+
+## 1.3.3 - 2018-06-27
+### Changed
+- Removed restriction of year > 2014 of school count route
+
+## 1.3.2 - 2018-06-20
+### Changed
+- Fixed math error in classroom count at total classroom needed expression
+
+## 1.3.1 - 2018-06-19
+### Changed
+- Fixed bug with Federal District and missing cities in classroom count
+
+## 1.3.0 - 2018-06-18
+### Added
+- Daily charge amount route
+
+## 1.2.3 - 2018-06-14
+### Changed
+- Fixed roundig error in classroom count route
+- Route performance improved
+
+## 1.2.2 - 2018-05-22
+### Changed
+- Fixed bug with missing education levels in classroom count
+
+## 1.2.1 - 2018-05-22
+### Changed
+- Add state id in infrastructure
+
+## 1.2.0 - 2018-05-21
+### Added
+- Classroom count route
+
+## 1.1.1 - 2018-05-10
+### Changed
+- Fix bug in gloss enrollment ratio route
+- Fix bug in liquid enrollment ratio route
+
+## 1.1.0 - 2018-05-02
+### Added
+- Out of school population indicator
+- Liquid enrollment ratio indicator
+- Gloss enrollment ratio indicator
+
+## 1.0.3 - 2018-04-27
+### Changed
+- Fixed bug undefined field in some indicators
+
 ## 1.0.2 - 2018-04-18
 ### Changed
 - Fixed bug in pibpercapita route

config.json.example

-{
-    "development":
-    {
-        "port": 3000,
-        "ip": "127.0.0.1",
-        "debug" : true,
-        "monetdb": {
-            "host": "simcaqdb3.c3sl.ufpr.br",
-            "port": 50000,
-            "dbname": "simcaq_dev4",
-            "user": "monetdb",
-            "password":"monetdb",
-            "nrConnections": "4"
-        },
-        "cdn" : {
-            "url": "http://simcaqdb3.c3sl.ufpr.br:3000",
-            "download": "https://simcaqdev.c3sl.ufpr.br/download/"
-        },
-        "mongodb" : {
-            "uri": "mongodb://localhost/dev_users"
-        },
-        "monq": {
-            "uri": "mongodb://localhost/dev_monq"
-        },
-        "default": {
-            "api": {
-                "version" : "v1"
-            },
-            "lde": {
-                "url": "http://ldedev.c3sl.ufpr.br/#"
-            },
-            "simcaq": {
-                "url": "http://simcaqdev.c3sl.ufpr.br/#"
-            }
-        },
-        "email": {
-            "port": 25,
-            "host": "mx.c3sl.ufpr.br",
-            "secure": false,
-            "ignoreTLS": true,
-            "from": "\"Laboratório de Dados Educacionais\" <lde@c3sl.ufpr.br>"
-        },
-        "security": {
-            "tokenLife": 3600
-        }
-    },
-    "test":
-    {
-        "port": 4000,
-        "ip": "127.0.0.1",
-        "debug" : true,
-        "monetdb": {
-            "host": "simcaqdb3.c3sl.ufpr.br",
-            "port": 50000,
-            "dbname": "simcaq_dev4",
-            "user": "monetdb",
-            "password":"monetdb",
-            "nrConnections": "4"
-        },
-        "cdn" : {
-            "url": "http://simcaqdb3.c3sl.ufpr.br:3000",
-            "download": "https://simcaqdev.c3sl.ufpr.br/download/"
-        },
-        "mongodb" : {
-            "uri": "mongodb://localhost/test_users",
-            "secret": "SimCAQC3SL"
-        },
-        "monq": {
-            "uri": "mongodb://localhost/test_monq"
-        },
-        "default": {
-            "api": {
-                "version" : "v1"
-            },
-            "lde": {
-                "url": "http://ldedev.c3sl.ufpr.br/#"
-            },
-            "simcaq": {
-                "url": "http://simcaqdev.c3sl.ufpr.br/#"
-            }
-        },
-        "email": {
-            "port": 25,
-            "host": "mx.c3sl.ufpr.br",
-            "secure": false,
-            "ignoreTLS": true,
-            "from": "\"Laboratório de Dados Educacionais\" <lde@c3sl.ufpr.br>"
-        },
-        "security": {
-            "tokenLife": 3600
-        }
-    },
-    "production":
-    {
-        "port": 6000,
-        "ip": "127.0.0.1",
-        "debug" : false,
-        "monetdb": {
-            "host": "simcaqdb3.c3sl.ufpr.br",
-            "port": 50000,
-            "dbname": "simcaq_dev4",
-            "user": "monetdb",
-            "password":"monetdb",
-            "nrConnections": "4"
-        },
-        "cdn" : {
-            "url": "http://simcaqdb3.c3sl.ufpr.br:7000",
-            "download": "https://simcaq.c3sl.ufpr.br/download/"
-        },
-        "mongodb" : {
-            "uri": "mongodb://localhost/users",
-            "secret": "SimCAQC3SL"
-        },
-        "monq": {
-            "uri": "mongodb://localhost/monq"
-        },
-        "default": {
-            "api": {
-                "version" : "v1"
-            },
-            "lde": {
-                "url": "http://lde.c3sl.ufpr.br/#"
-            },
-            "simcaq": {
-                "url": "http://simcaq.c3sl.ufpr.br/#"
-            }
-        },
-        "email": {
-            "port": 25,
-            "host": "mx.c3sl.ufpr.br",
-            "secure": false,
-            "ignoreTLS": true,
-            "from": "\"Laboratório de Dados Educacionais\" <lde@c3sl.ufpr.br>"
-        },
-        "security": {
-            "tokenLife": 3600
-        }
-    }
-}

gulpfile.babel.js

-require('babel-core/register');
-
-const fs = require('fs');
-
-const gulp = require('gulp');
-
-const babel = require('gulp-babel');
-
-const eslint = require('gulp-eslint');
-
-const mocha = require('gulp-mocha');
-
-const istanbul = require('gulp-istanbul');
-
-const nodemon = require('gulp-nodemon');
-
-const Cache = require('gulp-file-cache');
-
-const docco = require('gulp-docco');
-
-const mkdirp = require('mkdirp');
-
-const cache = new Cache();
-
-function createLogDir() {
-    const logDirPath = 'build/logs';
-    mkdirp(logDirPath, (err) => {
-        if(err) console.error(err);
-    });
-}
-
-gulp.task('lint', () => {
-    // run ESLint
-    gulp.src('src/**/*.js')
-    .pipe(eslint())
-    .pipe(eslint.format());
-})
-
-/**
-* Compile source files
-*/
-gulp.task('compile', ['lint'], () => {
-
-    // compile source to ES5
-    gulp.src('src/**/*.js')
-    .pipe(cache.filter())       // cache source files
-    .pipe(babel())      // compile only modified files
-    // .pipe(cache.cache())        // cache compiled files
-    .pipe(gulp.dest('build'));  // move compiled files to build directory
-});
-
-gulp.task('build', ['compile'], () => {
-    var filesToCopy = [ 'config.json', 'package.json' ];
-    // copy configuration file to build directory
-    gulp.src(filesToCopy)
-    .pipe(gulp.dest('build'));
-
-    createLogDir();
-});
-
-gulp.task('docco', () => {
-    gulp.src('./src/**/*.js')
-        .pipe(docco())
-        .pipe(gulp.dest('./docs'));
-});
-
-gulp.task('doc', ['docco']);
-
-gulp.task('pre-test', () => {
-    return gulp.src(['build/**/*.js', '!build/{test,test/**}'])
-        .pipe(istanbul())
-        .pipe(istanbul.hookRequire());
-});
-
-gulp.task('test', ['pre-test'], () => {
-    process.chdir('build');
-    gulp.src(['test/**/*.js'], {read: false})
-    .pipe(mocha({timeout: 60000}))
-    .pipe(istanbul.writeReports())
-    .pipe(istanbul.enforceThresholds({
-        thresholds: {
-            global: {
-                statements: 80,
-                branches: 70,
-                lines: 80,
-                functions: 80
-            }
-        }
-    }))
-    .on('error', () => {
-        process.exit(1);
-    })
-    .on('end', () => {
-        process.exit();
-    });
-});
-
-gulp.task('watch', ['compile'], () => {
-    console.log('Watching source directory for changes');
-    gulp.watch('src/**/*.js').on('change', () => {
-        console.log('Recompiling source');
-        gulp.start('compile');
-        console.log('Source recompilation done');
-    });
-});
-
-gulp.task('run', () => {
-    process.chdir('build');
-    nodemon({
-        script: 'server.js',
-        tasks: ['watch'],
-        ignore: ["test/test.js", "gulpfile.babel.js"],
-        ext: 'js html json',
-        env: { 'NODE_ENV': 'development' }
-    });
-});
-
-gulp.task('default', ['run']);

package.json

@@ -15,37 +15,60 @@
   "dependencies": {
     "agenda": "^0.9.1",
     "apicache": "0.7.0",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.3",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-register": "^6.26.0",
+    "bcrypt": "^5.1.0",
     "bcrypt-nodejs": "0.0.3",
-    "body-parser": "^1.13.1",
+    "body-parser": "^1.18.3",
     "chai": "^3.5.0",
     "chai-http": "^3.0.0",
+    "chai-xml": "^0.3.2",
     "chalk": "^1.1.3",
     "cookie-parser": "^1.3.5",
-    "cors": "^2.7.1",
-    "csv-express": "^1.1.0",
+    "cors": "^2.8.4",
+    "csv-express": "^1.2.2",
     "debug": "~2.3.x",
     "dirty-chai": "^1.2.2",
-    "express": "^4.13.0",
+    "eslint": "^3.19.0",
+    "eslint-plugin-import": "^2.14.0",
+    "eslint-plugin-react": "^6.10.3",
+    "express": "^4.16.4",
     "forever": "^0.15.2",
+    "gulp-babel": "^6.1.3",
+    "gulp-cli": "^1.4.0",
+    "gulp-function": "^2.2.14",
+    "gulp-istanbul": "^1.1.3",
+    "gulp-plumber": "^1.2.0",
+    "gulp-rename": "^1.4.0",
+    "gulp-uglify": "^2.1.2",
     "js2xmlparser": "^2.0.2",
-    "jsonexport": "^2.0.9",
-    "jwt-simple": "^0.5.0",
-    "lodash": "^4.17.2",
-    "method-override": "^2.3.3",
-    "mocha": "^3.1.2",
+    "jsdoc": "^3.5.5",
+    "jsonexport": "^2.3.0",
+    "jwt-simple": "^0.5.5",
+    "lodash": "^4.17.11",
+    "method-override": "^2.3.10",
+    "mocha": "^3.5.3",
     "monetdb-pool": "0.0.8",
-    "mongoose": "^4.6.0",
-    "nconf": "^0.8.x",
+    "mongoose": "^4.13.17",
+    "multer": "^1.4.5-lts.1",
+    "natives": "^1.1.6",
+    "nconf": "^0.8.5",
     "node-uuid": "^1.4.8",
-    "nodemailer": "^4.0.1",
+    "nodemailer": "^4.6.8",
     "nodemailer-html-to-text": "^2.1.0",
-    "oauth2orize": "^1.8.1",
+    "oauth2orize": "^1.11.0",
     "passport": "^0.3.2",
     "passport-http-bearer": "^1.0.1",
     "passport-oauth2-client-password": "^0.1.2",
-    "request": "^2.81.0",
-    "squel": "^5.4.2",
-    "winston": "^2.2.0"
+    "pg": "^8.10.0",
+    "request": "^2.88.0",
+    "sequelize": "^6.31.0",
+    "sequelize-cli": "^6.6.0",
+    "sqlstring": "^2.3.1",
+    "squel": "^5.12.2",
+    "winston": "^2.4.4"
   },
   "license": "MIT",
   "devDependencies": {

src/libs/api_mongo.txt

+*downloads.js
+*resetToken.js (V)
+*pqr.js
+*simulation.js
+*user.js (V)
+*verifyToken.js (V)

src/libs/app.js

@@ -11,18 +11,14 @@ const log = require(`${libs}/log`)(module);
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 const config = require(`${libs}/config`);
-const cache = require('apicache').options({ debug: config.debug }).middleware;
 
 const app = express();
 
-const api = require('./routes/api');
+const api_v1 = require('./routes_v1/api');
+const api_v2 = require('./routes_v2/api');
 
 const passport = require('passport');
 
-const mongoose = require(`${libs}/db/mongoose`);
-
-const db = mongoose();
-
 require(`${libs}/middlewares/passport`);
 
 app.use(bodyParser.json({limit: '50mb'}));
@@ -66,7 +62,10 @@ app.use((req, res, next) => {
     next();
 });
 // Mounts all API routes under /api/v1
-app.use('/api/v1', api);
+app.use('/api/v1', api_v1);
+
+// Mounts all API routes under /api/v2
+app.use('/api/v2', api_v2);
 
 // Catch 404 and forward to error handler
 app.use((req, res, next) => {

src/libs/convert/academicLevel.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function academicLevel(id) {
+    switch (id) {
+        case 1:
+        return 'Bacharelado';
+        case 2:
+        return 'Licenciatura';
+        case 3:
+        return 'Tecnológico';
+        case 4:
+        return 'Bacharelado e Licenciatura';
+        default:
+        return 'Não classificada';
+    }
+};

src/libs/convert/academicOrganization.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function academicOrganization(id) {
+    switch (id) {
+        case 1:
+        return 'Universidade';
+        case 2:
+        return 'Centro Universitário';
+        case 3:
+        return 'Faculdade';
+        case 4:
+        return 'Instituto Federal de Educação, Ciência e Tecnologia';
+        case 5:
+        return 'Centro Federal de Educação Tecnológica';
+        default:
+        return 'Não classificada';
+    }
+};

src/libs/convert/admDependency.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 module.exports = function admDependency(id) {
     switch (id) {
         case 1:

src/libs/convert/admDependencyCursos.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function admDependencyCursos(id) {
+    switch (id) {
+        case 1:
+        return 'Pública Federal';
+        case 2:
+        return 'Pública Estadual';
+        case 3:
+        return 'Pública Municipal';
+        case 4:
+        return 'Privada com fins lucrativos';
+        case 5:
+        return 'Privada sem fins lucrativos';
+        case 6:
+        return 'Confessional';
+        case 7:
+        return 'Especial';
+        default:
+        return 'Não classificada';
+    }
+};
+

src/libs/convert/admDependencyPriv.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 module.exports = function admDependencyPriv(id) {
     switch (id) {
         case 1:
@@ -7,11 +27,15 @@ module.exports = function admDependencyPriv(id) {
         case 3:
         return 'Municipal';
         case 4:
-        return 'Privada conveniada';
+        return 'Privada conveniada sem fins lucrativos';
         case 5:
-        return 'Privada não conveniada sem fins lucrativos';
+        return 'Privada conveniada com fins lucrativos';
         case 6:
+        return 'Privada não conveniada sem fins lucrativos';
+        case 7:
         return 'Privada não conveniada com fins lucrativos';
+        case 8:
+        return 'Privada sem detalhamento';
         default:
         return 'Não classificada';
     }

src/libs/convert/admDependencyPub.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function admDependencyPub(id) {
+    switch (id) {
+        case 1:
+        return 'Rede pública';
+        case 2:
+        return 'Rede estadual';
+        case 3:
+        return 'Rede municipal';
+        default:
+        return 'Não classificada';
+    }
+};

src/libs/convert/ageRange.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 module.exports = function ageRange(id) {
     switch (id) {
         case 1:
-        return '0-3';
+        return '0 a 3 anos';
         case 2:
-        return '4-5';
+        return '4 a 5 anos';
         case 3:
-        return '6-10';
+        return '6 a 10 anos';
         case 4:
-        return '11-14';
+        return '11 a 14 anos';
         case 5:
-        return '15-17';
+        return '15 a 17 anos';
         case 6:
-        return '18-24';
+        return '18 a 24 anos';
         default:
         return 'Não declarada';
     }

src/libs/convert/ageRange19to64.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function ageRange19to64(id) {
+    switch (id) {
+        case 6:
+        return '19 a 24 anos';
+        case 7:
+        return '25 a 29 anos';
+        case 8:
+        return '30 a 40 anos';
+        case 9:
+        return '41 a 50 anos';
+        case 10:
+        return '51 a 64 anos';
+        case 11:
+        return 'Mais que 64 anos';
+        default:
+        return 'Não declarada';
+    }
+};

src/libs/convert/ageRangeAggregate.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function ageRangeAggregate(id) {
+    switch (id) {
+        case 1:
+        return '0 a 3 anos';
+        case 2:
+        return '4 a 5 anos';
+        case 3:
+        return '6 a 10 anos';
+        case 4:
+        return '11 a 14 anos';
+        case 5:
+        return '15 a 17 anos';
+        case 6:
+        return '18 anos ou mais';
+        default:
+        return 'Não declarada';
+    }
+};

src/libs/convert/ageRangeAll.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function ageRangeAll(id) {
+    switch (id) {
+        case 1:
+        return '0 a 3 anos';
+        case 2:
+        return '4 a 5 anos';
+        case 3:
+        return '6 a 10 anos';
+        case 4:
+        return '11 a 14 anos';
+        case 5:
+        return '15 a 17 anos';
+        case 6:
+        return '18 a 24 anos';
+        case 7:
+        return '25 a 29 anos';
+        case 8:
+        return '30 a 40 anos';
+        case 9:
+        return '41 a 50 anos';
+        case 10:
+        return '51 a 64 anos';
+        case 11:
+        return 'Mais que 64 anos';
+        default:
+        return 'Não declarada';
+    }
+};

src/libs/convert/ageRangeCescu.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function ageRange(id) {
+    switch (id) {
+        case 1:
+        return 'Até 17 anos de idade';
+        case 2: 
+        return 'De 18 a 24 anos de idade';
+        case 3:
+        return 'De 25 a 29 anos de idade';
+        case 4:
+        return 'De 30 a 34 anos de idade';
+        case 5:
+        return 'De 35 a 39 anos de idade';
+        case 6:
+        return 'De 40 a 49 anos de idade';
+        case 7:
+        return 'De 50 a 59 anos de idade';
+        case 8:
+        return 'De 60 ou mais anos de idade';
+        default:
+        return 'Não declarada';
+    }
+};
+

src/libs/convert/ageRangeEntity.js

+/*
+Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
+Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+   
+This file is part of simcaq-node.
+
+simcaq-node is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+simcaq-node is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with simcaq-node.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+module.exports = function ageRangeEntity(id) {
+    switch (id) {
+        case 1:
+        return 'Até 24 anos';
+        case 2:
+        return '25 a 29 anos';
+        case 3:
+        return '30 a 39 anos';
+        case 4:
+        return '40 a 49 anos';
+        case 5:
+        return '50 a 54 anos';
+        case 6:
+        return '55 a 59 anos';
+        case 7:
+        return '60 anos ou mais';
+        default:
+        return 'Não declarada';
+    }
+};