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
580b5365
Commit
580b5365
authored
1 month ago
by
MateusHerbele
Browse files
Options
Downloads
Patches
Plain Diff
indicador receita potencial finalizado
parent
bc2d1627
Branches
receita-potencial
Branches containing commit
No related tags found
2 merge requests
!466
Development
,
!464
Receita potencial
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/libs/convert/potentialRevenue.js
+1
-9
1 addition, 9 deletions
src/libs/convert/potentialRevenue.js
src/libs/routes_v1/potentialRevenue.js
+2
-6
2 additions, 6 deletions
src/libs/routes_v1/potentialRevenue.js
src/libs/routes_v1/studentRevenue.js
+1
-1
1 addition, 1 deletion
src/libs/routes_v1/studentRevenue.js
with
4 additions
and
16 deletions
src/libs/convert/potentialRevenue.js
+
1
−
9
View file @
580b5365
...
...
@@ -23,20 +23,12 @@ module.exports = function regionCode(id) {
case
1
:
return
"
Ano
"
;
case
2
:
return
"
Nome Ente
"
return
"
Nome Ente
"
;
case
3
:
return
'
Receitas
'
;
case
4
:
return
'
Matrículas Públicas
'
;
case
5
:
return
'
Matrículas Públicas Mais Conveniada
'
;
case
6
:
return
'
Receita Aluno Ano Pública
'
case
7
:
return
'
Receita Aluno Mês Pública
'
;
case
8
:
return
'
Receita Aluno Ano Pública Mais Conveniada
'
;
case
9
:
return
'
Receita Aluno Mês Pública Mais Conveniada
'
;
}
};
This diff is collapsed.
Click to expand it.
src/libs/routes_v1/potentialRevenue.js
+
2
−
6
View file @
580b5365
...
...
@@ -99,7 +99,7 @@ rqf.addField({
potentialRevenueApp
.
get
(
'
/
'
,
rqf
.
parse
(),
rqf
.
build
(),
(
req
,
res
,
next
)
=>
{
if
(
req
.
query
.
dims
&&
req
.
query
.
dims
.
includes
(
'
receita
s
'
))
{
if
(
req
.
query
.
dims
&&
req
.
query
.
dims
.
includes
(
'
receita
_potencial
'
))
{
let
whereCondition
=
req
.
query
.
filter
.
includes
(
"
region
"
)
?
""
:
"
receitas.cod_ibge = 0
"
;
let
filterId
;
const
filters
=
req
.
query
.
filter
.
split
(
"
,
"
);
...
...
@@ -117,12 +117,8 @@ potentialRevenueApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.
field
(
'
receitas.receitas
'
,
'
total_receitas
'
)
.
field
(
'
matriculas_publica
'
,
'
total_matriculas_publica
'
)
.
field
(
'
matriculas_publicas_mais_conveniada
'
,
'
total_matriculas_publicas_mais_conveniada
'
)
.
field
(
'
receuta_aluno_ano_publica
'
,
'
total_receuta_aluno_ano_publica
'
)
.
field
(
'
receita_aluno_mes_publica
'
,
'
total_receita_aluno_mes_publica
'
)
.
field
(
'
receita_aluno_ano_publica_mais_conveniada
'
,
'
total_receita_aluno_ano_publica_mais_conveniada
'
)
.
field
(
'
receita_aluno_mes_publica_mais_conveniada
'
,
'
total_receita_aluno_mes_publica_mais_conveniada
'
)
.
where
(
`
${
whereCondition
}
`
)
.
order
(
'
receitas.ano
'
)
.
order
(
'
receitas.ano
'
)
;
}
next
();
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes_v1/studentRevenue.js
+
1
−
1
View file @
580b5365
...
...
@@ -42,7 +42,7 @@ const cache = require('apicache').options({ debug: config.debug, statusCodes: {i
let
rqf
=
new
ReqQueryFields
();
studentRevenueApp
.
use
(
cache
(
'
15 day
'
));
//
studentRevenueApp.use(cache('15 day'));
studentRevenueApp
.
get
(
'
/years
'
,
(
req
,
res
,
next
)
=>
{
req
.
sql
.
from
(
'
receitas
'
)
...
...
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