From bc50ee056aa04353ce73625f8d0dac35c087d9df Mon Sep 17 00:00:00 2001
From: Pietro <ppc19@inf.ufpr.br>
Date: Wed, 4 May 2022 11:34:17 -0300
Subject: [PATCH] add turma turno id filter

---
 src/libs/routes/classCount.js     | 2 +-
 src/libs/routes/classroomCount.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/routes/classCount.js b/src/libs/routes/classCount.js
index 27132383..ffdbe34f 100644
--- a/src/libs/routes/classCount.js
+++ b/src/libs/routes/classCount.js
@@ -367,7 +367,7 @@ classCountApp.get('/count', rqf.parse(), (req, res, next) => {
    .from('turma')
    .group('turma.ano_censo')
    .order('turma.ano_censo')
-   .where('turma.local_turma = 0 AND turma.dependencia_adm_id <= 3 AND ((turma.etapa_resumida >= 1 AND turma.etapa_resumida <= 7) OR turma.etapa_resumida = 99)');
+   .where('turma.local_turma = 0 AND turma.dependencia_adm_id <= 3 AND ((turma.etapa_resumida >= 1 AND turma.etapa_resumida <= 7) OR turma.etapa_resumida = 99) AND turma.turma_turno_id <> 99')
    next();
 }, rqf.build(), query, addMissing(rqf), id2str.transform(), response('class_count'));
 
diff --git a/src/libs/routes/classroomCount.js b/src/libs/routes/classroomCount.js
index 601b0234..15a0f7ee 100644
--- a/src/libs/routes/classroomCount.js
+++ b/src/libs/routes/classroomCount.js
@@ -403,7 +403,7 @@ classroomCountApp.post('/', rqf.parse(), (req, res, next) => {
            .from('matricula')
            .group('matricula.ano_censo')
            .order('matricula.ano_censo')
-           .where('((matricula.tipo<=3 OR matricula.tipo IS NULL) AND (matricula.tipo_atendimento_turma IS NULL OR matricula.tipo_atendimento_turma <= 2))');
+           .where('((matricula.tipo<=3 OR matricula.tipo IS NULL) AND (matricula.tipo_atendimento_turma IS NULL OR matricula.tipo_atendimento_turma <= 2) AND matricula.turma_turno_id <> 99)');
     next();
 }, rqf.build() ,query, id2str.transform(), (req, res, next) => {
     // constrói objeto de tempo integral e calcula diagnósticos
-- 
GitLab