Unverified Commit d0d91056 authored by Nathalia Santos's avatar Nathalia Santos Committed by GitHub
Browse files

Merge branch 'master' into master

parents 09428058 d6095b30
......@@ -34,4 +34,7 @@ class Avaliador extends Model
return $this->hasMany(ParecerInterno::class, 'avali_id', 'id');
}
public function naturezas(){
return $this->belongsToMany('App\Natureza', 'naturezas_avaliadors', 'avaliador_id');
}
}
......@@ -14,6 +14,7 @@ use App\Endereco;
use App\Trabalho;
use App\Coautor;
use App\Evento;
use App\Natureza;
use Carbon\Carbon;
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Hash;
......@@ -101,11 +102,15 @@ class UserController extends Controller
return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']);
}
}
if ($user->avaliadors != null && $request->area != null && $user->tipo == "avaliador") {
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$avaliador->user_id = $user->id;
//$avaliador->area_id = $request->area;
$avaliador->update();
if($user->avaliadors != null && $request->area != null && $user->tipo == "avaliador"){
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$avaliador->user_id = $user->id;
//$avaliador->area_id = $request->area;
$avaliador->naturezas()->sync($request->natureza);
$avaliador->update();
}
switch ($request->tipo) {
......@@ -208,15 +213,16 @@ class UserController extends Controller
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$proponente = Proponente::where('user_id', '=', $id)->first();
$participante = Participante::where('user_id', '=', $id)->first();
$naturezas = Natureza::orderBy('nome')->get();
$cursos = Curso::orderBy('nome')->get();
return view('user.perfilUser')->with([
'user' => $user,
'adminResp' => $adminResp,
'avaliador' => $avaliador,
'proponente' => $proponente,
'participante' => $participante,
'cursos' => $cursos
]);
return view('user.perfilUser')->with(['user' => $user,
'adminResp' => $adminResp,
'avaliador' => $avaliador,
'proponente' => $proponente,
'participante' => $participante,
'cursos' => $cursos,
'naturezas' => $naturezas]);
}
}
......@@ -9,4 +9,8 @@ class Natureza extends Model
public function projetos() {
return $this->hasMany('App\Evento');
}
public function avaliadors(){
return $this->belongsToMany('App\Avaliador', 'naturezas_avaliadors', 'natureza_id');
}
}
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateNaturezasAvaliadorsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('naturezas_avaliadors', function (Blueprint $table) {
$table->bigIncrements('id');
$table->timestamps();
$table->integer('natureza_id');
$table->foreign('natureza_id')->references('id')->on('naturezas');
$table->integer('avaliador_id');
$table->foreign('avaliador_id')->references('id')->on('avaliadors');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('naturezas_avaliadors');
}
}
......@@ -150,7 +150,19 @@
</span>
@enderror
</div>
@else
<div class="col-md-6">
<label for="area" class="col-form-label">{{ __('Natureza:') }}</label>
<br>
@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>
<label class="form-check-label" for="natureza{{$natureza->id}}">
{{ $natureza->nome }}
</label>
@endforeach
</div>
@else
<div class="col-md-6">
<div class="form-group">
<label for="cargo" class="col-form-label">{{ __('Cargo*') }}</label>
......
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