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
4b0c6191
Commit
4b0c6191
authored
3 days ago
by
Joao Pedro
Browse files
Options
Downloads
Patches
Plain Diff
[mod] remoção de console.log
parent
2ba2642d
No related branches found
No related tags found
1 merge request
!450
Despesas
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/libs/convert/expenses.js
+10
-8
10 additions, 8 deletions
src/libs/convert/expenses.js
src/libs/middlewares/expensesParser.js
+0
-2
0 additions, 2 deletions
src/libs/middlewares/expensesParser.js
src/libs/routes_v1/expenses.js
+2
-7
2 additions, 7 deletions
src/libs/routes_v1/expenses.js
with
12 additions
and
17 deletions
src/libs/convert/expenses.js
+
10
−
8
View file @
4b0c6191
...
...
@@ -21,21 +21,23 @@ along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
module
.
exports
=
function
regionCode
(
id
)
{
switch
(
id
)
{
case
1
:
return
"
Nome Ente
"
return
"
Ano
"
;
case
2
:
return
'
Despesas
'
;
return
"
Entidade
"
;
case
3
:
return
'
Matrículas Públic
as
'
;
return
'
Despes
as
'
;
case
4
:
return
'
Matrículas Públicas
Mais Conveniada
'
;
return
'
Matrículas Públicas
'
;
case
5
:
return
'
Despesas Aluno Ano Pública
'
return
'
Matrículas Públicas Mais Conveniada
'
;
case
6
:
return
'
Despesas Aluno
Mês
Pública
'
;
return
'
Despesas Aluno
Ano
Pública
'
case
7
:
return
'
Despesas Aluno
Ano
Pública
Mais Conveniada
'
;
return
'
Despesas Aluno
Mês
Pública
'
;
case
8
:
return
'
Despesas Aluno Mês Pública Mais Conveniada
'
;
return
'
Despesas Aluno Ano Pública Mais Conveniada
'
;
case
9
:
return
'
Despesas Aluno Mês Pública Mais Conveniada
'
;
}
};
This diff is collapsed.
Click to expand it.
src/libs/middlewares/expensesParser.js
+
0
−
2
View file @
4b0c6191
...
...
@@ -4,8 +4,6 @@ Devido à limitações na tabela de dados, quando ambos campos estão ativos o f
"região" funciona incorretamente.
*/
module
.
exports
=
function
expensesParser
(
req
,
res
,
next
)
{
console
.
log
(
req
.
query
);
if
(
req
.
query
&&
req
.
query
.
filter
)
{
const
jsonString
=
`{
${
req
.
query
.
filter
.
replace
(
/
(\w
+
)
:/g
,
'
"$1":
'
)}
}`
;
const
obj
=
JSON
.
parse
(
jsonString
);
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes_v1/expenses.js
+
2
−
7
View file @
4b0c6191
...
...
@@ -122,11 +122,9 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
}
})
console
.
log
(
"
Filtro 2
"
);
console
.
log
(
filters
);
req
.
sql
.
from
(
'
despesas
'
)
.
field
(
'
despesas.ano_censo
'
,
'
year
'
)
.
field
(
'
despesas.ano_censo
'
,
'
total_ano
'
)
.
field
(
'
despesas.nome_ente
'
,
'
total_nome_ente
'
)
.
field
(
'
despesas.despesas
'
,
'
total_despesas
'
)
.
field
(
'
matriculas_publica
'
,
'
total_matriculas_publica
'
)
...
...
@@ -136,12 +134,9 @@ ExpensesApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.
field
(
'
gasto_aluno_ano_publica_mais_conveniada
'
,
'
total_gasto_aluno_ano_publica_mais_conveniada
'
)
.
field
(
'
gasto_aluno_mes_publica_mais_conveniada
'
,
'
total_gasto_aluno_mes_publica_mais_conveniada
'
)
.
where
(
`
${
whereCondition
}
`
)
.
order
(
'
despesas.
cod_ibge
'
)
.
order
(
'
despesas.
ano_censo
'
)
}
console
.
log
(
"
Requisição !
"
)
console
.
log
(
req
.
query
)
next
();
},
query
,
aggregateData
,
id2str
.
transform
(
false
),
response
(
'
expenses
'
));
...
...
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