Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SMPPIR-Node
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
SMPPIR
SMPPIR-Node
Commits
0f53a6e4
Commit
0f53a6e4
authored
5 years ago
by
Fernando Erd
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/v1.11.11'
parents
d9a3bdf5
c842a21a
Branches
Branches containing commit
No related tags found
1 merge request
!28
Development
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
src/libs/routes/classroomCount.js
+2
-1
2 additions, 1 deletion
src/libs/routes/classroomCount.js
with
6 additions
and
1 deletion
CHANGELOG.md
+
4
−
0
View file @
0f53a6e4
...
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
...
@@ -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/
)
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/
)
.
## 1.11.11 - 2019-09-09
## Changed
-
Changed classroomCount filters
## 1.11.10 - 2019-08-23
## 1.11.10 - 2019-08-23
## Changed
## Changed
-
Removed year limitation
-
Removed year limitation
...
...
This diff is collapsed.
Click to expand it.
src/libs/routes/classroomCount.js
+
2
−
1
View file @
0f53a6e4
...
@@ -271,7 +271,8 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
...
@@ -271,7 +271,8 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
.
group
(
'
escola.ano_censo
'
)
.
group
(
'
escola.ano_censo
'
)
.
order
(
'
escola.ano_censo
'
)
.
order
(
'
escola.ano_censo
'
)
.
where
(
'
escola.situacao_de_funcionamento = 1
'
)
.
where
(
'
escola.situacao_de_funcionamento = 1
'
)
.
where
(
'
escola.dependencia_adm_id < 4
'
);
.
where
(
'
escola.dependencia_adm_id < 4
'
)
.
where
(
'
escola.ensino_regular = 1 OR escola.ensino_eja = 1 OR escola.educacao_profissional = 1
'
);
next
();
next
();
},
rqf
.
build
(),
query
,
id2str
.
transform
(),
(
req
,
res
,
next
)
=>
{
},
rqf
.
build
(),
query
,
id2str
.
transform
(),
(
req
,
res
,
next
)
=>
{
...
...
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