From c5bc6f5f61433d9ef75530efe9de14bbb6a8329b Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Mon, 10 Jul 2017 10:17:28 -0300
Subject: [PATCH] Fix surplus in teachers
Closes simcaq/SCRUM#293
---
src/libs/routes/teacher.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/routes/teacher.js b/src/libs/routes/teacher.js
index 12cd08c1..29fdb4db 100644
--- a/src/libs/routes/teacher.js
+++ b/src/libs/routes/teacher.js
@@ -309,7 +309,7 @@ teacherApp.get('/', rqf.parse(), rqf.build(), (req, res, next) => {
.field("'Brasil'", 'name')
.field('docente.ano_censo', 'year')
.from('docente')
- .join('turma', null, 'docente.turma_id=turma.id')
+ .join('turma', null, 'docente.turma_id=turma.id AND docente.ano_censo=turma.ano_censo')
.group('docente.ano_censo')
.order('docente.ano_censo')
.where('(docente.tipo_docente = 1 OR docente.tipo_docente = 5) AND (turma.tipo_turma_id <= 3)');
--
GitLab