diff --git a/resources/views/evento/formulario/integrantes.blade.php b/resources/views/evento/formulario/integrantes.blade.php index 27769461852ab9ea35cc7db795cea8120d07bc3e..b3b4bedf20aa19f1376fa7d19b1e206ebc61f2d3 100644 --- a/resources/views/evento/formulario/integrantes.blade.php +++ b/resources/views/evento/formulario/integrantes.blade.php @@ -34,12 +34,12 @@ -
+
-
+
diff --git a/resources/views/projeto/formularioVisualizar/integrantes.blade.php b/resources/views/projeto/formularioVisualizar/integrantes.blade.php index cef333f3bc76acdc72b4a54d4e42a48b5e359372..3434acc2ea716522273312cd816eb6d85422402b 100644 --- a/resources/views/projeto/formularioVisualizar/integrantes.blade.php +++ b/resources/views/projeto/formularioVisualizar/integrantes.blade.php @@ -16,6 +16,38 @@
Nome: {{ $trabalho_user->user->name }}
Função: {{ $trabalho_user->funcao->nome }}
+
+ Informações +
+
+ + @endforeach diff --git a/resources/views/proponente/projetos.blade.php b/resources/views/proponente/projetos.blade.php index 86509b804495f3be2c9911707428cd1673f5dc4c..cba938bc3848149e7f9a9c59a219a83241acbf5f 100755 --- a/resources/views/proponente/projetos.blade.php +++ b/resources/views/proponente/projetos.blade.php @@ -87,7 +87,11 @@ {{ date('d-m-Y \à\s H:i\h', strtotime($projeto->updated_at)) }} @if($projeto->status !=null) @if($projeto->status === "aprovado") - Em Execução + @if( strtotime($projeto->updated_at) <= strtotime($projeto->fimProjeto)) + Finalizado + @else + Em Execução + @endif @else {{$projeto->status}} @endif diff --git a/routes/web.php b/routes/web.php index b56dbd6daa385e66366b0ecfb93104bdd262be5a..78476d44ba51d59e09d302304deb92207bcdfb44 100755 --- a/routes/web.php +++ b/routes/web.php @@ -319,7 +319,7 @@ Route::prefix('cursos')->name('cursos.')->group(function (){ //############ Evento ############################################## Route::prefix('evento')->name('evento.')->group(function () { Route::get('/criar', 'EventoController@create')->name('criar')->middleware('checkRoles:coordenador,administrador'); - Route::post('/criar', 'EventoController@store')->name('criar')->middleware('checkAdministrador'); + Route::post('/criar', 'EventoController@store')->name('criar')->middleware('checkRoles:coordenador,administrador'); Route::get('/visualizar/{id}', 'EventoController@show')->name('visualizar')->middleware('auth'); Route::get('/listar', 'EventoController@listar')->name('listar')->middleware('auth'); Route::delete('/excluir/{id}', 'EventoController@destroy')->name('deletar')->middleware('checkRoles:coordenador,administrador');