Download as
Browse Code »

Commit fbf4f59ad94f9a23adfaad26c57b66d1e1e1554d

Authored by Everton Muniz
1 parent 28e7b8f7
Exists in 2.8 and in 6 other branches 2.2, 2.3, 2.4, 2.5, 2.6, 2.7

Não exibe dados de campo curso e serie para usuário de nível escolar

Showing 3 changed files with 11 additions and 7 deletions   Show diff stats
app/Http/Controllers/UpdateRegistrationStatusController.php
  Diff comments   View file @fbf4f59
... ... @@ -26,7 +26,7 @@ class UpdateRegistrationStatusController extends Controller
26 26  
27 27 $this->menu(Process::UPDATE_REGISTRATION_STATUS);
28 28  
29   - return view('registration.update-registration-status.index');
  29 + return view('registration.update-registration-status.index', ['user' => $request->user()]);
30 30 }
31 31  
32 32 /**
... ...
resources/views/form/select-school-class.blade.php
  Diff comments   View file @fbf4f59
1 1 <span class="form">
2 2 <select class="geral" name="ref_cod_turma" id="ref_cod_turma" style="width: 308px;">
3   - <option value="">Selecione uma serie</option>
  3 + <option value="">Selecione uma turma</option>
4 4 @if(old('ref_cod_escola', Request::get('ref_cod_escola')) && old('ref_cod_serie', Request::get('ref_cod_serie')) && old('ano', Request::get('ano')))
5 5 @foreach(App_Model_IedFinder::getTurmas(old('ref_cod_escola', Request::get('ref_cod_escola')), old('ref_cod_serie', Request::get('ref_cod_serie')), old('ano', Request::get('ano')), true) as $id => $name)
6 6 <option value="{{$id}}">{{$name}}</option>
... ...
resources/views/registration/update-registration-status/index.blade.php
  Diff comments   View file @fbf4f59
... ... @@ -43,9 +43,11 @@
43 43 <span class="form">
44 44 <select class="geral" name="ref_cod_curso" id="ref_cod_curso" style="width: 308px;">
45 45 <option value="">Selecione um curso</option>
  46 + @if (old('ref_cod_escola', Request::get('ref_cod_escola')) || ($user->isAdmin() || $user->isInstitutional()))
46 47 @foreach(App_Model_IedFinder::getCursos(old('ref_cod_escola', Request::get('ref_cod_escola'))) as $id => $name)
47   - <option value="{{$id}}">{{$name}}</option>
48   - @endforeach
  48 + <option value="{{$id}}">{{$name}}</option>
  49 + @endforeach
  50 + @endif
49 51 </select>
50 52 </span>
51 53  
... ... @@ -68,10 +70,12 @@
68 70 <td class="formmdtd" valign="top">
69 71 <span class="form">
70 72 <select class="geral" name="ref_cod_serie" id="ref_cod_serie" style="width: 308px;">
71   - <option value="">Selecione um curso</option>
  73 + <option value="">Selecione uma serie</option>
  74 + @if (old('ref_cod_curso', Request::get('ref_cod_curso')) || ($user->isAdmin() || $user->isInstitutional()))
72 75 @foreach(App_Model_IedFinder::getSeries(null, old('ref_cod_escola', Request::get('ref_cod_escola')), old('ref_cod_curso', Request::get('ref_cod_curso'))) as $id => $name)
73   - <option value="{{$id}}">{{$name}}</option>
74   - @endforeach
  76 + <option value="{{$id}}">{{$name}}</option>
  77 + @endforeach
  78 + @endif
75 79 </select>
76 80 </span>
77 81  
... ...