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
0b9eb317
Commit
0b9eb317
authored
5 years ago
by
Fernando Erd
Browse files
Options
Downloads
Plain Diff
Merge branch 'v1.9.5'
parents
16c02d96
2ad5cfe2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#19824
failed
5 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
src/libs/routes/classCount.js
+21
-1
21 additions, 1 deletion
src/libs/routes/classCount.js
with
25 additions
and
1 deletion
CHANGELOG.md
+
4
−
0
View file @
0b9eb317
...
...
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
http://keepachangelog.com/
)
and this project adheres to
[
Semantic Versioning
](
http://semver.org/
)
.
## 1.9.5 - 2019-03-15
## Changed
-
Fix join's in class count route
## 1.9.4 - 2019-03-12
## Changed
-
Change docente.id to docente.id_docente
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes/classCount.js
+
21
−
1
View file @
0b9eb317
/*
Copyright (C) 2016 Centro de Computacao Cientifica e Software Livre
Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
This file is part of simcaq-node.
simcaq-node is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
simcaq-node is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with simcaq-node. If not, see <https://www.gnu.org/licenses/>.
*/
const
express
=
require
(
'
express
'
);
const
classCountApp
=
express
.
Router
();
...
...
@@ -337,7 +357,7 @@ classCountApp.get('/count', rqf.parse(), (req, res, next) => {
},
rqf
.
build
(),
query
,
addMissing
(
rqf
),
id2str
.
transform
(),
response
(
'
class_count
'
));
// LDE
classCountApp
.
get
(
'
/
'
,
rqf
.
parse
(),
rqf
.
build
(),
(
req
,
res
,
next
)
=>
{
classCountApp
.
get
(
'
/
'
,
rqf
.
parse
(),
(
req
,
res
,
next
)
=>
{
// Faz a consulta do número de alunos pelas dimensões
if
((
"
education_level_mod
"
in
req
.
dims
)
||
(
"
education_level_mod
"
in
req
.
filter
)
||
(
"
education_level_short
"
in
req
.
dims
))
{
req
.
sql
.
field
(
"
'Brasil'
"
,
'
name
'
)
...
...
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