Skip to content

GitLab

Commit 229a7237 authored by carlvercosaa's avatar carlvercosaa
Browse files

Add coorientador ao campo funcao do integrante

parent 907cb7b8
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/EventoController.php
View file @ 229a7237
...@@ -73,10 +73,9 @@ class EventoController extends Controller ...@@ -73,10 +73,9 @@ class EventoController extends Controller
$coordenadors = CoordenadorComissao::with('user')->get(); $coordenadors = CoordenadorComissao::with('user')->get();
$naturezas = Natureza::orderBy('nome')->get(); $naturezas = Natureza::orderBy('nome')->get();
$yesterday = Carbon::yesterday('America/Recife'); $yesterday = Carbon::yesterday('America/Recife');
$ods = ObjetivoDeDesenvolvimentoSustentavel::with('metas')->get();
$yesterday = $yesterday->toDateString(); $yesterday = $yesterday->toDateString();
return view('evento.criarEvento', ['coordenadors' => $coordenadors, 'naturezas' => $naturezas, 'ontem' => $yesterday, 'ods' => $ods]); return view('evento.criarEvento', ['coordenadors' => $coordenadors, 'naturezas' => $naturezas, 'ontem' => $yesterday]);
} }
/** /**
......
database/seeders/FuncaoParticipanteSeeder.php
View file @ 229a7237
...@@ -39,6 +39,11 @@ class FuncaoParticipanteSeeder extends Seeder ...@@ -39,6 +39,11 @@ class FuncaoParticipanteSeeder extends Seeder
DB::table('funcao_participantes')->insert([ DB::table('funcao_participantes')->insert([
'nome'=>'Pesquisador', 'nome'=>'Pesquisador',
]);
DB::table('funcao_participantes')->insert([
'nome'=>'Coorientador',
]); ]);
} }
} }
resources/views/evento/criarEvento.blade.php
View file @ 229a7237
...@@ -5,25 +5,6 @@ ...@@ -5,25 +5,6 @@
<h1>Novo Edital</h1> <h1>Novo Edital</h1>
</div> </div>
<!-- Tabs -->
<div>
<ul class="nav nav-tabs">
<li class="nav-item" role="presentation">
<button class="nav-link active" id="edital-tab" data-bs-toggle="tab" data-bs-target="#edital-container" type="button" role="tab" aria-controls="edital-container" arial-selected="true"> Edital </button>
</li>
<li class="nav-item" role="presentation">
<button class="nav-link" id="ods-tab" data-bs-toggle="tab" data-bs-target="#ods-container" type="button" role="tab" aria-controls="ods-container" arial-selected="false"> ODS`S </button>
</li>
</ul>
</div>
<!-- Panels -->
<div id="tab-containers" class="tab-content">
<div id="edital-container" class="tab-pane fade show active" role="tabpanel" aria-labelledby="edital-tab">
<form action="{{route('evento.criar')}}" method="POST" enctype="multipart/form-data"> <form action="{{route('evento.criar')}}" method="POST" enctype="multipart/form-data">
@csrf @csrf
...@@ -568,41 +549,6 @@ ...@@ -568,41 +549,6 @@
</form> </form>
</div> </div>
<div id="ods-container" class="tab-pane fade" role="tabpanel" aria-labelledby="ods-tab">
<head>
<title>ODS Form</title>
</head>
<body>
<div class="row subtitulo">
<div class="col-sm-12">
<p>ODS</p>
</div>
</div>
<div class="container">
<div class="form-group">
@foreach($ods as $ods)
<div>
<input type="checkbox" name="ods[]" value="{{ $ods->id }}" class="form-check-input">
<label class="form-check-label" for="ods{{ $ods->id }}">{{ $ods->nome }}</label>
</div>
@endforeach
</div>
<div id="metas-container" class="row"></div>
</div>
<div>
<button type="submit" class="btn btn-primary botao-form" style="width:100%">
{{ __('Enviar') }}
</button>
</div>
</div>
</div>
</div> </div>
......
resources/views/evento/formulario/integrantes.blade.php
View file @ 229a7237
...@@ -54,16 +54,16 @@ ...@@ -54,16 +54,16 @@
@foreach($funcaoParticipantes as $funcao) @foreach($funcaoParticipantes as $funcao)
<!-- EXTENSÃO --> <!-- EXTENSÃO -->
@if($edital->natureza_id == 3 && $edital->tipo == "CONTINUO") @if($edital->natureza_id == 3 && $edital->tipo == "CONTINUO")
@if($funcao->nome == "Vice-coordenador" || $funcao->nome == "Colaborador") @if($funcao->nome == "Vice-coordenador" || $funcao->nome == "Colaborador" || $funcao->nome == "Coorientador")
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option> <option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@endif @endif
@elseif($edital->natureza_id == 3 && ($edital->tipo == "PIBEX" || $edital->tipo == "PIACEX")) @elseif($edital->natureza_id == 3 && ($edital->tipo == "PIBEX" || $edital->tipo == "PIACEX"))
@if($funcao->nome == "Vice-coordenador" || $funcao->nome == "Colaborador" || $funcao->nome == "Bolsista") @if($funcao->nome == "Vice-coordenador" || $funcao->nome == "Colaborador" || $funcao->nome == "Bolsista" || $funcao->nome == "Coorientador")
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option> <option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@endif @endif
<!-- PESQUISA --> <!-- PESQUISA -->
@else @else
@if($funcao->nome == "Bolsista" || $funcao->nome == "Voluntário") @if($funcao->nome == "Bolsista" || $funcao->nome == "Voluntário" || $funcao->nome == "Coorientador")
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option> <option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@endif @endif
@endif @endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment