diff --git a/src/libs/routes/disciplines.js b/src/libs/routes/disciplines.js index 217626aabe68f3febd87ddd5791c7cc17ce698eb..3fde7c6e4b7e510049b038bd20a9d40a4a08330a 100644 --- a/src/libs/routes/disciplines.js +++ b/src/libs/routes/disciplines.js @@ -634,21 +634,25 @@ disciplinesApp.get('/', rqf.parse(), (req, res, next) => { total: parseInt(r.total) - parseInt(r.total_suitable), suitable: 0, discipline_name: 'Formação não adequada', - sum_total: 0, - sum_suitable: 0 } let objSuitable = { total: parseInt(r.total_suitable), suitable: 1, discipline_name: 'Formação adequada', - sum_total: 0, - sum_suitable: 0 - } + } Object.keys(r).forEach(k => { - if (k !== 'total' && k !== 'total_suitable') { - objNotSuitable[k] = r[k]; + if (k !== 'total' && k !== 'total_suitable') { + objNotSuitable[k] = r[k]; objSuitable[k] = r[k]; + } + }) + if ('discipline' in req.dims){ + objNotSuitable["sum_total"] = 0; + objNotSuitable["sum_suitable"] = 0; + objSuitable["sum_total"] = 0; + objSuitable["sum_suitable"] = 0; + Object.keys(r).forEach(k => { if (/^total_suitable/.test(k)){ // if k starts with total_suitable objSuitable.sum_suitable += parseInt(r[k]); objNotSuitable.sum_suitable += parseInt(r[k]); @@ -657,8 +661,8 @@ disciplinesApp.get('/', rqf.parse(), (req, res, next) => { objSuitable.sum_total += parseInt(r[k]); objNotSuitable.sum_total += parseInt(r[k]); } - } - }) + }) + } disciplinesNotSuitable.push(objNotSuitable) disciplinesSuitable.push(objSuitable)