diff --git a/src/libs/routes/auxiliar.js b/src/libs/routes/auxiliar.js index c7ca3bc68c90401d3ceb893ccdbe272c304524a5..74e05c77be3b38ca81619635a19bb37b6aa9db9e 100644 --- a/src/libs/routes/auxiliar.js +++ b/src/libs/routes/auxiliar.js @@ -291,12 +291,12 @@ rqf.addField({ }, 'filter').addValue({ name: 'location', table: 'docente', - tableField: 'cod_localizacao', + tableField: 'localizacao_id', resultField: 'location_id', where: { relation: '=', type: 'integer', - field: 'cod_localizacao' + field: 'localizacao_id' } }).addValue({ name: 'min_year', diff --git a/src/libs/routes/classroom.js b/src/libs/routes/classroom.js index a2267779dc9b3b135be0557fa63ec5c4867f7be4..a445e9412d7edc8337186e4cc6b448eaaded7961 100644 --- a/src/libs/routes/classroom.js +++ b/src/libs/routes/classroom.js @@ -230,12 +230,12 @@ rqf.addField({ }).addValue({ name: 'location', table: 'escola', - tableField: 'cod_localizacao', + tableField: 'localizacao_id', resultField: 'location_id', where: { relation: '=', type: 'integer', - field: 'cod_localizacao' + field: 'localizacao_id' } }); diff --git a/src/libs/routes/employees.js b/src/libs/routes/employees.js index d60ac2b6f1828634df16fff07db7f7dcb72089f8..9aedbcb1de07e1e769806e57483981cb9530981a 100644 --- a/src/libs/routes/employees.js +++ b/src/libs/routes/employees.js @@ -228,12 +228,12 @@ rqfSchool.addField({ }, 'filter').addValue({ name: 'location', table: '@', - tableField: 'cod_localizacao', + tableField: 'localizacao_id', resultField: 'location_id', where: { relation: '=', type: 'integer', - field: 'cod_localizacao' + field: 'localizacao_id' } }).addValue({ name: 'rural_location', @@ -388,12 +388,12 @@ rqfTeacher.addField({ }, 'filter').addValue({ name: 'location', table: '@', - tableField: 'cod_localizacao', + tableField: 'localizacao_id', resultField: 'location_id', where: { relation: '=', type: 'integer', - field: 'cod_localizacao' + field: 'localizacao_id' } }).addValue({ name: 'rural_location', diff --git a/src/libs/routes/infrastructure.js b/src/libs/routes/infrastructure.js index d4f08deebf9b060f8d0ac4be293d3a4e16ee64f8..8630cb947e57d07f48c75f1f6194a3be62f6d98e 100644 --- a/src/libs/routes/infrastructure.js +++ b/src/libs/routes/infrastructure.js @@ -198,12 +198,12 @@ rqf.addField({ }).addValue({ name: 'location', table: 'escola', - tableField: 'cod_localizacao', + tableField: 'localizacao_id', resultField: 'location_id', where: { relation: '=', type: 'integer', - field: 'cod_localizacao' + field: 'localizacao_id' } }).addValue({ name: 'rural_location', @@ -316,7 +316,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { // Bibliotecas let allLibraries = allSchools.clone(); - allLibraries.where('escola.func_predio_escolar = 1 AND escola.cod_localizacao = 1'); + allLibraries.where('escola.func_predio_escolar = 1 AND escola.localizacao_id = 1'); req.queryIndex.allLibraries = req.querySet.push(allLibraries) - 1; let haveLibraries = allLibraries.clone(); @@ -325,7 +325,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { // Bibliotecas/Sala de leitura let allLibrariesReadingRoom = allSchools.clone(); - allLibrariesReadingRoom.where('escola.func_predio_escolar = 1 AND escola.cod_localizacao = 2'); + allLibrariesReadingRoom.where('escola.func_predio_escolar = 1 AND escola.localizacao_id = 2'); req.queryIndex.allLibrariesReadingRoom = req.querySet.push(allLibrariesReadingRoom) - 1; let haveLibrariesReadingRoom = allLibrariesReadingRoom.clone(); @@ -372,7 +372,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { // Quadra let allSportsCourt = allScienceLab.clone(); - allSportsCourt.where('escola.cod_localizacao = 1'); + allSportsCourt.where('escola.localizacao_id = 1'); req.queryIndex.allSportsCourt = req.querySet.push(allSportsCourt) - 1; let haveSportsCourt = allSportsCourt.clone(); @@ -397,7 +397,7 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { // Sala de direção let allDirectorRoom = allSchools.clone(); - allDirectorRoom.where('escola.func_predio_escolar = 1 AND escola.cod_localizacao = 1'); + allDirectorRoom.where('escola.func_predio_escolar = 1 AND escola.localizacao_id = 1'); req.queryIndex.allDirectorRoom = req.querySet.push(allDirectorRoom) - 1; let haveDirectorRoom = allDirectorRoom.clone(); diff --git a/src/libs/routes/schoolInfrastructure.js b/src/libs/routes/schoolInfrastructure.js index 835f0f6efa548a07f924a1ef0768e8aa236f61a8..f805e8827768eec1c4c6122c25da4be2672d43ce 100644 --- a/src/libs/routes/schoolInfrastructure.js +++ b/src/libs/routes/schoolInfrastructure.js @@ -198,12 +198,12 @@ rqf.addField({ }).addValue({ name: 'location', table: 'escola', - tableField: 'cod_localizacao', + tableField: 'localizacao_id', resultField: 'location_id', where: { relation: '=', type: 'integer', - field: 'cod_localizacao' + field: 'localizacao_id' } }).addValue({ name: 'rural_location', @@ -343,11 +343,11 @@ infrastructureApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { req.queryIndex.allSchools = req.querySet.push(allSchools) - 1; let allUrbanSchools = allSchools.clone(); - allUrbanSchools.where('escola.cod_localizacao = 1'); + allUrbanSchools.where('escola.localizacao_id = 1'); req.queryIndex.allUrbanSchools = req.querySet.push(allUrbanSchools) - 1; let allCountrySchools = allSchools.clone(); - allCountrySchools.where('escola.cod_localizacao = 2'); + allCountrySchools.where('escola.localizacao_id = 2'); req.queryIndex.allCountrySchools = req.querySet.push(allCountrySchools) - 1; let allSchoolsNotSchoolBuilding = req.sql.clone(); diff --git a/src/libs/routes/spatial.js b/src/libs/routes/spatial.js index 27341b803f957a4ec8cf936f5fa599fecb901c3b..dd7fe97a5b21eb49997866353ce3dc4e7513844b 100644 --- a/src/libs/routes/spatial.js +++ b/src/libs/routes/spatial.js @@ -223,11 +223,11 @@ spatialApp.get('/educational', rqf.parse(), rqf.build(), (req, res, next) => { .from('localizacao') .from('turma') .from('escola') - .where('escola.cod_localizacao=localizacao.id') + .where('escola.localizacao_id=localizacao.id') .where('escola.ano_censo=turma.ano_censo AND escola.id=turma.escola_id') .where(`escola.ano_censo IN (${censusYearQry})`) .where('turma.tipo_turma_id = 0') - .group('escola.cod_localizacao') + .group('escola.localizacao_id') .group('escola.ano_censo') .group('localizacao.descricao') .order('localizacao.descricao'); diff --git a/src/libs/routes/teacher.js b/src/libs/routes/teacher.js index 5df9ef44707b58c14d19e9ec89412c6b5fdced67..b9a862269ab4cfa76f2ac8d576b227bbd1be10bd 100644 --- a/src/libs/routes/teacher.js +++ b/src/libs/routes/teacher.js @@ -349,12 +349,12 @@ rqf.addField({ }, 'filter').addValue({ name: 'location', table: 'docente', - tableField: 'cod_localizacao', + tableField: 'localizacao_id', resultField: 'location_id', where: { relation: '=', type: 'integer', - field: 'cod_localizacao' + field: 'localizacao_id' } }).addValue({ name: 'rural_location',