Skip to content

GitLab

Unverified Commit bf25780c authored by Nathalia Santos's avatar Nathalia Santos Committed by GitHub
Browse files

Merge pull request #759 from NetoSK9/master 

Issue #738 concluída. E Issue #746 concluída.
parents 6295b7c8 6d9bc51a
Show whitespace changes
Inline Side-by-side
resources/views/evento/formulario/integrantes.blade.php
View file @ bf25780c
...@@ -34,12 +34,12 @@ ...@@ -34,12 +34,12 @@
</button> </button>
</div> </div>
<div class="form-row" style="padding: 30px;"> <div class="form-row d-flex align-items-end" style="padding: 30px;">
<div class="col-md-8"> <div class="col-md-8">
<label for="cpf_consulta">CPF:</label> <label for="cpf_consulta">CPF:</label>
<input type="text" id="cpf_consulta" name="cpf_consulta" class="form-control" onkeyup="mask_cpf();"> <input type="text" id="cpf_consulta" name="cpf_consulta" class="form-control" onkeyup="mask_cpf();">
</div> </div>
<div class="col-md-4 mt-4"> <div class="col-md-4">
<button type="button" class="btn btn-primary" onclick="preencherUsuarioExistente()">Adicionar</button> <button type="button" class="btn btn-primary" onclick="preencherUsuarioExistente()">Adicionar</button>
</div> </div>
</div> </div>
......
resources/views/projeto/formularioVisualizar/integrantes.blade.php
View file @ bf25780c
...@@ -16,6 +16,38 @@ ...@@ -16,6 +16,38 @@
<div class="col-sm-5 mt-4"> <div class="col-sm-5 mt-4">
<h5 class="mb-0">Nome: {{ $trabalho_user->user->name }}</h5> <h5 class="mb-0">Nome: {{ $trabalho_user->user->name }}</h5>
<h5 class="mb-0">Função: {{ $trabalho_user->funcao->nome }}</h5> <h5 class="mb-0">Função: {{ $trabalho_user->funcao->nome }}</h5>
<h6>
<a href="" data-toggle="modal" data-target="#modalVizuIntegrante{{$trabalho_user->id}}" class="button">Informações</a>
</h6>
</div>
<div class="modal fade" id="modalVizuIntegrante{{$trabalho_user->id}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl">
<div class="modal-content">
<div class="modal-header" style="overflow-x:auto; padding-left: 31px">
<h5 class="modal-title" id="exampleModalLabel" style= "color:#1492E6">Informações Integrante</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close" style="padding-top: 8px; color:#1492E6">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body" style="padding-right: 32px;padding-left: 32px;padding-top: 20px;padding-bottom: 32px;">
<div class="container-fluid">
<div class="col-sm-5 mt-4">
<h5 class="mb-0">Nome: {{ $trabalho_user->user->name }}</h5>
<h5 class="mb-0">E-mail: {{ $trabalho_user->user->email }}</h5>
<h5 class="mb-0">Instituição: {{ $trabalho_user->user->instituicao }}</h5>
<h5 class="mb-0">Cargo no projeto: {{ $trabalho_user->funcao->nome }}</h5>
</div>
</div>
</div>
</div>
</div>
</div> </div>
@endforeach @endforeach
......
resources/views/proponente/projetos.blade.php
View file @ bf25780c
...@@ -87,7 +87,11 @@ ...@@ -87,7 +87,11 @@
<td style="text-align: center">{{ date('d-m-Y \à\s H:i\h', strtotime($projeto->updated_at)) }}</td> <td style="text-align: center">{{ date('d-m-Y \à\s H:i\h', strtotime($projeto->updated_at)) }}</td>
@if($projeto->status !=null) @if($projeto->status !=null)
@if($projeto->status === "aprovado") @if($projeto->status === "aprovado")
@if( strtotime($projeto->updated_at) <= strtotime($projeto->fimProjeto))
<td style="color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;">Finalizado</td>
@else
<td style="color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;">Em Execução</td> <td style="color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;">Em Execução</td>
@endif
@else @else
<td style="color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;">{{$projeto->status}}</td> <td style="color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;">{{$projeto->status}}</td>
@endif @endif
......
routes/web.php
View file @ bf25780c
...@@ -319,7 +319,7 @@ Route::prefix('cursos')->name('cursos.')->group(function (){ ...@@ -319,7 +319,7 @@ Route::prefix('cursos')->name('cursos.')->group(function (){
//############ Evento ############################################## //############ Evento ##############################################
Route::prefix('evento')->name('evento.')->group(function () { Route::prefix('evento')->name('evento.')->group(function () {
Route::get('/criar', 'EventoController@create')->name('criar')->middleware('checkRoles:coordenador,administrador'); 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('/visualizar/{id}', 'EventoController@show')->name('visualizar')->middleware('auth');
Route::get('/listar', 'EventoController@listar')->name('listar')->middleware('auth'); Route::get('/listar', 'EventoController@listar')->name('listar')->middleware('auth');
Route::delete('/excluir/{id}', 'EventoController@destroy')->name('deletar')->middleware('checkRoles:coordenador,administrador'); Route::delete('/excluir/{id}', 'EventoController@destroy')->name('deletar')->middleware('checkRoles:coordenador,administrador');
......
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