Unverified Commit 5944dda3 authored by José Rômulo's avatar José Rômulo Committed by GitHub
Browse files

Merge pull request #162 from J-Romulo/master

Liberando acesso imediato pro avaliador, modificações na tela de perfil
parents ff092541 bb317a8c
...@@ -486,10 +486,12 @@ class AdministradorController extends Controller ...@@ -486,10 +486,12 @@ class AdministradorController extends Controller
$user = User::create([ $user = User::create([
'email' => $emailAvaliador, 'email' => $emailAvaliador,
'password' => bcrypt($passwordTemporario), 'password' => bcrypt($passwordTemporario),
'usuarioTemp' => true, 'usuarioTemp' => false,
'name' => $nomeAvaliador, 'name' => $nomeAvaliador,
'tipo' => 'avaliador', 'tipo' => 'avaliador',
]); ]);
$user->markEmailAsVerified();
} }
if($user->avaliadors == null){ if($user->avaliadors == null){
......
...@@ -118,7 +118,7 @@ class UserController extends Controller ...@@ -118,7 +118,7 @@ class UserController extends Controller
case "avaliador": case "avaliador":
$avaliador = Avaliador::where('user_id', '=', $id)->first(); $avaliador = Avaliador::where('user_id', '=', $id)->first();
$avaliador->user_id = $user->id; $avaliador->user_id = $user->id;
//$avaliador->area_id = $request->area; $avaliador->area_id = $request->area;
if($user->usuarioTemp == true){ if($user->usuarioTemp == true){
$user->usuarioTemp = false; $user->usuarioTemp = false;
} }
......
...@@ -103,6 +103,38 @@ ...@@ -103,6 +103,38 @@
@enderror @enderror
</div> </div>
</div> </div>
@if(Auth()->user()->tipo == 'avaliador')
<div class="col-md-6">
<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">
@if(Auth()->user()->avaliadors->area_id == null)
<option value="" selected>Indefinida</option>
@foreach (App\Area::all() as $area)
@if(Auth()->user()->avaliadors->area_id == $area->id)
<option value="{{ $area->id }}" selected>{{ $area->nome }}</option>
@else
<option value="{{ $area->id }}" >{{ $area->nome }}</option>
@endif
@endforeach
@else
@foreach (App\Area::all() as $area)
@if(Auth()->user()->avaliadors->area_id == $area->id)
<option value="{{ $area->id }}" selected>{{ $area->nome }}</option>
@else
<option value="{{ $area->id }}" >{{ $area->nome }}</option>
@endif
@endforeach
@endif
</select>
@error('area')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
@else
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group"> <div class="form-group">
<label for="cargo" class="col-form-label">{{ __('Cargo*') }}</label> <label for="cargo" class="col-form-label">{{ __('Cargo*') }}</label>
...@@ -304,6 +336,7 @@ ...@@ -304,6 +336,7 @@
</div> </div>
</div> </div>
</div> </div>
@endisset
<div class="col-md-12"> <div class="col-md-12">
<div class="d-flex justify-content-between align-items-center" style="margin-bottom:-0.3rem"> <div class="d-flex justify-content-between align-items-center" style="margin-bottom:-0.3rem">
<h5 class="card-title" style="font-size:20px; font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif; ">Acesso ao sistema</h5> <h5 class="card-title" style="font-size:20px; font-family:Arial, Helvetica, sans-serif; font-family:Arial, Helvetica, sans-serif; ">Acesso ao sistema</h5>
......
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