diff --git a/src/libs/routes/disciplines.js b/src/libs/routes/disciplines.js index d43d8d319c5539afd635879e3604deced5bbe112..217626aabe68f3febd87ddd5791c7cc17ce698eb 100644 --- a/src/libs/routes/disciplines.js +++ b/src/libs/routes/disciplines.js @@ -633,18 +633,30 @@ disciplinesApp.get('/', rqf.parse(), (req, res, next) => { let objNotSuitable = { total: parseInt(r.total) - parseInt(r.total_suitable), suitable: 0, - discipline_name: 'Formação não adequada' + 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' + 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]; objSuitable[k] = r[k]; + if (/^total_suitable/.test(k)){ // if k starts with total_suitable + objSuitable.sum_suitable += parseInt(r[k]); + objNotSuitable.sum_suitable += parseInt(r[k]); + } + else if (/^total_/.test(k)){ + objSuitable.sum_total += parseInt(r[k]); + objNotSuitable.sum_total += parseInt(r[k]); + } } }) @@ -658,3 +670,4 @@ disciplinesApp.get('/', rqf.parse(), (req, res, next) => { module.exports = disciplinesApp; +