Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
simcaq-node
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
simcaq
simcaq-node
Commits
169e404a
There was a problem fetching the pipeline summary.
Commit
169e404a
authored
7 years ago
by
Fernando Erd
Browse files
Options
Downloads
Patches
Plain Diff
Change broadband, energy, wastepipe, restroom and denpendency_pne to boolean convert
parent
995c7d46
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!116
Release v1.0.0
,
!47
School number count
Pipeline
#
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/libs/middlewares/id2str.js
+6
-1
6 additions, 1 deletion
src/libs/middlewares/id2str.js
src/libs/routes/school.js
+10
-5
10 additions, 5 deletions
src/libs/routes/school.js
with
16 additions
and
6 deletions
src/libs/middlewares/id2str.js
+
6
−
1
View file @
169e404a
...
...
@@ -33,7 +33,12 @@ const ids = {
indor_sports_court_id
:
booleanVariable
,
nusery_id
:
booleanVariable
,
special_attendence_room_id
:
booleanVariable
,
toilet_inside_building_id
:
booleanVariable
toilet_inside_building_id
:
booleanVariable
,
denpendency_pne_id
:
booleanVariable
,
restroom_pne_id
:
booleanVariable
,
broadband_id
:
booleanVariable
,
energy_id
:
booleanVariable
,
wastepipe_id
:
booleanVariable
};
function
transform
(
removeId
=
false
)
{
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes/school.js
+
10
−
5
View file @
169e404a
...
...
@@ -169,6 +169,7 @@ schoolApp.get('/toilet_inside_building', (req, res, next) => {
schoolApp
.
get
(
'
/denpendency_pne
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
{
id
:
null
,
name
:
'
Não Declarado
'
},
{
id
:
0
,
name
:
'
Não
'
},
{
id
:
1
,
name
:
'
Sim
'
}
];
...
...
@@ -177,6 +178,7 @@ schoolApp.get('/denpendency_pne', (req, res, next) => {
schoolApp
.
get
(
'
/restroom_pne
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
{
id
:
null
,
name
:
'
Não Declarado
'
},
{
id
:
0
,
name
:
'
Não
'
},
{
id
:
1
,
name
:
'
Sim
'
}
];
...
...
@@ -185,6 +187,7 @@ schoolApp.get('/restroom_pne', (req, res, next) => {
schoolApp
.
get
(
'
/broadband
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
{
id
:
null
,
name
:
'
Não Declarado
'
},
{
id
:
0
,
name
:
'
Não
'
},
{
id
:
1
,
name
:
'
Sim
'
}
];
...
...
@@ -193,6 +196,7 @@ schoolApp.get('/broadband', (req, res, next) => {
schoolApp
.
get
(
'
/energy
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
{
id
:
null
,
name
:
'
Não Declarado
'
},
{
id
:
0
,
name
:
'
Não
'
},
{
id
:
1
,
name
:
'
Sim
'
}
];
...
...
@@ -201,6 +205,7 @@ schoolApp.get('/energy', (req, res, next) => {
schoolApp
.
get
(
'
/wastepipe
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
{
id
:
null
,
name
:
'
Não Declarado
'
},
{
id
:
0
,
name
:
'
Não
'
},
{
id
:
1
,
name
:
'
Sim
'
}
];
...
...
@@ -620,7 +625,7 @@ rqfCount.addField({
name
:
'
wastepipe
'
,
table
:
'
escola
'
,
tableField
:
'
esgoto_sanitario
'
,
resultField
:
'
wastepipe_
name
'
,
resultField
:
'
wastepipe_
id
'
,
where
:
{
relation
:
'
=
'
,
type
:
'
boolean
'
,
...
...
@@ -640,7 +645,7 @@ rqfCount.addField({
name
:
'
energy
'
,
table
:
'
escola
'
,
tableField
:
'
fornecimento_energia
'
,
resultField
:
'
energy_
name
'
,
resultField
:
'
energy_
id
'
,
where
:
{
relation
:
'
=
'
,
type
:
'
boolean
'
,
...
...
@@ -650,7 +655,7 @@ rqfCount.addField({
name
:
'
broadband
'
,
table
:
'
escola
'
,
tableField
:
'
internet_banda_larga
'
,
resultField
:
'
broadband_
name
'
,
resultField
:
'
broadband_
id
'
,
where
:
{
relation
:
'
=
'
,
type
:
'
boolean
'
,
...
...
@@ -660,7 +665,7 @@ rqfCount.addField({
name
:
'
restroom_pne
'
,
table
:
'
escola
'
,
tableField
:
'
sanitario_pne
'
,
resultField
:
'
restroom_pne_
name
'
,
resultField
:
'
restroom_pne_
id
'
,
where
:
{
relation
:
'
=
'
,
type
:
'
boolean
'
,
...
...
@@ -670,7 +675,7 @@ rqfCount.addField({
name
:
'
denpendency_pne
'
,
table
:
'
escola
'
,
tableField
:
'
dependencias_pne
'
,
resultField
:
'
denpendency_pne_
name
'
,
resultField
:
'
denpendency_pne_
id
'
,
where
:
{
relation
:
'
=
'
,
type
:
'
boolean
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment