Merge branch 'master' into adicionar-campos-avaliacao

app/Http/Controllers/Auth/RegisterController.php

@@ -84,6 +84,7 @@ class RegisterController extends Controller
             'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'],
             'instituicaoSelect' => ['required_without:instituicao'],
             'perfil' => ['required'],
+            'curso' => ['required_if:perfil,Professor'],
             'vinculo' => ['required'],
             'outro' => ['required_if:vinculo,Outro'],
             'titulacaoMaxima' => ['required_with:anoTitulacao,areaFormacao,bolsistaProdutividade'],

resources/views/coordenadorComissao/editais.blade.php

@@ -5,12 +5,20 @@
 <div class="container" style="margin-top: 100px;">
 
   <div class="container" >
-    <div class="row" >
-      <div class="col-sm-10">
-        <h3>Meus Editais</h3> 
+
+    <div class="row p-b-5" >
+
+      <div class="col-sm-4" style="float: start;">
+        <h3 class="title-table">Meus Editais</h3> 
+      </div>
+      <div class="col-sm-8 align-text-top aling-end ">
+          <a href="{{route('evento.criar')}}" class="btn btn-info" style="float: right;">Criar Edital</a>
       </div>
+
     </div>
+
   </div>
+
   <hr>
   @if(session('mensagem'))
     <div class="row">

resources/views/naturezas/grandeArea/collapse-grande-area.blade.php

@@ -157,7 +157,7 @@
     <div class="card">
         <div class="row">
             <div class="col-11  ">
-                <h2 class="m-2">ODS(Objetivos de Desenvolvimento Sustentável)</h2>
+                <h2 class="m-2">ODS(Objetivo de Desenvolvimento Sustentável)</h2>
             </div>
             <div class="col-1 text-center">
                 <a href="{{route('objetivoDeDenvolvimentoSustentavel.criar')}}" >

routes/web.php

@@ -318,7 +318,7 @@ Route::prefix('cursos')->name('cursos.')->group(function (){
 
 //############ Evento ##############################################
 Route::prefix('evento')->name('evento.')->group(function () {
-    Route::get('/criar', 'EventoController@create')->name('criar')->middleware('checkAdministrador');
+    Route::get('/criar', 'EventoController@create')->name('criar')->middleware('checkRoles:coordenador,administrador');
     Route::post('/criar', 'EventoController@store')->name('criar')->middleware('checkAdministrador');
     Route::get('/visualizar/{id}', 'EventoController@show')->name('visualizar')->middleware('auth');
     Route::get('/listar', 'EventoController@listar')->name('listar')->middleware('auth');