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

Add directors_room, teacher_room, cook_room, playground and indor_sports_club

parent 5ca22e1c
No related branches found
No related tags found
2 merge requests!116Release v1.0.0,!47School number count
Pipeline #
...@@ -25,7 +25,12 @@ const ids = { ...@@ -25,7 +25,12 @@ const ids = {
government_agreement_id: booleanVariable, government_agreement_id: booleanVariable,
building_school_id: booleanVariable, building_school_id: booleanVariable,
informatics_lab_id: booleanVariable, informatics_lab_id: booleanVariable,
science_lab_id: booleanVariable science_lab_id: booleanVariable,
directors_room_id: booleanVariable,
teacher_room_id: booleanVariable,
cook_room_id: booleanVariable,
playground_id: booleanVariable,
indor_sports_court_id: booleanVariable
}; };
function transform(removeId=false) { function transform(removeId=false) {
......
...@@ -97,6 +97,7 @@ schoolApp.get('/science_lab', (req, res, next) => { ...@@ -97,6 +97,7 @@ schoolApp.get('/science_lab', (req, res, next) => {
schoolApp.get('/directors_room', (req, res, next) => { schoolApp.get('/directors_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'}
]; ];
...@@ -105,6 +106,7 @@ schoolApp.get('/directors_room', (req, res, next) => { ...@@ -105,6 +106,7 @@ schoolApp.get('/directors_room', (req, res, next) => {
schoolApp.get('/teacher_room', (req, res, next) => { schoolApp.get('/teacher_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'}
]; ];
...@@ -113,6 +115,7 @@ schoolApp.get('/teacher_room', (req, res, next) => { ...@@ -113,6 +115,7 @@ schoolApp.get('/teacher_room', (req, res, next) => {
schoolApp.get('/cook_room', (req, res, next) => { schoolApp.get('/cook_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'}
]; ];
...@@ -121,6 +124,7 @@ schoolApp.get('/cook_room', (req, res, next) => { ...@@ -121,6 +124,7 @@ schoolApp.get('/cook_room', (req, res, next) => {
schoolApp.get('/playground', (req, res, next) => { schoolApp.get('/playground', (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'}
]; ];
...@@ -129,6 +133,7 @@ schoolApp.get('/playground', (req, res, next) => { ...@@ -129,6 +133,7 @@ schoolApp.get('/playground', (req, res, next) => {
schoolApp.get('/indor_sports_court', (req, res, next) => { schoolApp.get('/indor_sports_court', (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'}
]; ];
...@@ -432,7 +437,7 @@ rqfCount.addField({ ...@@ -432,7 +437,7 @@ rqfCount.addField({
name: 'cook_room', name: 'cook_room',
table: 'escola', table: 'escola',
tableField: 'cozinha', tableField: 'cozinha',
resultField: 'cook_room_name', resultField: 'cook_room_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
...@@ -482,7 +487,7 @@ rqfCount.addField({ ...@@ -482,7 +487,7 @@ rqfCount.addField({
name: 'indor_sports_court', name: 'indor_sports_court',
table: 'escola', table: 'escola',
tableField: 'quadra_esportes_coberta', tableField: 'quadra_esportes_coberta',
resultField: 'indor_sports_court_name', resultField: 'indor_sports_court_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
...@@ -562,7 +567,7 @@ rqfCount.addField({ ...@@ -562,7 +567,7 @@ rqfCount.addField({
name: 'directors_room', name: 'directors_room',
table: 'escola', table: 'escola',
tableField: 'sala_diretoria', tableField: 'sala_diretoria',
resultField: 'directors_room_name', resultField: 'directors_room_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
...@@ -572,7 +577,7 @@ rqfCount.addField({ ...@@ -572,7 +577,7 @@ rqfCount.addField({
name: 'teacher_room', name: 'teacher_room',
table: 'escola', table: 'escola',
tableField: 'sala_professor', tableField: 'sala_professor',
resultField: 'teacher_room_name', resultField: 'teacher_room_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
...@@ -582,7 +587,7 @@ rqfCount.addField({ ...@@ -582,7 +587,7 @@ rqfCount.addField({
name: 'playground', name: 'playground',
table: 'escola', table: 'escola',
tableField: 'parque_infantil', tableField: 'parque_infantil',
resultField: 'playground_name', resultField: 'playground_id',
where: { where: {
relation: '=', relation: '=',
type: 'boolean', type: 'boolean',
......
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