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
a0aea76a
Commit
a0aea76a
authored
6 years ago
by
Vytor Calixto
Browse files
Options
Downloads
Plain Diff
Merge branch 'v1.6.0' into portalMecSchool
parents
1c2550a3
ae0cbf5c
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!145
v1.6.0
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+7
-6
7 additions, 6 deletions
CHANGELOG.md
src/libs/routes/api.js
+2
-4
2 additions, 4 deletions
src/libs/routes/api.js
src/libs/routes/portalMecInep.js
+1
-2
1 addition, 2 deletions
src/libs/routes/portalMecInep.js
with
10 additions
and
12 deletions
CHANGELOG.md
+
7
−
6
View file @
a0aea76a
...
@@ -4,17 +4,18 @@ All notable changes to this project will be documented in this file.
...
@@ -4,17 +4,18 @@ All notable changes to this project will be documented in this file.
The format is based on
[
Keep a Changelog
](
http://keepachangelog.com/
)
The format is based on
[
Keep a Changelog
](
http://keepachangelog.com/
)
and this project adheres to
[
Semantic Versioning
](
http://semver.org/
)
.
and this project adheres to
[
Semantic Versioning
](
http://semver.org/
)
.
##
UNRELEASED
##
1.6.0 - 2018-08-17
### Added
### Added
-
Dimension state in route enrollment now returns state name and id
-
Dimension state in route
`
enrollment
`
now returns state name and id
-
S
chool route now has a search parameter. You can search by city name or state abbreviation
-
`s
chool
`
route now has a
`
search
`
parameter. You can search by city name or state abbreviation
-
Added all age range convertion
-
Added all age range convertion
-
Added special class and all age range to id2str
-
Added special class and all age range to id2str
-
Added school infratructure route
-
Added
`
school infratructure
`
route
-
Added INEP route for Portal MEC
-
Added
`
INEP
`
route for Portal MEC
### Changed
### Changed
-
Fix
`auxiliar`
indicator
-
Add property "don't group" in RQF to dismiss the group by and order by clause
-
Add property "don't group" in RQF to dismiss the group by and order by clause
-
Change RQF filters in auxiliar route
-
Change RQF filters in
`
auxiliar
`
route
-
Fix total classrooms needed bug in classroom count
-
Fix total classrooms needed bug in classroom count
-
Add special class and all age range to enrollment route
-
Add special class and all age range to enrollment route
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes/api.js
+
2
−
4
View file @
a0aea76a
...
@@ -76,10 +76,9 @@ const dailyChargeAmount = require(`${libs}/routes/dailyChargeAmount`);
...
@@ -76,10 +76,9 @@ const dailyChargeAmount = require(`${libs}/routes/dailyChargeAmount`);
const
cub
=
require
(
`
${
libs
}
/routes/cub`
);
const
cub
=
require
(
`
${
libs
}
/routes/cub`
);
const
classCount
=
require
(
`
${
libs
}
/routes/classCount`
);
const
portalMecInep
=
require
(
`
${
libs
}
/routes/portalMecInep`
);
const
portalMecInep
=
require
(
`
${
libs
}
/routes/portalMecInep`
);
api
.
get
(
'
/
'
,
(
req
,
res
)
=>
{
api
.
get
(
'
/
'
,
(
req
,
res
)
=>
{
res
.
json
({
msg
:
'
SimCAQ API is running
'
});
res
.
json
({
msg
:
'
SimCAQ API is running
'
});
});
});
...
@@ -120,7 +119,6 @@ api.use('/transport', transport);
...
@@ -120,7 +119,6 @@ api.use('/transport', transport);
api
.
use
(
'
/cub
'
,
cub
);
api
.
use
(
'
/cub
'
,
cub
);
api
.
use
(
'
/auxiliar
'
,
auxiliar
);
api
.
use
(
'
/auxiliar
'
,
auxiliar
);
api
.
use
(
'
/verify_teacher
'
,
verifyTeacher
);
api
.
use
(
'
/verify_teacher
'
,
verifyTeacher
);
api
.
use
(
'
/class_count
'
,
classCount
);
api
.
use
(
'
/portal_mec_inep
'
,
portalMecInep
);
api
.
use
(
'
/poltal_mec_inep
'
,
portalMecInep
);
module
.
exports
=
api
;
module
.
exports
=
api
;
This diff is collapsed.
Click to expand it.
src/libs/routes/portalMecInep.js
+
1
−
2
View file @
a0aea76a
...
@@ -46,14 +46,13 @@ rqf.addField({
...
@@ -46,14 +46,13 @@ rqf.addField({
portalMecInepApp
.
get
(
'
/
'
,
rqf
.
parse
(),
(
req
,
res
,
next
)
=>
{
portalMecInepApp
.
get
(
'
/
'
,
rqf
.
parse
(),
(
req
,
res
,
next
)
=>
{
req
.
sql
.
field
(
'
DISTINCT escola.id
'
,
'
id
'
)
req
.
sql
.
field
(
'
DISTINCT escola.id
'
,
'
id
'
)
.
field
(
'
escola.nome_escola
'
,
'
school_
name
'
)
.
field
(
'
escola.nome_escola
'
,
'
name
'
)
.
from
(
'
escola
'
)
.
from
(
'
escola
'
)
.
join
(
'
estado
'
,
null
,
'
estado.id=escola.estado_id
'
)
.
join
(
'
estado
'
,
null
,
'
estado.id=escola.estado_id
'
)
.
field
(
'
estado.nome
'
,
'
state_name
'
)
.
field
(
'
estado.nome
'
,
'
state_name
'
)
.
join
(
'
municipio
'
,
null
,
'
municipio.id=escola.municipio_id
'
)
.
join
(
'
municipio
'
,
null
,
'
municipio.id=escola.municipio_id
'
)
.
field
(
'
municipio.nome
'
,
'
city_name
'
)
.
field
(
'
municipio.nome
'
,
'
city_name
'
)
next
();
next
();
},
rqf
.
build
(),
query
,
response
(
'
portalMec_inep
'
));
},
rqf
.
build
(),
query
,
response
(
'
portalMec_inep
'
));
...
...
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