Skip to content
Snippets Groups Projects

Development

Merged lgtg20 requested to merge development into homologa
1 file
+ 5
3
Compare changes
  • Side-by-side
  • Inline
@@ -67,10 +67,10 @@ function aggregateData(req, res, next) {
@@ -67,10 +67,10 @@ function aggregateData(req, res, next) {
'education_degree_entity',
'education_degree_entity',
'receitas',
'receitas',
'despesas'
'despesas'
]
];
 
const baseFields = ["school"]
let id;
let id;
const fields = req.query.dims.split(',');
const fields = req.query.dims.split(',');
console.log(fields);
let currentAggregateField;
let currentAggregateField;
let currentNonAggregateField;
let currentNonAggregateField;
@@ -92,7 +92,9 @@ function aggregateData(req, res, next) {
@@ -92,7 +92,9 @@ function aggregateData(req, res, next) {
if (currentNonAggregateField) {
if (currentNonAggregateField) {
data[`${currentNonAggregateField}_id`] = r[`${currentNonAggregateField}_id`];
data[`${currentNonAggregateField}_id`] = r[`${currentNonAggregateField}_id`];
data[`${currentNonAggregateField}_name`] = id2str[convert[currentNonAggregateField]](r[`${currentNonAggregateField}_id`]);
data[`${currentNonAggregateField}_name`] = baseFields.includes(currentNonAggregateField)
 
? r[`${currentNonAggregateField}_name`]
 
: id2str[convert[currentNonAggregateField]](r[`${currentNonAggregateField}_id`]);
}
}
newResult.push(data)
newResult.push(data)
Loading