Commit 80cc8e144837ef61afe54df3837d5893f763dacd
1 parent
010c1f8c
Exists in
2.9
and in
9 other branches
Adicionado obrigatoriedade em campos do gestor escolar
Refs #3515
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
ieducar/intranet/educar_escola_cad.php
| @@ -773,8 +773,8 @@ class indice extends clsCadastro | @@ -773,8 +773,8 @@ class indice extends clsCadastro | ||
| 773 | $hiddenInputOptions = array('options' => array('value' => $this->gestor_id)); | 773 | $hiddenInputOptions = array('options' => array('value' => $this->gestor_id)); |
| 774 | $helperOptions = array('objectName' => 'gestor', 'hiddenInputOptions' => $hiddenInputOptions); | 774 | $helperOptions = array('objectName' => 'gestor', 'hiddenInputOptions' => $hiddenInputOptions); |
| 775 | $options = array('label' => 'Gestor escolar', | 775 | $options = array('label' => 'Gestor escolar', |
| 776 | - 'size' => 50, | ||
| 777 | - 'required' => false); | 776 | + 'required' => $obrigarCamposCenso, |
| 777 | + 'size' => 50); | ||
| 778 | $this->inputsHelper()->simpleSearchPessoa('nome', $options, $helperOptions); | 778 | $this->inputsHelper()->simpleSearchPessoa('nome', $options, $helperOptions); |
| 779 | 779 | ||
| 780 | $hiddenInputOptions = array('options' => array('value' => $this->secretario_id)); | 780 | $hiddenInputOptions = array('options' => array('value' => $this->secretario_id)); |
| @@ -786,7 +786,7 @@ class indice extends clsCadastro | @@ -786,7 +786,7 @@ class indice extends clsCadastro | ||
| 786 | 786 | ||
| 787 | $resources = array(1 => 'Diretor', | 787 | $resources = array(1 => 'Diretor', |
| 788 | 2 => 'Outro cargo'); | 788 | 2 => 'Outro cargo'); |
| 789 | - $options = array('label' => 'Cargo do gestor escolar', 'resources' => $resources, 'value' => $this->cargo_gestor, 'required' => false, 'size' => 50); | 789 | + $options = array('label' => 'Cargo do gestor escolar', 'resources' => $resources, 'value' => $this->cargo_gestor, 'required' => $obrigarCamposCenso, 'size' => 50); |
| 790 | $this->inputsHelper()->select('cargo_gestor', $options); | 790 | $this->inputsHelper()->select('cargo_gestor', $options); |
| 791 | 791 | ||
| 792 | $options = array('label' => 'E-mail do gestor escolar', 'value' => $this->email_gestor, 'required' => $obrigarCamposCenso, 'size' => 50); | 792 | $options = array('label' => 'E-mail do gestor escolar', 'value' => $this->email_gestor, 'required' => $obrigarCamposCenso, 'size' => 50); |
ieducar/modules/Cadastro/Assets/Javascripts/Escola.js
| @@ -297,7 +297,7 @@ $j(document).ready(function() { | @@ -297,7 +297,7 @@ $j(document).ready(function() { | ||
| 297 | return false; | 297 | return false; |
| 298 | }); | 298 | }); |
| 299 | 299 | ||
| 300 | - if($j('#dependencia_administrativa').val() == 4){ | 300 | + if($j('#dependencia_administrativa').val() == 4 && $j('#situacao_funcionamento').val() == '1'){ |
| 301 | $j('#categoria_escola_privada').closest('tr').show(); | 301 | $j('#categoria_escola_privada').closest('tr').show(); |
| 302 | $j('#conveniada_com_poder_publico').closest('tr').show(); | 302 | $j('#conveniada_com_poder_publico').closest('tr').show(); |
| 303 | $j('#mantenedora_escola_privada').closest('tr').show(); | 303 | $j('#mantenedora_escola_privada').closest('tr').show(); |