From 6258eb39960e5b1aec6b90e8ef8d782c74bee243 Mon Sep 17 00:00:00 2001
From: Caroline Salib <carolinesalibc@gmail.com>
Date: Fri, 30 Dec 2016 14:41:05 -0200
Subject: [PATCH] Ajustado campo de turma para respeitar o ano em andamento; portabilis/ieducar#164

---
 ieducar/intranet/educar_matricula_cad.php                    |  3 ++-
 ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php | 12 ++++++++++++
 ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js     |  6 ++++--
 ieducar/modules/DynamicInput/Views/TurmaController.php       | 12 ++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ieducar/intranet/educar_matricula_cad.php b/ieducar/intranet/educar_matricula_cad.php
index dbc5ced..c712716 100644
--- a/ieducar/intranet/educar_matricula_cad.php
+++ b/ieducar/intranet/educar_matricula_cad.php
@@ -175,7 +175,8 @@ class indice extends clsCadastro
     $this->inputsHelper()->dynamic('turma', array('required' => false, 'option value' => 'Selecione uma turma'));
     $this->inputsHelper()->dynamic('anoLetivo', array('label' => 'Ano destino'), $anoLetivoHelperOptions);
     $this->inputsHelper()->date('data_matricula', array('label' => 'Data da matrícula', 'placeholder' => 'dd/mm/yyyy', 'value' => date('d/m/Y') ));
-    
+
+    $this->inputsHelper()->hidden('ano_em_andamento', array('value' => '1'));
 
     if (is_numeric($this->ref_cod_curso)) {
       $obj_curso = new clsPmieducarCurso($this->ref_cod_curso);
diff --git a/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php b/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php
index dd29014..0acb360 100644
--- a/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php
+++ b/ieducar/intranet/include/pmieducar/clsPmieducarTurma.inc.php
@@ -2097,5 +2097,17 @@ and  e.cod_escola = t.ref_ref_cod_escola
 		return "";
 	}
 
+	function checaAnoLetivoEmAndamento()
+	{
+		if( is_numeric( $this->cod_turma ) )
+		{
+
+			$db = new clsBanco();
+			$db->Consulta( "SELECT 1 FROM {$this->_tabela} WHERE cod_turma = '{$this->cod_turma}' AND turma.ano = ( SELECT ano FROM pmieducar.escola_ano_letivo enl WHERE enl.ref_cod_escola = turma.ref_ref_cod_escola AND andamento = 1)" );
+			$db->ProximoRegistro();
+			return $db->Tupla();
+		}
+		return false;
+	}
 }
 ?>
diff --git a/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js b/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js
index c9baadf..c2f8e5b 100644
--- a/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js
+++ b/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js
@@ -9,7 +9,8 @@
     var $turmaField = getElementFor('turma');
     var $ano        = getElementFor('ano');
 
-    var $naoFiltrarAno        = getElementFor('nao_filtrar_ano') || null;
+    var $naoFiltrarAno = $j('#nao_filtrar_ano').length > 0 ? 1 : false;
+    var anoEmAndamento = $j('#ano_em_andamento').length > 0 ? 1 : false;
 
     var handleGetTurmas = function(response) {
       var selectOptions = jsonResourcesToSelectOptions(response['options']);
@@ -27,7 +28,8 @@
           escola_id      : $escolaField.val(),
           serie_id       : $serieField.val(),
           ano            : $naoFiltrarAno ? null : $ano.val(),
-          nao_filtrar_ano  :  $naoFiltrarAno ? 1 : null
+          nao_filtrar_ano  :  $naoFiltrarAno ? 1 : null,
+          ano_em_andamento :  anoEmAndamento ? 1 : null
         });
 
         var options = {
diff --git a/ieducar/modules/DynamicInput/Views/TurmaController.php b/ieducar/modules/DynamicInput/Views/TurmaController.php
index a2242af..baf3f5b 100644
--- a/ieducar/modules/DynamicInput/Views/TurmaController.php
+++ b/ieducar/modules/DynamicInput/Views/TurmaController.php
@@ -71,6 +71,7 @@ class TurmaController extends ApiCoreController
       $escolaId      = $this->getRequest()->escola_id;
       $serieId       = $this->getRequest()->serie_id;
       $ano           = $this->getRequest()->ano;
+      $anoEmAndamento = $this->getRequest()->ano_em_andamento;
 
       $isProfessor   = Portabilis_Business_Professor::isProfessor($instituicaoId, $userId);
 
@@ -99,6 +100,17 @@ class TurmaController extends ApiCoreController
         }
       }
 
+      if ($anoEmAndamento == 1) {
+        foreach ($turmas as $index => $t) {
+          $turma            = new clsPmieducarTurma();
+          $turma->cod_turma = $t['id'];
+          $turma            = $turma->checaAnoLetivoEmAndamento();
+
+          if (!$turma)
+            unset($turmas[$index]);
+        }
+      }
+
       $options = array();
       foreach ($turmas as $turma)
         $options['__' . $turma['id']] = $this->toUtf8($turma['nome']);
--
libgit2 0.21.2