Merge branch 'pib_per_capita_fix' into development

src/libs/routes/pibpercapita.js

@@ -147,20 +147,24 @@ rqf.addField({
 
 pibpercapitaApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
   log.debug(req.sql.toParam());
-  req.sql.from('ibge_pib')
-  .field('SUM(ibge_pib.pib)/SUM(ibge_pib.populacao)', 'total')
-  .field('ibge_pib.ano_censo', 'year')
-  .group('ibge_pib.ano_censo')
-  .order('ibge_pib.ano_censo')
 
+  if (("city" in req.dims) || ("city" in req.filter)) {
+      console.log("PRIMEIRO");
+      req.sql.from('ibge_pib')
+      .field('ibge_pib.pib_per_capita', 'total')
+      .field('ibge_pib.ano_censo', 'year')
+      .group('ibge_pib.ano_censo')
+      .group('ibge_pib.pib_per_capita')
+      .order('ibge_pib.ano_censo')
+  } else  {
+    console.log("SEGUNDO");
+      req.sql.from('ibge_pib')
+      .field('SUM(ibge_pib.pib)/SUM(ibge_pib.populacao)', 'total')
+      .field('ibge_pib.ano_censo', 'year')
+      .group('ibge_pib.ano_censo')
+      .order('ibge_pib.ano_censo')
+   }
    next();
-}, query, id2str.transform(false), (req, res, next) => {
-    req.result.forEach((i) => {
-        let value = i.total;
-        let res = value.toString().split(".");
-        i.total = res[0] + "." +  res[1].toString().substring(0,3)  + "," + res[1].toString().substring(4,7) 
-    });
-    next();
-} ,response("pibpercapita"));
+}, rqf.build(), query, id2str.transform(false), response('pibpercapita'));
 
 module.exports = pibpercapitaApp;