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
Harbor Registry
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
8e64602d
Commit
8e64602d
authored
6 months ago
by
lgtg20
Browse files
Options
Downloads
Patches
Plain Diff
feat: faixa de renda showing right results
parent
3fb81f8a
No related branches found
No related tags found
4 merge requests
!449
Homologa
,
!444
dev -> hom
,
!440
New indicators
,
!432
Issue 953
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/libs/convert/incomeRange.js
+2
-0
2 additions, 0 deletions
src/libs/convert/incomeRange.js
src/libs/routes_v1/basicEducationConclusion.js
+9
-3
9 additions, 3 deletions
src/libs/routes_v1/basicEducationConclusion.js
with
11 additions
and
3 deletions
src/libs/convert/incomeRange.js
+
2
−
0
View file @
8e64602d
...
@@ -36,5 +36,7 @@ module.exports = function incomeRange(id) {
...
@@ -36,5 +36,7 @@ module.exports = function incomeRange(id) {
return
'
Mais de 5 salários mínimos
'
;
return
'
Mais de 5 salários mínimos
'
;
case
9
:
case
9
:
return
'
Não informado ou ignorado
'
;
return
'
Não informado ou ignorado
'
;
case
10
:
return
"
Ignorado
"
}
}
};
};
This diff is collapsed.
Click to expand it.
src/libs/routes_v1/basicEducationConclusion.js
+
9
−
3
View file @
8e64602d
...
@@ -159,7 +159,7 @@ basicEducationConclusion.get('/income_range', (req, res, next) => {
...
@@ -159,7 +159,7 @@ basicEducationConclusion.get('/income_range', (req, res, next) => {
id
:
i
,
name
:
id2str
.
incomeRange
(
i
)
id
:
i
,
name
:
id2str
.
incomeRange
(
i
)
});
});
}
}
req
.
result
.
push
({
id
:
9
,
name
:
id2str
.
incomeRange
(
9
)});
req
.
result
.
push
({
id
:
10
,
name
:
id2str
.
incomeRange
(
10
)});
next
();
next
();
},
response
(
'
income_range
'
));
},
response
(
'
income_range
'
));
...
@@ -426,12 +426,12 @@ rqf.addField({
...
@@ -426,12 +426,12 @@ rqf.addField({
}).
addValue
({
}).
addValue
({
name
:
'
income_range
'
,
name
:
'
income_range
'
,
table
:
'
pnad_novo
'
,
table
:
'
pnad_novo
'
,
tableField
:
'
faixa_rendimento_aux
'
,
tableField
:
'
faixa_rendimento_aux
_tx
'
,
resultField
:
'
income_range_id
'
,
resultField
:
'
income_range_id
'
,
where
:
{
where
:
{
relation
:
'
=
'
,
relation
:
'
=
'
,
type
:
'
integer
'
,
type
:
'
integer
'
,
field
:
'
faixa_rendimento_aux
'
field
:
'
faixa_rendimento_aux
_tx
'
}
}
}).
addValue
({
}).
addValue
({
name
:
'
gender
'
,
name
:
'
gender
'
,
...
@@ -599,8 +599,14 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
...
@@ -599,8 +599,14 @@ basicEducationConclusion.get('/', rqf.parse(), rqf.build(), (req, res, next) =>
.
group
(
"
ano_ref
"
)
.
group
(
"
ano_ref
"
)
.
order
(
"
ano_ref
"
);
.
order
(
"
ano_ref
"
);
if
(
req
.
query
.
dims
&&
req
.
query
.
dims
.
includes
(
"
income_range
"
))
{
totalPopMaior19
.
where
(
"
faixa_rendimento_aux_tx is not null
"
);
totalPopEdBasMaior19
.
where
(
"
faixa_rendimento_aux_tx is not null
"
);
}
req
.
querySet
.
push
(
totalPopEdBasMaior19
);
req
.
querySet
.
push
(
totalPopEdBasMaior19
);
req
.
querySet
.
push
(
totalPopMaior19
);
req
.
querySet
.
push
(
totalPopMaior19
);
next
();
next
();
},
multiQuery
,
(
req
,
res
,
next
)
=>
{
},
multiQuery
,
(
req
,
res
,
next
)
=>
{
// The multiple requests are made. Then we need to calculate the percetange. So the function
// The multiple requests are made. Then we need to calculate the percetange. So the function
...
...
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