Commit 8f8f35ec authored by Henrique Varella Ehrenfried's avatar Henrique Varella Ehrenfried

Merge SIMCAQ-Node with SMPPIR-Node

parents e89d4869 181a2eee
Pipeline #21926 failed with stage
in 2 minutes and 50 seconds
......@@ -4,10 +4,146 @@ 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.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
## 2019-07-03
### Changed
- Remove mongoose dependency so it can be used in SMPPIR
## 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
......
/*
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';
default:
return 'Não classificada';
}
};
/*
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';
}
};
/*
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 ageStudentCode(id) {
switch (id) {
case 1:
return 'Menor que 18 anos';
case 2:
return 'Entre 18 anos e 24 anos';
case 3:
return 'Entre 25 anos e 29 anos';
case 4:
return 'Entre 30 anos e 34 anos';
case 5:
return 'Entre 35 anos e 39 anos';
case 6:
return 'Maior que 39 anos';
default:
return 'Não classificado';
}
};
/*
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 ethnicGroupIES(id) {
switch (id) {
case 0:
return 'Aluno não quis declarar cor/raça';
case 1:
return 'Branca';
case 2:
return 'Preta';
case 3:
return 'Parda';
case 4:
return 'Amarela';
case 5:
return 'Indígena';
default:
return 'Não dispõe da informação (Não resposta)';
}
};
/*
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 ethnicGroupTeacherIES(id) {
switch (id) {
case 0:
return 'Docente não quis declarar cor/raça';
case 1:
return 'Branca';
case 2:
return 'Preta';
case 3:
return 'Parda';
case 4:
return 'Amarela';
case 5:
return 'Indígena';
default:
return 'Não dispõe da informação (Não resposta)';
}
};
/*
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 genderIES(id) {
switch(id) {
case 1:
return 'Feminino';
case 2:
return 'Masculino';
default:
return 'Não declarado';
}
};
......@@ -19,10 +19,12 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
*/
module.exports = function integralTime(id) {
if (id == null)
return 'Não se aplica (semi presencial e EaD)';
else if (id == false)
return 'Não';
else if (id == true)
return 'Sim';
switch (id) {
case true:
return 'Sim';
case false:
return 'Não';
default:
return 'Não se aplica (semi presencial e EaD)';
}
};
/*
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 ocdeDetailed(id) {
switch (id) {
case 142:
return 'Ciências da educação';
case 144:
return 'Formação de professor da educação básica';
case 145:
return 'Formação de professor de matérias específicas';
case 146:
return 'Formação de professor de disciplinas profissionais';
case 210:
return 'Artes (cursos gerais)';
case 211:
return 'Belas artes';
case 212:
return 'Música e artes cênicas';
case 213:
return 'Técnicas audiovisuais e produção de mídia';
case 214:
return 'Design e estilismo';
case 215:
return 'Artesanato';
case 220:
return 'Humanidades e letras (cursos gerais)';
case 221:
return 'Religião e teologia';
case 222:
return 'Línguas e culturas estrangeiras';
case 223:
return 'Língua materna (vernácula)';
case 225:
return 'História e arqueologia';
case 226:
return 'Filosofia e ética';
case 310:
return 'Ciências sociais e comportamentais (cursos gerais)';
case 311:
return 'Psicologia';
case 312:
return 'Sociologia e estudos culturais';
case 313:
return 'Ciência política e educação cívica';
case 314:
return 'Economia';
case 321:
return 'Jornalismo e reportagem';
case 322:
return 'Biblioteconomia, informação, arquivos';
case 340:
return 'Comércio e administração (cursos gerais)';
case 341:
return 'Vendas em atacado e varejo';
case 342:
return 'Marketing e publicidade';
case 343:
return 'Finanças, bancos, seguros';
case 344:
return 'Contabilidade e tributação';
case 345:
return 'Gerenciamento e administração';
case 346:
return 'Secretariado e trabalhos de escritório';
case 380:
return 'Direito';
case 420:
return 'Ciências (cursos gerais)';
case 421:
return 'Biologia e bioquímica';
case 422:
return 'Ciências ambientais';
case 440:
return 'Ciências físicas (cursos gerais)';
case 441:
return 'Física';
case 442:
return 'Química';
case 443:
return 'Ciências da terra';
case 461:
return 'Matemática';
case 462:
return 'Estatística';
case 481:
return 'Ciência da computação';
case 482:
return 'Uso do computador';
case 483:
return 'Processamento da informação';
case 520:
return 'Engenharia e profissões de engenharia (cursos gerais)';
case 521:
return 'Engenharia mecânica e metalurgia (trabalhos com metais)';
case 522:
return 'Eletricidade e energia';
case 523:
return 'Eletrônica e automação';
case 524:
return 'Química e engenharia de processos';
case 525:
return 'Veículos a motor, construção naval e aeronáutica';
case 540:
return 'Fabricação e processamento (cursos gerais)';
case 541:
return 'Processamento de alimentos';
case 542:
return 'Têxteis, roupas, calçados, couros';
case 543:
return 'Materiais (madeira, papel, plástico, vidro)';
case 544:
return 'Mineração e extração';
case 581:
return 'Arquitetura e urbanismo';
case 582:
return 'Engenharia civil e de construção';
case 621:
return 'Produção agrícola e pecuária';
case 622:
return 'Horticultura';
case 623:
return 'Engenharia florestal - silvicultura';
case 624:
return 'Recursos pesqueiros';
case 641:
return 'Veterinária';
case 720:
return 'Saúde (cursos gerais)';
case 721:
return 'Medicina';
case 723:
return 'Enfermagem e atenção primária (assistência básica)';
case 724:
return 'Odontologia';
case 725:
return 'Tecnologias de diagnóstico e tratamento médico';
case 726:
return 'Terapia e reabilitação';
case 727:
return 'Farmácia';
case 762:
return 'Serviço social e orientação';
case 811:
return 'Hotelaria, restaurantes e serviços de alimentação';
case 812:
return 'Viagens, turismo e lazer';
case 813:
return 'Esportes';
case 814:
return 'Ciências domésticas';
case 815:
return 'Serviços de beleza';
case 840:
return 'Transportes e serviços (cursos gerais)';
case 850:
return 'Proteção ambiental (cursos gerais)';
case 861:
return 'Proteção de pessoas e de propriedades';
case 862:
return 'Saúde e segurança do trabalho';
case 863:
return 'Setor militar e de defesa';
default:
return 'Não classificada';
}
};
\ No newline at end of file
/*
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 ocdeGeral(id) {
switch (id) {
case 0:
return 'Área básica';
case 1:
return 'Educação';
case 2:
return 'Humanidades e artes';
case 3:
return 'Ciências sociais, negócios e direito';
case 4:
return 'Ciências, matemática e computação';
case 5:
return 'Engenharia, produção e construção';
case 6:
return 'Agricultura e veterinária';
case 7:
return 'Saúde e bem estar social';
case 8:
return 'Serviços';
default:
return 'Não classificada';
}
};
/*
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 ocdeSpecific(id) {
switch (id) {
case 1:
return 'Área básica de cursos';
case 14:
return 'Formação de professor e ciências da educação';
case 21:
return 'Artes';
case 22:
return 'Humanidades e letras';
case 31:
return 'Ciências sociais e comportamentais';
case 32:
return 'Jornalismo e informação';
case 34:
return 'Comércio e administração';
case 38:
return 'Direito';
case 42:
return 'Ciências da vida';
case 44:
return 'Ciências físicas';
case 46:
return 'Matemática e estatística';
case 48:
return 'Computação';
case 52:
return 'Engenharia e profissões correlatas';
case 54:
return 'Produção e processamento';
case 58:
return 'Arquitetura e construção';
case 62:
return 'Agricultura, florestas e recursos pasqueiros';
case 64:
return 'Veterinária';
case 72:
return 'Saúde';
case 76:
return 'Serviço social';
case 81:
return 'Serviços pessoais';
case 84:
return 'Serviços de transportes (cursos gerais)';
case 85:
return 'Proteção ambiental';
case 86:
return 'Serviços de segurança';
default:
return 'Não classificada';
}
};
/*
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 studentDeficiency(id) {
switch (id) {
case 1:
return 'Pública';
case 2:
return 'Privada';
default:
return 'Não classificado';
}
};
/*
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.