Skip to content

GitLab

Commit 76cac09f authored by unknown's avatar unknown
Browse files

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

parents 9450a10f 9639b315
Expand all Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/Auth/RegisterController.php
View file @ 76cac09f
...@@ -137,7 +137,9 @@ class RegisterController extends Controller ...@@ -137,7 +137,9 @@ class RegisterController extends Controller
$proponente->linkLattes = $data['linkLattes']; $proponente->linkLattes = $data['linkLattes'];
$user->proponentes()->save($proponente); $user->proponentes()->save($proponente);
$proponente->cursos()->sync($data['curso']); if($proponente->titulacaoMaxima == 'Técnico'){
$proponente->cursos()->sync($data['curso']);
}
} }
return $user; return $user;
......
resources/views/administrador/atribuirAvaliadores.blade.php
View file @ 76cac09f
...@@ -39,29 +39,39 @@ ...@@ -39,29 +39,39 @@
</div> </div>
<div class="col-sm-3 d-flex justify-content-center"> <div class="col-sm-3 d-flex justify-content-center">
<a href="{{ route('admin.projetos', ['evento_id' => $evento->id]) }}" style="text-decoration:none; color: inherit;"> <a @if(count($evento->trabalhos) > 0) href="{{ route('admin.projetos', ['evento_id' => $evento->id]) }}" @else href="#" @endif style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu"> <div class="card text-center card-menu">
<div class="card-body d-flex justify-content-center"> <div class="card-body d-flex justify-content-center">
<div class="container"> @if(count($evento->trabalhos) == 0)
<div class="row titulo-card-menu"> <h2 style="padding-top:15px">EDITAL NÃO POSSUI PROJETOs</h2>
<div class="col-md-12">
<h2 style="padding-top:15px">Selecionar projetos</h2> @else
<div class="container">
<div class="row titulo-card-menu">
<div class="col-md-12">
<h2 style="padding-top:15px">Selecionar projetos</h2>
</div>
</div> </div>
</div> @php
@php $projetos = \App\Trabalho::count();
$projetos = \App\Trabalho::count(); @endphp
@endphp <div class="row">
<div class="row"> <div class="col-md-12">
<div class="col-md-12"> <h5>Nº total de projetos:</h5>
<h5>Nº total de projetos:</h5> </div>
</div> </div>
</div> <div class="row">
<div class="row"> <div class="col-md-12">
<div class="col-md-12"> <h1 class="quant-titulo-card">{{$projetos}}</h1>
<h1 class="quant-titulo-card">{{$projetos}}</h1> </div>
</div> </div>
</div> </div>
</div> @endif
</div> </div>
</div> </div>
</a> </a>
......
resources/views/auth/register.blade.php
View file @ 76cac09f
This diff is collapsed.
resources/views/evento/editarEvento.blade.php
View file @ 76cac09f
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
<label for="numParticipantes" class="col-form-label">{{ __('Nº de Discentes:') }}<span style="color: red; font-weight: bold;">*</span></label> <label for="numParticipantes" class="col-form-label">{{ __('Nº de Discentes:') }}<span style="color: red; font-weight: bold;">*</span></label>
<input id="numParticipantes" type="number" min="1" max="20" class="form-control @error('numParticipantes') is-invalid @enderror" name="numParticipantes" value="{{ $evento->numParticipantes }}" required autocomplete="numParticipantes" autofocus> <input id="numParticipantes" type="number" min="1" class="form-control @error('numParticipantes') is-invalid @enderror" name="numParticipantes" value="{{ $evento->numParticipantes }}" required autocomplete="numParticipantes" autofocus>
@error('numParticipantes') @error('numParticipantes')
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
......
resources/views/evento/formulario/proponente.blade.php
View file @ 76cac09f
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<div class="col-md-10"> <div class="col-md-10">
<br> <br>
<textarea class="form-control @error('conflitosInteresse') is-invalid @enderror" autocomplete="conflitosInteresse" <textarea class="form-control @error('conflitosInteresse') is-invalid @enderror" autocomplete="conflitosInteresse"
autofocus id="conflitosInteresse" name="conflitosInteresse" rows="4">{{ old('conflitosInteresse') }}</textarea> id="conflitosInteresse" name="conflitosInteresse" rows="4">{{ old('conflitosInteresse') }}</textarea>
@error('conflitosInteresse') @error('conflitosInteresse')
<span class="invalid-feedback" role="alert"> <span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong> <strong>{{ $message }}</strong>
......
resources/views/user/perfilUser.blade.php
View file @ 76cac09f
...@@ -92,14 +92,15 @@ ...@@ -92,14 +92,15 @@
@enderror @enderror
</div> </div>
</div> </div>
@if (Auth()->user()->tipo == 'proponente') @if(isset($proponente) && $proponente->titulacaoMaxima != 'Técnico')
<div class="col-md-12 mb-2"> <div class="col-md-12 mb-2">
<label for="curso" class="col-form-label">{{ __('Cursos*:') }}</label> <label for="curso" class="col-form-label">{{ __('Cursos em que leciona*:') }}</label>
<br> <br>
<div class="row col-md-12"> <div class="row col-md-12">
@foreach($cursos as $curso) @foreach($cursos as $curso)
<div class="col-sm-6"> <div class="col-sm-6">
<input type="checkbox" name="curso[]" id="curso{{$curso->id}}" value="{{$curso->id}}" @if((empty(old('curso')) && $proponente->cursos->contains($curso->id)) || (!empty(old('curso')) && in_array($curso->id, old('curso')))) checked @endif> <input type="checkbox" name="curso[]" id="curso{{$curso->id}}" value="{{$curso->id}}" @if((empty(old('curso')) && $proponente->cursos->contains($curso->id)) || (!empty(old('curso')) && in_array($curso->id, old('curso')))) checked
@endif>
<label class="form-check-label" for="curso{{$curso->id}}"> <label class="form-check-label" for="curso{{$curso->id}}">
{{ $curso->nome }} {{ $curso->nome }}
</label> </label>
...@@ -124,22 +125,22 @@ ...@@ -124,22 +125,22 @@
<label for="area" class="col-form-label">{{ __('Área:') }}</label> <label for="area" class="col-form-label">{{ __('Área:') }}</label>
<select style="display: inline" class="form-control @error('area') is-invalid @enderror" name="area" id="area"> <select style="display: inline" class="form-control @error('area') is-invalid @enderror" name="area" id="area">
@if(Auth()->user()->avaliadors->area_id == null) @if(Auth()->user()->avaliadors->area_id == null)
<option value="" selected>Indefinida</option> <option value="" selected>Indefinida</option>
@foreach (App\Area::all() as $area) @foreach (App\Area::all() as $area)
@if(Auth()->user()->avaliadors->area_id == $area->id) @if(Auth()->user()->avaliadors->area_id == $area->id)
<option value="{{ $area->id }}" selected>{{ $area->nome }}</option> <option value="{{ $area->id }}" selected>{{ $area->nome }}</option>
@else
<option value="{{ $area->id }}">{{ $area->nome }}</option>
@endif
@endforeach
@else @else
@foreach (App\Area::all() as $area) <option value="{{ $area->id }}">{{ $area->nome }}</option>
@if(Auth()->user()->avaliadors->area_id == $area->id) @endif
<option value="{{ $area->id }}" selected>{{ $area->nome }}</option> @endforeach
@else @else
<option value="{{ $area->id }}">{{ $area->nome }}</option> @foreach (App\Area::all() as $area)
@endif @if(Auth()->user()->avaliadors->area_id == $area->id)
@endforeach <option value="{{ $area->id }}" selected>{{ $area->nome }}</option>
@else
<option value="{{ $area->id }}">{{ $area->nome }}</option>
@endif
@endforeach
@endif @endif
</select> </select>
...@@ -155,13 +156,13 @@ ...@@ -155,13 +156,13 @@
<label for="area" class="col-form-label">{{ __('Natureza:') }}</label> <label for="area" class="col-form-label">{{ __('Natureza:') }}</label>
<br> <br>
@foreach($naturezas as $natureza) @foreach($naturezas as $natureza)
<input type="checkbox" name="natureza[]" id="natureza{{$natureza->id}}" value="{{$natureza->id}}" @if((empty(old('natureza')) && $avaliador->naturezas->contains($natureza->id)) || (!empty(old('natureza')) && in_array($natureza->id, old('natureza')))) checked @endif> <input type="checkbox" name="natureza[]" id="natureza{{$natureza->id}}" value="{{$natureza->id}}" @if((empty(old('natureza')) && $avaliador->naturezas->contains($natureza->id)) || (!empty(old('natureza')) && in_array($natureza->id, old('natureza')))) checked @endif>
<label class="form-check-label" for="natureza{{$natureza->id}}"> <label class="form-check-label" for="natureza{{$natureza->id}}">
{{ $natureza->nome }} {{ $natureza->nome }}
</label> </label>
@endforeach @endforeach
</div> </div>
@else @else
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
...@@ -233,7 +234,7 @@ ...@@ -233,7 +234,7 @@
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="titulacaoMaxima" class="col-form-label">{{ __('Titulação Máxima*') }}</label> <label for="titulacaoMaxima" class="col-form-label">{{ __('Titulação Máxima*') }}</label>
<select id="titulacaoMaxima" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" value="{{ old('titulacaoMaxima') }}" autocomplete="nome"> <select id="titulacaoMaxima" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" value="{{ old('titulacaoMaxima') }}" autocomplete="nome" , onchange="curso()">
<option value="" disabled selected hidden>-- Titulação --</option> <option value="" disabled selected hidden>-- Titulação --</option>
@isset($proponente) @isset($proponente)
<option @if( $proponente->titulacaoMaxima =='Doutorado' ) selected @endif value="Doutorado">Doutorado</option> <option @if( $proponente->titulacaoMaxima =='Doutorado' ) selected @endif value="Doutorado">Doutorado</option>
......
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