Skip to content
Snippets Groups Projects
Commit c4629988 authored by Glenda Train's avatar Glenda Train
Browse files

fix LDE education level mod sequence

parent d3903b7b
No related branches found
No related tags found
2 merge requests!155Release v1.7.0,!153fix LDE education level mod sequence
Pipeline #17487 failed
This commit is part of merge request !153. Comments created here will be created in the context of that merge request.
...@@ -313,6 +313,28 @@ function averageCalc(response) { ...@@ -313,6 +313,28 @@ function averageCalc(response) {
return(obj); return(obj);
} }
// Se a dimensão obrigatória do LDE (etapa de ensino) possui alguma etapa sem nenhum valor, então é criado um objeto
// com média 0.0 e é inserido no resultado. Usada para não quebrar a sequência de etapas na tabela do LDE.
function addNullFields(result) {
const firstYear = result[0].year;
var obj = result.filter(res => res.year == firstYear);
var prevFirstDimId = obj[0];
obj.forEach((d) => {
if((d["education_level_mod_id"] > prevFirstDimId["education_level_mod_id"]) && (prevFirstDimId["education_level_mod_id"] != 10) &&
(d["education_level_mod_id"] != prevFirstDimId["education_level_mod_id"] + 1)) {
let newObj = {};
Object.keys(prevFirstDimId).forEach((key) => {
newObj[key] = prevFirstDimId[key];
});
newObj.education_level_mod_id = d["education_level_mod_id"] - 1;
newObj.education_level_mod_name = id2str.educationLevelMod(d["education_level_mod_id"] - 1);
newObj.average = 0.0;
result.splice(result.indexOf(prevFirstDimId) + 1, 0, newObj);
}
prevFirstDimId = d;
});
}
// LDE // LDE
classCountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { classCountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
// Faz a consulta do número de alunos pelas dimensões // Faz a consulta do número de alunos pelas dimensões
...@@ -379,6 +401,7 @@ classCountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => { ...@@ -379,6 +401,7 @@ classCountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
else { else {
const classCount = averageCalc(req.result); const classCount = averageCalc(req.result);
req.result = classCount; req.result = classCount;
addNullFields(req.result);
} }
next(); next();
}, response('class_count')); }, response('class_count'));
......
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