Skip to content

GitLab

Unverified Commit 90579d2b authored by GuilhermeGz's avatar GuilhermeGz Committed by GitHub
Browse files

Merge branch 'lmtsufape:master' into master

parents 8fc141df fc66113f
Hide whitespace changes
Inline Side-by-side
resources/views/administrador/editar_user.blade.php
View file @ 90579d2b
...@@ -66,7 +66,8 @@ ...@@ -66,7 +66,8 @@
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<label for="tipo" class="col-form-label">{{ __('Tipo*') }}</label> <label for="tipo" class="col-form-label">{{ __('Tipo*') }}</label>
<select name="tipo" id="tipo" onchange="mudar()" class="form-control"> <input readonly id="tipo" type="text" name="tipo" value="{{$user->tipo}}" class="form-control" autofocus/>
<!-- <select disabled name="tipo" id="tipo" onchange="mudar()" class="form-control">
@if(auth()->user()->tipo == 'administrador') @if(auth()->user()->tipo == 'administrador')
<option @if($user->tipo =='administradorResponsavel' ) selected @endif value="administradorResponsavel">Administrador responsável</option> <option @if($user->tipo =='administradorResponsavel' ) selected @endif value="administradorResponsavel">Administrador responsável</option>
@endif @endif
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
<option @if($user->tipo =='avaliador' ) selected @endif value="avaliador">Avaliador</option> <option @if($user->tipo =='avaliador' ) selected @endif value="avaliador">Avaliador</option>
<option @if($user->tipo =='proponente' ) selected @endif value="proponente">Proponente</option> <option @if($user->tipo =='proponente' ) selected @endif value="proponente">Proponente</option>
<option @if($user->tipo =='participante' ) selected @endif value="participante">Discente</option> <option @if($user->tipo =='participante' ) selected @endif value="participante">Discente</option>
</select> </select> -->
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<label for="celular" class="col-form-label">{{ __('Celular*') }}</label> <label for="celular" class="col-form-label">{{ __('Celular*') }}</label>
......
resources/views/evento/formulario/participantes.blade.php
View file @ 90579d2b
...@@ -25,19 +25,21 @@ ...@@ -25,19 +25,21 @@
<img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt=""> <img src="{{asset('img/icons/usuario.svg')}}" style="width:60px" alt="">
</div> </div>
<div class="col-sm-10" style="display: flex; align-items: center;"> <div class="col-sm-10" style="display: flex; align-items: center;">
<div class="col-sm-12"> <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('marcado')[$i]))
@if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Discente {{$i+1}} @endif @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 @if(isset(old('nomePlanoTrabalho')[$i]))<br> Plano: {{old('nomePlanoTrabalho')[$i]}} @endif
@endif @endif
</a> <h6>
<a id="nomePlano{{$i+1}}"></a><br>
<a href="" style="" class="justify-content-center" data-toggle="modal" data-target="#exampleModal{{$i}}" id="nomePart{{$i+1}}">Informações</a>
</h6>
<div class="col-sm-5 pl-0" style="margin-top: 10px; text-align: left;"> <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> <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> </div>
</div> </div>
</div>
<div class="modal fade" id="exampleModal{{$i}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true"> <div class="modal fade" id="exampleModal{{$i}}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered modal-xl"> <div class="modal-dialog modal-dialog-centered modal-xl">
......
resources/views/evento/submeterTrabalho.blade.php
View file @ 90579d2b
...@@ -190,16 +190,18 @@ ...@@ -190,16 +190,18 @@
function marcar(id){ function marcar(id){
let nome = document.getElementById("nome"+id); let nome = document.getElementById("nome"+id);
let linkNome = document.getElementById("nomePart"+(id+1)); let linkNome = document.getElementById("nomePart"+(id+1));
let nomePlano = document.getElementById("nomePlano"+(id+1));
let linkTituloProj = document.getElementById("tituloProj"+(id+1)); let linkTituloProj = document.getElementById("tituloProj"+(id+1));
let planoTrabalho = document.getElementById("nomePlanoTrabalho"+id); let planoTrabalho = document.getElementById("nomePlanoTrabalho"+id);
if(nome.value != ""){ if(nome.value != ""){
if(planoTrabalho.value != ""){ if(planoTrabalho.value != ""){
linkNome.innerText = `Nome: ${nome.value} \n Plano: ${planoTrabalho.value}`; nomePlano.innerText = `Nome: ${nome.value} \n Plano: ${planoTrabalho.value}`;
}else { }else {
linkNome.innerText = `Nome: ${nome.value}`; nomePlano.innerText = `Nome: ${nome.value}`;
} }
}else{ }else{
linkNome.innerText = `Discente `+(id+1); nomePlano.innerText = `Discente `+(id+1);
} }
if(id >=1){ if(id >=1){
document.getElementById("cancelar"+(id-1)).setAttribute("disabled", true); document.getElementById("cancelar"+(id-1)).setAttribute("disabled", true);
......
resources/views/projeto/editaFormulario/participantes.blade.php
View file @ 90579d2b
...@@ -32,14 +32,15 @@ ...@@ -32,14 +32,15 @@
</div> </div>
<div class="col-sm-8" style="display: flex; align-items: center;"> <div class="col-sm-8" style="display: flex; align-items: center;">
<div class="col-sm-12"> <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($participante)
@if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Nome: {{$participante->user->name}} @endif @if(isset(old('name')[$i]))Nome: {{old('name')[$i]}} @else Nome: {{$participante->user->name}} @endif
@if(isset(old('nomePlanoTrabalho')[$i]))<br> Plano: {{old('nomePlanoTrabalho')[$i]}} @else <br>Plano: {{$participante->planoTrabalho->titulo ?? 'Não informado'}} @endif @if(isset(old('nomePlanoTrabalho')[$i]))<br> Plano: {{old('nomePlanoTrabalho')[$i]}} @else <br>Plano: {{$participante->planoTrabalho->titulo ?? 'Não informado'}} @endif
@else @else
Discente Discente
@endif @endif
</a> <h6>
<a href="" style="" class="justify-content-center" data-toggle="modal" data-target="#exampleModal{{$i}}" id="nomePart{{$i+1}}">Informações</a>
</h6>
<div class="col-sm-5 pl-0" style="margin-top: 10px; text-align: left;"> <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> <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>
......
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