From 91e2fa5c0898ea2205b2fc0cfd522ef08f1e152e Mon Sep 17 00:00:00 2001 From: Fabiana Ofugi + Rafael Ferreira Date: Wed, 26 Jun 2013 09:55:40 -0300 Subject: [PATCH] Obrigatoriedade retirada do campo turma no processo de enturmacao, e 'Enturmar depois' como opcao default --- ieducar/intranet/educar_matricula_cad.php | 5 +++-- ieducar/lib/Portabilis/View/Helper/DynamicInput/Turma.php | 2 +- ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ieducar/intranet/educar_matricula_cad.php b/ieducar/intranet/educar_matricula_cad.php index a3d99be..3900e25 100644 --- a/ieducar/intranet/educar_matricula_cad.php +++ b/ieducar/intranet/educar_matricula_cad.php @@ -158,9 +158,10 @@ class indice extends clsCadastro $anoLetivoHelperOptions = array('situacoes' => array('em_andamento', 'nao_iniciado')); - $this->inputsHelper()->dynamic(array('instituicao', 'escola', 'curso', 'serie', 'turma')); + $this->inputsHelper()->dynamic(array('instituicao', 'escola', 'curso', 'serie')); + $this->inputsHelper()->dynamic('turma', array('required' => false, 'option value' => 'Enturmar depois')); $this->inputsHelper()->dynamic('anoLetivo', array('label' => 'Ano destino'), $anoLetivoHelperOptions); - + if (is_numeric($this->ref_cod_curso)) { $obj_curso = new clsPmieducarCurso($this->ref_cod_curso); diff --git a/ieducar/lib/Portabilis/View/Helper/DynamicInput/Turma.php b/ieducar/lib/Portabilis/View/Helper/DynamicInput/Turma.php index bd4e34f..b087e12 100644 --- a/ieducar/lib/Portabilis/View/Helper/DynamicInput/Turma.php +++ b/ieducar/lib/Portabilis/View/Helper/DynamicInput/Turma.php @@ -80,7 +80,7 @@ class Portabilis_View_Helper_DynamicInput_Turma extends Portabilis_View_Helper_D } } - return $this->insertOption(null, "Selecione uma turma", $resources); + return $this->insertOption(null, "Enturmar depois", $resources); } protected function turmasPorAno($escolaId, $ano) { diff --git a/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js b/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js index bbacf7b..0efd3ef 100644 --- a/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js +++ b/ieducar/modules/DynamicInput/Assets/Javascripts/Turma.js @@ -11,7 +11,7 @@ var handleGetTurmas = function(response) { var selectOptions = jsonResourcesToSelectOptions(response['options']); - updateSelect($turmaField, selectOptions, "Selecione uma turma"); + updateSelect($turmaField, selectOptions, "Enturmar depois"); } var updateTurmas = function(){ -- libgit2 0.21.2