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
cf3f2d10
Commit
cf3f2d10
authored
2 years ago
by
Guiusepe
Browse files
Options
Downloads
Patches
Plain Diff
school relative solicitations on issue 792 are completed
parent
ee7dfe4a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!329
Update enrollment - new filters
,
!309
Merge new updates into master
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/libs/convert/integralTime.js
+1
-1
1 addition, 1 deletion
src/libs/convert/integralTime.js
src/libs/routes/school.js
+4
-3
4 additions, 3 deletions
src/libs/routes/school.js
with
5 additions
and
4 deletions
src/libs/convert/integralTime.js
+
1
−
1
View file @
cf3f2d10
...
@@ -25,6 +25,6 @@ module.exports = function integralTime(id) {
...
@@ -25,6 +25,6 @@ module.exports = function integralTime(id) {
case
1
:
case
1
:
return
'
Sim
'
;
return
'
Sim
'
;
case
2
:
case
2
:
return
'
Não se aplica
(s
emi presencial e EaD
)
'
;
return
'
Não se aplica
- S
emi presencial e EaD
'
;
}
}
};
};
This diff is collapsed.
Click to expand it.
src/libs/routes/school.js
+
4
−
3
View file @
cf3f2d10
...
@@ -60,7 +60,7 @@ schoolApp.get('/location', cache('15 day'), (req, res, next) => {
...
@@ -60,7 +60,7 @@ schoolApp.get('/location', cache('15 day'), (req, res, next) => {
schoolApp
.
get
(
'
/diff_location
'
,
cache
(
'
15 day
'
),
(
req
,
res
,
next
)
=>
{
schoolApp
.
get
(
'
/diff_location
'
,
cache
(
'
15 day
'
),
(
req
,
res
,
next
)
=>
{
req
.
result
=
[
req
.
result
=
[
{
id
:
0
,
name
:
"
A escola n
ão está em localidade diferenciada
"
},
{
id
:
0
,
name
:
"
N
ão está em localidade diferenciada
"
},
{
id
:
1
,
name
:
"
Área de assentamento
"
},
{
id
:
1
,
name
:
"
Área de assentamento
"
},
{
id
:
2
,
name
:
"
Terra indígena
"
},
{
id
:
2
,
name
:
"
Terra indígena
"
},
{
id
:
3
,
name
:
"
Terra remanescente de quilombos
"
},
{
id
:
3
,
name
:
"
Terra remanescente de quilombos
"
},
...
@@ -70,6 +70,7 @@ schoolApp.get('/diff_location', cache('15 day'), (req, res, next) => {
...
@@ -70,6 +70,7 @@ schoolApp.get('/diff_location', cache('15 day'), (req, res, next) => {
schoolApp
.
get
(
'
/adm_dependency
'
,
(
req
,
res
,
next
)
=>
{
schoolApp
.
get
(
'
/adm_dependency
'
,
(
req
,
res
,
next
)
=>
{
req
.
result
=
[];
req
.
result
=
[];
for
(
let
i
=
1
;
i
<=
4
;
++
i
)
{
for
(
let
i
=
1
;
i
<=
4
;
++
i
)
{
req
.
result
.
push
({
req
.
result
.
push
({
id
:
i
,
id
:
i
,
...
@@ -81,7 +82,7 @@ schoolApp.get('/adm_dependency', (req, res, next) => {
...
@@ -81,7 +82,7 @@ schoolApp.get('/adm_dependency', (req, res, next) => {
schoolApp
.
get
(
'
/adm_dependency_detailed
'
,
cache
(
'
15 day
'
),
(
req
,
res
,
next
)
=>
{
schoolApp
.
get
(
'
/adm_dependency_detailed
'
,
cache
(
'
15 day
'
),
(
req
,
res
,
next
)
=>
{
req
.
result
=
[];
req
.
result
=
[];
for
(
let
i
=
1
;
i
<=
6
;
++
i
)
{
for
(
let
i
=
1
;
i
<=
8
;
i
++
)
{
req
.
result
.
push
({
req
.
result
.
push
({
id
:
i
,
id
:
i
,
name
:
id2str
.
admDependencyPriv
(
i
)
name
:
id2str
.
admDependencyPriv
(
i
)
...
@@ -92,7 +93,7 @@ schoolApp.get('/adm_dependency_detailed', cache('15 day'), (req, res, next) => {
...
@@ -92,7 +93,7 @@ schoolApp.get('/adm_dependency_detailed', cache('15 day'), (req, res, next) => {
schoolApp
.
get
(
'
/government_agreement
'
,
cache
(
'
15 day
'
),
(
req
,
res
,
next
)
=>
{
schoolApp
.
get
(
'
/government_agreement
'
,
cache
(
'
15 day
'
),
(
req
,
res
,
next
)
=>
{
req
.
result
=
[];
req
.
result
=
[];
for
(
let
i
=
1
;
i
<=
6
;
++
i
)
{
for
(
let
i
=
1
;
i
<=
7
;
++
i
)
{
req
.
result
.
push
({
req
.
result
.
push
({
id
:
i
,
id
:
i
,
name
:
id2str
.
govermentAgreement
(
i
)
name
:
id2str
.
govermentAgreement
(
i
)
...
...
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