From f1db5b4c7a1beff0c97bed03c630f6bfe91e0537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Tozatti=20Risso?= <jvtr12@inf.ufpr.br>
Date: Mon, 21 Nov 2016 17:14:51 -0200
Subject: [PATCH] Change order from etapa_ensino.desc_etapa to
 etapa_ensino.pk_etapa_ensino_id in location routes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: João Victor Tozatti Risso <jvtr12@inf.ufpr.br>
---
 src/libs/routes/location.js | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/libs/routes/location.js b/src/libs/routes/location.js
index 0dd66531..f5476f5e 100644
--- a/src/libs/routes/location.js
+++ b/src/libs/routes/location.js
@@ -606,7 +606,8 @@ locationApp.get('/educational', (req, res, next) => {
         .where(`turma.ano_censo IN (${schoolClassYearQry})`)
         .group('turma.ano_censo')
         .group('etapa_ensino.desc_etapa')
-        .order('etapa_ensino.desc_etapa');
+        .group('etapa_ensino.pk_etapa_ensino_id')
+        .order('etapa_ensino.pk_etapa_ensino_id');
 
     const queryLabels = [ "school", "school_per_location", "enrollment", "enrollment_per_adm_dep",
         "enrollment_per_school_level" ];
@@ -727,8 +728,9 @@ locationApp.get('/educational/region/:id', (req, res, next) => {
         .group('turma.ano_censo')
         .group('etapa_ensino.desc_etapa')
         .group('regiao.nome')
+        .group('etapa_ensino.pk_etapa_ensino_id')
         .order('regiao.nome')
-        .order('etapa_ensino.desc_etapa');
+        .order('etapa_ensino.pk_etapa_ensino_id');
 
     const queryLabels = [ "school", "school_per_location", "enrollment", "enrollment_per_adm_dep",
         "enrollment_per_school_level" ];
@@ -844,9 +846,10 @@ locationApp.get('/educational/state/:id', (req, res, next) => {
         .where(`turma.ano_censo IN (${schoolClassYearQry})`)
         .group('turma.ano_censo')
         .group('etapa_ensino.desc_etapa')
+        .group('etapa_ensino.pk_etapa_ensino_id')
         .group('estado.nome')
         .order('estado.nome')
-        .order('etapa_ensino.desc_etapa');
+        .order('etapa_ensino.pk_etapa_ensino_id');
 
     const queryLabels = [ "school", "school_per_location", "enrollment", "enrollment_per_adm_dep",
         "enrollment_per_school_level" ];
@@ -962,9 +965,10 @@ locationApp.get('/educational/city/:id', (req, res, next) => {
         .where(`turma.ano_censo IN (${schoolClassYearQry})`)
         .group('turma.ano_censo')
         .group('etapa_ensino.desc_etapa')
+        .group('etapa_ensino.pk_etapa_ensino_id')
         .group('municipio.nome')
         .order('municipio.nome')
-        .order('etapa_ensino.desc_etapa');
+        .order('etapa_ensino.pk_etapa_ensino_id');
 
     const queryLabels = [ "school", "school_per_location", "enrollment", "enrollment_per_adm_dep",
         "enrollment_per_school_level" ];
@@ -1003,9 +1007,10 @@ locationApp.get('/educational/school_level', (req, res, next) => {
         .where('turma.fk_etapa_ensino_id = etapa_ensino.pk_etapa_ensino_id')
         .where('turma.fk_tipo_turma_id <= 3')
         .group('etapa_ensino.desc_etapa')
+        .group('etapa_ensino.pk_etapa_ensino_id')
         .group('turma.serie_ano')
         .group('turma.ano_censo')
-        .order('etapa_ensino.desc_etapa')
+        .order('etapa_ensino.pk_etapa_ensino_id')
         .order('turma.serie_ano')
         .order('turma.ano_censo');
 
@@ -1074,10 +1079,11 @@ locationApp.get('/educational/school_level/region/:id', (req, res, next) => {
         .where('turma.fk_tipo_turma_id <= 3')
         .group('regiao.nome')
         .group('etapa_ensino.desc_etapa')
+        .group('etapa_ensino.pk_etapa_ensino_id')
         .group('turma.serie_ano')
         .group('turma.ano_censo')
         .order('regiao.nome')
-        .order('etapa_ensino.desc_etapa')
+        .order('etapa_ensino.pk_etapa_ensino_id')
         .order('turma.serie_ano')
         .order('turma.ano_censo');
 
@@ -1146,10 +1152,11 @@ locationApp.get('/educational/school_level/state/:id', (req, res, next) => {
         .where('turma.fk_tipo_turma_id <= 3')
         .group('estado.nome')
         .group('etapa_ensino.desc_etapa')
+        .group('etapa_ensino.pk_etapa_ensino_id')
         .group('turma.serie_ano')
         .group('turma.ano_censo')
         .order('estado.nome')
-        .order('etapa_ensino.desc_etapa')
+        .order('etapa_ensino.pk_etapa_ensino_id')
         .order('turma.serie_ano')
         .order('turma.ano_censo');
 
@@ -1218,10 +1225,11 @@ locationApp.get('/educational/school_level/city/:id', (req, res, next) => {
         .where('turma.fk_tipo_turma_id <= 3')
         .group('municipio.nome')
         .group('etapa_ensino.desc_etapa')
+        .group('etapa_ensino.pk_etapa_ensino_id')
         .group('turma.serie_ano')
         .group('turma.ano_censo')
         .order('municipio.nome')
-        .order('etapa_ensino.desc_etapa')
+        .order('etapa_ensino.pk_etapa_ensino_id')
         .order('turma.serie_ano')
         .order('turma.ano_censo');
 
-- 
GitLab