Skip to content
Snippets Groups Projects
Commit e4415f12 authored by Victor Picussa's avatar Victor Picussa
Browse files

Merge branch 'fix_dc' into development

parents da2dd6cc 9ec4bf84
No related branches found
No related tags found
2 merge requests!160Issue/423,!157WIP: Release v1.8.0
Pipeline #17706 failed
......@@ -321,7 +321,7 @@ rqf.addField({
}
});
dailyChargeAmountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
dailyChargeAmountApp.get('/', rqf.parse(), (req, res, next) => {
var status = 0;
if ('integral_time' in req.filter) {
if (req.filter['integral_time'] == '0'
......@@ -364,7 +364,7 @@ dailyChargeAmountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
next();
}, query, addMissing(rqf), (req, res, next) => {
}, rqf.build(), query, addMissing(rqf), (req, res, next) => {
function sliced(object) {
return object['education_level_short_id'] > 3;
......@@ -380,7 +380,7 @@ dailyChargeAmountApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
next();
}, id2str.transform(), response('turma'));
dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next) => {
dailyChargeAmountApp.get('/average', rqf.parse(), (req, res, next) => {
var status = 0;
if (('education_level_mod' in req.filter || 'education_level_mod' in req.dims)
&& ('integral_time' in req.filter)) {
......@@ -423,6 +423,6 @@ dailyChargeAmountApp.get('/average', rqf.parse(), rqf.build(), (req, res, next)
}
next();
}, query, addMissing(rqf), id2str.transform(), response('turma'));
}, rqf.build(), query, addMissing(rqf), id2str.transform(), response('turma'));
module.exports = dailyChargeAmountApp;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment