From 7fc525133f136e21f909a70b02e8f14974a1ed3f Mon Sep 17 00:00:00 2001
From: Pietro <ppc19@inf.ufpr.br>
Date: Tue, 7 Jun 2022 09:26:23 -0300
Subject: [PATCH] remove sums from consult without dim
---
src/libs/routes/disciplines.js | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/libs/routes/disciplines.js b/src/libs/routes/disciplines.js
index 217626aa..3fde7c6e 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)
--
GitLab