Skip to content

GitLab

"app/git@sites.upe.br:walter.felipe/pad-upe.git" did not exist on "9e3565887c4681781b1506d6ec69c815416bda96"
Unverified Commit 21759afa authored by GuilhermeGz's avatar GuilhermeGz Committed by GitHub
Browse files

Merge pull request #483 from GuilhermeGz/master 

Adicionadas janelas de confirmação para remoções no sistema e ajustada passagem de valores para tela de substituição do participante
parents def92e48 2dd01509
Show whitespace changes
Inline Side-by-side
resources/views/administrador/analisarProposta.blade.php
View file @ 21759afa
......@@ -916,8 +916,7 @@
href="{{ route('admin.visualizarParecerInterno', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id]) }}">Avaliado</a> @endif
</h9>
<br>
<a onclick="return confirm('Tem certeza que deseja remover o avaliador {{$avaliador->user->name}}?')"
href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id,'flag'=>1]) }}" >
<a href="" data-toggle="modal" data-target="#removerInterno{{ $avaliador->id }}" >
Remover
</a>
<br>
......@@ -926,6 +925,26 @@
</a>
</div>
@endif
<!-- Modal Remover -->
<div class="modal fade" id="removerInterno{{ $avaliador->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Remover Avaliador Interno</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja remover o avaliador: {{ $avaliador->user->name }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<a type="button" class="btn btn-danger" href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id,'flag'=>1]) }}">Remover</a>
</div>
</div>
</div>
</div>
@endforeach
</div>
<br>
......@@ -949,8 +968,7 @@
</h9>
<br>
<a onclick="return confirm('Tem certeza que deseja remover o avaliador {{$avaliador->user->name}}?')"
href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id,'flag'=>0]) }}" >
<a href="" data-toggle="modal" data-target="#removerAdHoc{{ $avaliador->id }}">
Remover
</a>
<br>
......@@ -959,6 +977,27 @@
</a>
</div>
@endif
<!-- Modal Remover -->
<div class="modal fade" id="removerAdHoc{{ $avaliador->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Remover Avaliador Ad Hoc</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja remover o avaliador: {{ $avaliador->user->name }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<a type="button" class="btn btn-danger" href="{{ route('admin.removerProjAval', ['trabalho_id' => $trabalho->id, 'avaliador_id' => $avaliador->id,'flag'=>0]) }}">Remover</a>
</div>
</div>
</div>
</div>
@endforeach
</div>
</div>
......
resources/views/administrador/selecionarAvaliadores.blade.php
View file @ 21759afa
......@@ -154,9 +154,31 @@
@csrf
<input type="hidden" name="avaliador_id" value="{{ $avaliador->id }}" >
<input type="hidden" name="evento_id" value="{{ $evento->id }}" >
<button type="submit" class="btn btn-danger" @if($avaliador->trabalhos->where('evento_id', $evento->id)->count() != 0) disabled="disabled" @endif
onclick="return confirm('Tem certeza que deseja remover o avaliador {{$avaliador->user->name}}?')"
<button type="button" class="btn btn-danger" @if($avaliador->trabalhos->where('evento_id', $evento->id)->count() != 0) disabled="disabled" @endif
data-toggle="modal" data-target="#modal{{ $avaliador->id }}"
>Remover</button>
<!-- Modal Remover -->
<div class="modal fade" id="modal{{ $avaliador->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Remover Avaliador</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja remover o avaliador: {{ $avaliador->user->name }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<button type="submit" class="btn btn-danger">Remover</button>
</div>
</div>
</div>
</div>
</form>
<form action="{{ route('admin.reenviarConvite') }}" method="POST">
@csrf
......
resources/views/administrador/substituirParticipante.blade.php
View file @ 21759afa
......@@ -163,7 +163,7 @@
</div>
<div class="modal-body" style="padding-right: 32px;padding-left: 32px;padding-top: 20px;padding-bottom: 32px;">
@include('administrador.substituirParticipanteForm', ['visualizarOnly' => 1])
@include('administrador.substituirParticipanteForm', ['visualizarOnly' => 1, 'trabalho' => $projeto])
</div>
</div>
</div>
......
resources/views/naturezas/area/detalhes.blade.php
View file @ 21759afa
......@@ -51,18 +51,38 @@
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('subarea.deletar', ['id' => $subArea->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<button data-toggle="modal" data-target="#removerSubarea{{ $subArea->id }}" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
</form>
</div>
</div>
</td>
</tr>
<!-- Modal Remover -->
<div class="modal fade" id="removerSubarea{{ $subArea->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Remover Subárea</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja remover a Subárea: {{ $subArea->nome }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<form method="POST" action="{{ route('subarea.deletar', ['id' => $subArea->id]) }}">
@csrf
<button type="submit" class="btn btn-danger">Remover</button>
</form>
</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
......
resources/views/naturezas/grandeArea/collapse-grande-area.blade.php
View file @ 21759afa
......@@ -37,25 +37,45 @@
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('grandearea.deletar', ['id' => $grandeArea->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<button data-toggle="modal" data-target="#removerGrandeArea{{ $grandeArea->id }}" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
</form>
</div>
</div>
</div>
</div>
</h5>
<div id="collapse{{ $grandeArea->id }}" class="collapse ml-3" aria-labelledby="headingOne" data-parent="#accordion1">
@include('naturezas.grandeArea.collapse-area')
</div>
</div>
<!-- Modal Remover -->
<div class="modal fade" id="removerGrandeArea{{ $grandeArea->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Remover Grande Área</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja remover a Grande Área: {{ $grandeArea->nome }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<form method="POST" action="{{ route('grandearea.deletar', ['id' => $grandeArea->id]) }}">
@csrf
<button type="submit" class="btn btn-danger">Remover</button>
</form>
</div>
</div>
</div>
</div>
@endforeach
</div>
......@@ -93,20 +113,39 @@
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('areaTematica.deletar', ['id' => $areasTematica->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<button data-toggle="modal" data-target="#removerAreaTematica{{ $areasTematica->id }}" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
</form>
</div>
</div>
</div>
</div>
</h5>
</div>
<!-- Modal Remover -->
<div class="modal fade" id="removerAreaTematica{{ $areasTematica->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Remover Área Temática</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja remover a Área Temática: {{ $areasTematica->nome }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<form method="POST" action="{{ route('areaTematica.deletar', ['id' => $areasTematica->id]) }}">
@csrf
<button type="submit" class="btn btn-danger">Remover</button>
</form>
</div>
</div>
</div>
</div>
@endforeach
</div>
\ No newline at end of file
resources/views/naturezas/grandeArea/detalhes.blade.php
View file @ 21759afa
......@@ -55,18 +55,38 @@
Editar
</a>
<hr class="dropdown-hr">
<form method="POST" action="{{ route('area.deletar', ['id' => $area->id]) }}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item dropdown-item-delete text-center">
<button data-toggle="modal" data-target="#removerArea{{ $area->id }}" class="dropdown-item dropdown-item-delete text-center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt="">
Deletar
</button>
</form>
</div>
</div>
</td>
</tr>
<!-- Modal Remover -->
<div class="modal fade" id="removerArea{{ $area->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Remover Área</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja remover a Área: {{ $area->nome }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<form method="POST" action="{{ route('area.deletar', ['id' => $area->id]) }}" >
@csrf
<button type="submit" class="btn btn-danger">Remover</button>
</form>
</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
......
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