From c3a1aebbda8a4386bcd63e078cfab3d21465d98a Mon Sep 17 00:00:00 2001
From: Pietro Polinari Cavassin <pietro.polinari@gmail.com>
Date: Mon, 6 Jun 2022 14:32:12 -0300
Subject: [PATCH] add sum_suitable and sum_total parameters
---
src/libs/routes/disciplines.js | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/libs/routes/disciplines.js b/src/libs/routes/disciplines.js
index d43d8d31..217626aa 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;
+
--
GitLab