Skip to content
Snippets Groups Projects
Commit 707b072b authored by Vytor Calixto's avatar Vytor Calixto :space_invader:
Browse files

Merge branch 'classroom_count' into hotfix_v1.3.1

parents 94918fc6 347ef998
No related branches found
No related tags found
No related merge requests found
...@@ -246,6 +246,7 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => { ...@@ -246,6 +246,7 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
let result = []; let result = [];
let hashSet = new Set(); let hashSet = new Set();
let enrollments = [...req.enrollment]; let enrollments = [...req.enrollment];
let leftovers = [];
while (i < req.classroom.length) { while (i < req.classroom.length) {
let classroom = req.classroom[i]; let classroom = req.classroom[i];
// Cria hash única para cada espacialidade, dado um ano // Cria hash única para cada espacialidade, dado um ano
...@@ -305,7 +306,12 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => { ...@@ -305,7 +306,12 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
enrollmentMatch = false; enrollmentMatch = false;
continue; continue;
} else if(classroom.city_name > enrollment.city_name) { } else if(classroom.city_name > enrollment.city_name) {
++j; let enrollmentHash = '' + enrollment.year + enrollment.state_id + enrollment.city_id;
if(hashSet.has(enrollmentHash)) {
leftovers.push(enrollments.splice(j, 1)); // Para inspeção, adiciona os que "sobram" no array de sobras
} else {
++j;
}
continue; continue;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment