Skip to content
Snippets Groups Projects
Commit 995c7d46 authored by Fernando Erd's avatar Fernando Erd :ok_hand:
Browse files

Change nusery, special_attendence and toilet

parent 376117d4
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!47School number count
Pipeline #
...@@ -30,7 +30,10 @@ const ids = { ...@@ -30,7 +30,10 @@ const ids = {
teacher_room_id: booleanVariable, teacher_room_id: booleanVariable,
cook_room_id: booleanVariable, cook_room_id: booleanVariable,
playground_id: booleanVariable, playground_id: booleanVariable,
indor_sports_court_id: booleanVariable indor_sports_court_id: booleanVariable,
nusery_id: booleanVariable,
special_attendence_room_id: booleanVariable,
toilet_inside_building_id: booleanVariable
}; };
function transform(removeId=false) { function transform(removeId=false) {
......
...@@ -142,6 +142,7 @@ schoolApp.get('/indor_sports_court', (req, res, next) => { ...@@ -142,6 +142,7 @@ schoolApp.get('/indor_sports_court', (req, res, next) => {
schoolApp.get('/nusery', (req, res, next) => { schoolApp.get('/nusery', (req, res, next) => {
req.result = [ req.result = [
{id: null, name: 'Não Declarado'},
{id: 0, name: 'Não'}, {id: 0, name: 'Não'},
{id: 1, name: 'Sim'} {id: 1, name: 'Sim'}
]; ];
...@@ -150,6 +151,7 @@ schoolApp.get('/nusery', (req, res, next) => { ...@@ -150,6 +151,7 @@ schoolApp.get('/nusery', (req, res, next) => {
schoolApp.get('/special_attendence_room', (req, res, next) => { schoolApp.get('/special_attendence_room', (req, res, next) => {
req.result = [ req.result = [
{id: null, name: 'Não Declarado'},
{id: 0, name: 'Não'}, {id: 0, name: 'Não'},
{id: 1, name: 'Sim'} {id: 1, name: 'Sim'}
]; ];
...@@ -158,6 +160,7 @@ schoolApp.get('/special_attendence_room', (req, res, next) => { ...@@ -158,6 +160,7 @@ schoolApp.get('/special_attendence_room', (req, res, next) => {
schoolApp.get('/toilet_inside_building', (req, res, next) => { schoolApp.get('/toilet_inside_building', (req, res, next) => {
req.result = [ req.result = [
{id: null, name: 'Não Declarado'},
{id: 0, name: 'Não'}, {id: 0, name: 'Não'},
{id: 1, name: 'Sim'} {id: 1, name: 'Sim'}
]; ];
...@@ -477,7 +480,7 @@ rqfCount.addField({ ...@@ -477,7 +480,7 @@ rqfCount.addField({
name: 'special_attendence_room', name: 'special_attendence_room',
table: 'escola', table: 'escola',
tableField: 'sala_atendimento_especial', tableField: 'sala_atendimento_especial',
resultField: 'special_attendence_room_name', resultField: 'special_attendence_room_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
...@@ -597,7 +600,7 @@ rqfCount.addField({ ...@@ -597,7 +600,7 @@ rqfCount.addField({
name: 'nusery', name: 'nusery',
table: 'escola', table: 'escola',
tableField: 'bercario', tableField: 'bercario',
resultField: 'nusery_name', resultField: 'nusery_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
...@@ -607,13 +610,13 @@ rqfCount.addField({ ...@@ -607,13 +610,13 @@ rqfCount.addField({
name: 'toilet_inside_building', name: 'toilet_inside_building',
table: 'escola', table: 'escola',
tableField: 'sanitario_dentro_predio', tableField: 'sanitario_dentro_predio',
resultField: 'toilet_inside_building_name', resultField: 'toilet_inside_building_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
field: 'sanitario_dentro_predio' field: 'sanitario_dentro_predio'
} }
}).addValue({ }).addValue({
name: 'wastepipe', name: 'wastepipe',
table: 'escola', table: 'escola',
tableField: 'esgoto_sanitario', tableField: 'esgoto_sanitario',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment