Skip to content

GitLab

Commit e5432668 authored by GuilhermeGz's avatar GuilhermeGz
Browse files

Merge branch 'master' of https://github.com/GuilhermeGz/submeta

parents c5ba1744 3e48f4d1
Show whitespace changes
Inline Side-by-side
app/Http/Controllers/ProponenteController.php
View file @ e5432668
......@@ -111,11 +111,15 @@ class ProponenteController extends Controller
}
public function projetosEdital($id) {
$edital = Evento::find($id);
if(Auth::user()->proponentes != null){
$projetos = Trabalho::where('evento_id', '=', $id)->where('proponente_id', Auth::user()->proponentes->id)->orderBy('titulo')->paginate(10);
$hoje = Carbon::today('America/Recife');
$hoje = $hoje->toDateString();
return view('proponente.projetosEdital')->with(['edital' => $edital, 'projetos' => $projetos, 'hoje'=>$hoje]);
}else{
return redirect()->route('inicial');
}
}
public function solicitarDesligamento(Request $request){
......
resources/views/administrador/analisarProposta.blade.php
View file @ e5432668
......@@ -156,14 +156,10 @@
</div>
<div class="col-sm-5">
<h5>{{$participante->user->name}}</h5>
<h9>
<h6>
<a href="" data-toggle="modal"
data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a>
</h9>
<br>
<a href="">
Remover
</a>
</h6>
</div>
<!-- Modal visualizar informações participante -->
......@@ -995,13 +991,13 @@
<input class="col-md-1" type="radio" id="aprovado" name="statusProp"
value="aprovado" required
@if($trabalho->status=="aprovado") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Recomendado</a>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Recomendada</a>
<br>
<input class="col-md-1" type="radio" id="reprovado" name="statusProp"
value="reprovado" required
@if($trabalho->status=="reprovado") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Não Recomendado</a>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Não Recomendada</a>
</div>
</div>
......@@ -1579,7 +1575,7 @@
document.getElementById("aprovado").onclick = function () {
var s = document.getElementById("comentario");
s.innerHTML = 'Proposta cumpriu todos os requisitos estabelecidos no edital';
s.innerHTML = 'Proposta cumpriu todos os requisitos estabelecidos no edital.';
};
document.getElementById("reprovado").onclick = function () {
var s = document.getElementById("comentario");
......
resources/views/evento/formulario/participantes.blade.php
View file @ e5432668
......@@ -20,17 +20,22 @@
<div id="participante" class="row">
@for($i = 0; $i < $edital->numParticipantes; $i++)
<div @if(!isset(old('marcado')[$i])) hidden @endif class="form-row mb-1 col-md-3" style="margin-top: 10px" id="part{{$i}}">
<div class="col-sm-4" style="display: flex; align-items: center;">
<div @if(!isset(old('marcado')[$i])) hidden @endif class="form-row mb-1 col-md-6" style="margin-top: 10px" id="part{{$i}}">
<div class="col-sm-2" style="display: flex; align-items: center;">
<img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt="">
</div>
<div class="col-sm-8" style="display: flex; align-items: center;">
<div class="col-sm-10" style="display: flex; align-items: center;">
<div class="col-sm-12">
<a href="" style="" class="justify-content-center" data-toggle="modal" data-target="#exampleModal{{$i}}" id="nomePart{{$i+1}}">
@if(isset(old('marcado')[$i]))
@if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Discente {{$i+1}} @endif
@if(isset(old('nomePlanoTrabalho')[$i]))<br> Plano: {{old('nomePlanoTrabalho')[$i]}} @endif
@endif
</a>
<div class="col-sm-5 pl-0" style="margin-top: 10px; text-align: left;">
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 12px" onclick="desmarcar({{$i}})" @if(isset(old('marcado')[$i+1])) disabled @endif>Excluir</button>
</div>
</div>
</div>
</div>
......@@ -359,8 +364,11 @@
@endcomponent
</div>
<div class="col-6">
{{-- <div class="col-6">
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 16px" onclick="desmarcar({{$i}})" @if(isset(old('marcado')[$i+1])) disabled @endif>Cancelar</button>
</div> --}}
<div class="col-6">
<button data-dismiss="modal" type="button" class="btn btn-secondary float-left" style="font-size: 16px">Sair</button>
</div>
<div class="col-6">
<button data-dismiss="modal" type="button" id="guardar{{$i}}" class="btn btn-success float-right" style="font-size: 16px" onclick="marcar({{$i}})">Salvar</button>
......
resources/views/projeto/editaFormulario/participantes.blade.php
View file @ e5432668
......@@ -26,11 +26,12 @@
@endphp
<div @if(!$participante) hidden @endif class="form-row mb-1 col-md-3" style="margin-top: 10px" id="part{{$i}}">
<div class="col-sm-4" style="display: flex; align-items: center;">
<div @if(!$participante) hidden @endif class="form-row mb-1 col-md-6" style="margin-top: 10px" id="part{{$i}}">
<div class="col-sm-2" style="display: flex; align-items: center;">
<img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt="">
</div>
<div class="col-sm-8" style="display: flex; align-items: center;">
<div class="col-sm-12">
<a href="" style="" class="justify-content-center" data-toggle="modal" data-target="#exampleModal{{$i}}" id="nomePart{{$i+1}}">
@if($participante)
@if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Nome: {{$participante->user->name}} @endif
......@@ -39,6 +40,11 @@
Discente
@endif
</a>
<div class="col-sm-5 pl-0" style="margin-top: 10px; text-align: left;">
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 12px" onclick="desmarcar({{$i}})" @if(isset(old('marcado')[$i+1])) disabled @endif>Excluir</button>
</div>
</div>
</div>
</div>
......@@ -353,7 +359,7 @@
@endcomponent
</div>
<div class="col-12" style="margin-bottom: 10px">
<label>Anexo (.pfd)<span style="color: red;font-weight: bold">* </span>
<label>Anexo (.pdf)<span style="color: red;font-weight: bold">* </span>
@if($participante !=null && $participante->planoTrabalho)
......@@ -377,8 +383,11 @@
@enderror
</div>
{{-- <div class="col-6">
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 16px" onclick="desmarcar({{$i}})" @if(isset(old('marcado')[$i+1])) disabled @endif>Excluir</button>
</div> --}}
<div class="col-6">
<button data-dismiss="modal" type="button" id="cancelar{{$i}}" class=" btn btn-danger" style="font-size: 16px" onclick="desmarcar({{$i}})" @if(isset(old('marcado')[$i+1])) disabled @endif>Cancelar</button>
<button data-dismiss="modal" type="button" class="btn btn-secondary float-left" style="font-size: 16px">Sair</button>
</div>
<div class="col-6">
<button data-dismiss="modal" type="button" id="guardar{{$i}}" class="btn btn-success float-right" style="font-size: 16px" onclick="marcar({{$i}})">Salvar</button>
......@@ -408,8 +417,8 @@
</div>
</div>
</div>
</div>
<script>
</div>
<script>
function limpa_formulário_cep(id) {
//Limpa valores do formulário de cep.
......@@ -482,5 +491,4 @@
}
};
</script>
</script>
resources/views/projeto/editaFormulario/proponente.blade.php
View file @ e5432668
......@@ -22,6 +22,7 @@
<div class="col-md-11">
<br>
<input class="form-control @error('linkLattesEstudante') is-invalid @enderror" type="text" name="linkLattesEstudante"
readonly="readonly"
@if(Auth()->user()->proponentes != null && Auth()->user()->proponentes->linkLattes != null)
value="{{ Auth()->user()->proponentes->linkLattes }}"
@else
......
resources/views/projeto/formularioVisualizar/participantes2.blade.php
View file @ e5432668
......@@ -22,6 +22,7 @@
</div>
<div class="col-sm-5">
<h5>{{$participante->user->name}}</h5>
<h5>{{$participante->planoTrabalho->titulo}}</h5>
<h9>
<a href="" data-toggle="modal" data-target="#modalVizuParticipante{{$participante->id}}" class="button">Informações</a>
</h9>
......@@ -53,4 +54,3 @@
</div>
<!--X Participantes X-->
resources/views/projeto/formularioVisualizar/resultado2.blade.php
View file @ e5432668
......@@ -16,12 +16,12 @@
<div class="col-md-3" style="margin-top: 15px">
<input class="col-md-1" type="radio" id="aprovado" name="statusProp" value="aprovado" required disabled
@if($projeto->status=="aprovado") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Recomendado</a>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Recomendada</a>
<br>
<input class="col-md-1" type="radio" id="reprovado" name="statusProp" value="reprovado" required disabled
@if($projeto->status=="reprovado") checked @endif>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Não Recomendado</a>
<a style="color: #234B8B; font-weight: bold;font-size: 18px;">Não Recomendada</a>
</div>
</div>
</div>
......
resources/views/proponente/projetos.blade.php
View file @ e5432668
......@@ -88,11 +88,12 @@
</a>
<div class="dropdown-menu">
@if($hoje <= $projeto->evento->inicioProjeto)
<a href="{{ route('trabalho.editar', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center;">
Editar
</a>
<hr class="dropdown-hr">
@endif
@if( $projeto->status== 'aprovado')
<a href="{{route('trabalho.trocaParticipante', ['evento_id' => $projeto->evento->id, 'projeto_id' => $projeto->id])}}" class="dropdown-item" style="text-align: center;">
......@@ -109,9 +110,11 @@
Documentos Complementares
</a>
<hr class="dropdown-hr">
@if($projeto->status != 'rascunho')
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar
</a>
@endif
<hr class="dropdown-hr">
<a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center">
......
resources/views/proponente/projetosEdital.blade.php
View file @ e5432668
......@@ -108,11 +108,14 @@
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
@if($hoje <= $edital->inicioProjeto)
<a href="{{ route('trabalho.editar', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center;">
Editar
</a>
<hr class="dropdown-hr">
@endif
@if( $projeto->status== 'aprovado')
<a href="{{route('trabalho.trocaParticipante', ['evento_id' => $projeto->evento->id, 'projeto_id' => $projeto->id])}}" class="dropdown-item" style="text-align: center;">
Solicitar Substituições
......@@ -130,10 +133,11 @@
</a>--}}
<hr class="dropdown-hr">
@if($projeto->status != 'rascunho')
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar
</a>
@endif
<hr class="dropdown-hr">
<a href="{{route('planos.listar', ['id' => $projeto->id])}}" class="dropdown-item" style="text-align: center">
......
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