From d9268ab225b5d100bccf012d724244c83fc96d14 Mon Sep 17 00:00:00 2001
From: Victor Picussa <vp16@inf.ufpr.br>
Date: Wed, 5 Sep 2018 09:58:28 -0300
Subject: [PATCH] Revert "[dailyChargeAmount]Data sent modification"
This reverts commit 898dbff699994a9fdbd4d15a8c3fa512b69f64af.
---
src/libs/routes/dailyChargeAmount.js | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/libs/routes/dailyChargeAmount.js b/src/libs/routes/dailyChargeAmount.js
index b536eb00..33d914fc 100644
--- a/src/libs/routes/dailyChargeAmount.js
+++ b/src/libs/routes/dailyChargeAmount.js
@@ -382,13 +382,11 @@ dailyChargeAmountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next) => {
var status = 0;
-
if (('education_level_mod' in req.filter || 'education_level_mod' in req.dims)
&& ('integral_time' in req.filter)) {
if (req.filter['integral_time'] == '0'
&& ('period' in req.filter)) {
- if (req.dims.size > 1) status = 2;
- else if (req.filter['period'].length == 1
+ if (req.filter['period'].length == 1
&& req.filter['period'][0] == '3') {
status = 1;
} else if (req.filter['period'].length <= 2
@@ -398,12 +396,11 @@ dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next)
status = 1;
}
} else if (req.filter['integral_time'] == '1') {
- if (req.dims.size > 1) status = 2;
- else status = 1;
+ status = 1;
}
}
- if (status == 1) {
+ if (status) {
req.sql.from('turma')
.field('turma.ano_censo', 'year')
.field('turma.etapas_mod_ensino_segmento_id', 'education_level_mod_id')
@@ -417,16 +414,6 @@ dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next)
.order('turma.ano_censo')
.order('turma.etapas_mod_ensino_segmento_id')
.where('turma.tipo_turma_id <= 3')
- } else if (status == 2) {
- req.sql.from('turma')
- .field('turma.ano_censo', 'year')
- .field('turma.etapas_mod_ensino_segmento_id', 'education_level_mod_id')
- .field('AVG(turma.duracao_turma)/60.0', 'average_class_duration')
- .group('turma.ano_censo')
- .group('turma.etapas_mod_ensino_segmento_id')
- .order('turma.ano_censo')
- .order('turma.etapas_mod_ensino_segmento_id')
- .where('turma.tipo_turma_id <= 3')
} else {
res.status(400);
next({
--
GitLab