From 99a9b2bb3f3220e1ca971af267b396ebfcc4ec2f Mon Sep 17 00:00:00 2001 From: Gabriel-31415 Date: Mon, 25 May 2020 16:09:23 +0000 Subject: [PATCH] =?UTF-8?q?novas=20atualiza=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Avaliador.php | 12 + app/CoordenadorComissao.php | 17 ++ app/Evento.php | 4 + .../Controllers/AdministradorController.php | 10 +- .../Controllers/Auth/RegisterController.php | 6 + .../CoordenadorComissaoController.php | 54 +++++ app/Http/Controllers/EventoController.php | 44 ++-- app/Http/Controllers/HomeController.php | 13 +- app/Http/Controllers/TrabalhoController.php | 220 ++++++++++++------ app/Http/Controllers/UserController.php | 18 +- app/Http/Kernel.php | 2 + app/Http/Middleware/checkAdministrador.php | 6 +- app/Participante.php | 17 ++ app/Proponente.php | 3 + app/Trabalho.php | 26 ++- app/User.php | 9 + .../2014_10_12_000000_create_users_table.php | 7 +- ...20_02_05_123048_create_trabalhos_table.php | 35 ++- .../2020_02_06_132418_chaves_estrangeiras.php | 30 +-- ..._05_20_211421_create_proponentes_table.php | 4 +- ...825_add_trabalhos_to_proponentes_table.php | 2 +- ...649_create_coordenador_comissaos_table.php | 31 +++ ...d_users_to_coordenador_comissaos_table.php | 34 +++ ...0_05_23_054805_create_avaliadors_table.php | 31 +++ ...3_054859_add_users_to_avaliadors_table.php | 34 +++ ...5_23_054945_create_participantes_table.php | 31 +++ ...55033_add_users_to_participantes_table.php | 36 +++ ..._071949_add_foreign_to_trabalhos_table.php | 45 ++++ ...0_create_trabalhos_participantes_table.php | 34 +++ ...551_create_trabalhos_proponentes_table.php | 34 +++ database/seeds/CoordenadorComissaoSeeder.php | 26 +++ database/seeds/DatabaseSeeder.php | 68 +----- database/seeds/ProponenteSeeder.php | 16 +- database/seeds/UsuarioSeeder.php | 18 ++ resources/views/administrador/index.blade.php | 6 +- .../views/administrador/usuarios.blade.php | 64 +++++ .../administradorResponsavel/index.blade.php | 2 +- resources/views/auth/register.blade.php | 2 +- resources/views/coordenador/home.blade.php | 56 +---- .../coordenadorComissao/editais.blade.php | 70 ++++++ .../views/coordenadorComissao/index.blade.php | 37 +++ .../listarUsuarios.blade.php | 41 ++++ .../coordenadorComissao/usuarios.blade.php | 55 +++++ resources/views/evento/criarEvento.blade.php | 15 +- resources/views/evento/listarEvento.blade.php | 15 +- .../views/evento/submeterTrabalho.blade.php | 219 +++++++++-------- .../views/evento/visualizarEvento.blade.php | 8 +- resources/views/layouts/app.blade.php | 145 ++++++++++-- resources/views/layouts/teste.blade.php | 105 --------- .../views/naturezas/area/index.blade.php | 67 ++++++ .../naturezas/grandeArea/index.blade.php | 9 + resources/views/naturezas/index.blade.php | 44 ++++ .../views/naturezas/subArea/index.blade.php | 9 + resources/views/participante/index.blade.php | 27 +++ routes/web.php | 62 +++-- 55 files changed, 1498 insertions(+), 537 deletions(-) create mode 100644 app/Avaliador.php create mode 100644 app/CoordenadorComissao.php create mode 100644 app/Http/Controllers/CoordenadorComissaoController.php create mode 100644 app/Participante.php create mode 100644 database/migrations/2020_05_23_054649_create_coordenador_comissaos_table.php create mode 100644 database/migrations/2020_05_23_054741_add_users_to_coordenador_comissaos_table.php create mode 100644 database/migrations/2020_05_23_054805_create_avaliadors_table.php create mode 100644 database/migrations/2020_05_23_054859_add_users_to_avaliadors_table.php create mode 100644 database/migrations/2020_05_23_054945_create_participantes_table.php create mode 100644 database/migrations/2020_05_23_055033_add_users_to_participantes_table.php create mode 100644 database/migrations/2020_05_23_071949_add_foreign_to_trabalhos_table.php create mode 100644 database/migrations/2020_05_23_182520_create_trabalhos_participantes_table.php create mode 100644 database/migrations/2020_05_23_182551_create_trabalhos_proponentes_table.php create mode 100644 database/seeds/CoordenadorComissaoSeeder.php create mode 100644 resources/views/administrador/usuarios.blade.php create mode 100644 resources/views/coordenadorComissao/editais.blade.php create mode 100644 resources/views/coordenadorComissao/index.blade.php create mode 100644 resources/views/coordenadorComissao/listarUsuarios.blade.php create mode 100644 resources/views/coordenadorComissao/usuarios.blade.php delete mode 100644 resources/views/layouts/teste.blade.php create mode 100644 resources/views/naturezas/area/index.blade.php create mode 100644 resources/views/naturezas/grandeArea/index.blade.php create mode 100644 resources/views/naturezas/index.blade.php create mode 100644 resources/views/naturezas/subArea/index.blade.php create mode 100644 resources/views/participante/index.blade.php diff --git a/app/Avaliador.php b/app/Avaliador.php new file mode 100644 index 0000000..99332ec --- /dev/null +++ b/app/Avaliador.php @@ -0,0 +1,12 @@ +belongsTo('App\User'); + } +} diff --git a/app/CoordenadorComissao.php b/app/CoordenadorComissao.php new file mode 100644 index 0000000..f5a2528 --- /dev/null +++ b/app/CoordenadorComissao.php @@ -0,0 +1,17 @@ +belongsTo('App\User'); + } + + public function editais(){ + return $this->hasMany('App\Evento', 'coordenadorId'); + } + +} diff --git a/app/Evento.php b/app/Evento.php index a17d1ce..7377ae7 100644 --- a/app/Evento.php +++ b/app/Evento.php @@ -34,5 +34,9 @@ class Evento extends Model return $this->belongsTo('App\User', 'coordenadorId'); } + public function coordenadorComissao(){ + return $this->belongsTo('App\CoordenadorComissao', 'coordenadorId'); + } + } diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php index 4367134..6202a40 100644 --- a/app/Http/Controllers/AdministradorController.php +++ b/app/Http/Controllers/AdministradorController.php @@ -8,6 +8,14 @@ class AdministradorController extends Controller { public function index(){ - return view('admin.index'); + return view('administrador.index'); + } + public function naturezas(){ + + return view('naturezas.index'); + } + public function usuarios(){ + + return view('administrador.usuarios'); } } diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index ea412c3..75a480e 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -9,7 +9,9 @@ use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; use App\User; +use App\Participante; use App\Endereco; + class RegisterController extends Controller { /* @@ -98,10 +100,14 @@ class RegisterController extends Controller $user->cpf = $data['cpf']; $user->celular = $data['celular']; $user->instituicao = $data['instituicao']; + $user->tipo = 'participante'; $user->enderecoId = $end->id; $user->save(); + $participante = new Participante(); + $user->participantes()->save($participante); + return $user; } } diff --git a/app/Http/Controllers/CoordenadorComissaoController.php b/app/Http/Controllers/CoordenadorComissaoController.php new file mode 100644 index 0000000..e34959c --- /dev/null +++ b/app/Http/Controllers/CoordenadorComissaoController.php @@ -0,0 +1,54 @@ +user()->id)->get(); + + + return view('coordenadorComissao.editais', ['eventos'=> $eventos]); + } + public function coordenadorComite(){ + + $usuarios = CoordenadorComissao::all(); + + return view('coordenadorComissao.listarUsuarios', ['usuarios' => $usuarios]); + } + public function avaliador(){ + $usuarios = Avaliador::all(); + + return view('coordenadorComissao.listarUsuarios', ['usuarios' => $usuarios]); + } + public function proponente(){ + $usuarios = Proponente::all(); + + return view('coordenadorComissao.listarUsuarios', ['usuarios' => $usuarios]); + } + public function participante(){ + $usuarios = Participante::all(); + + return view('coordenadorComissao.listarUsuarios', ['usuarios' => $usuarios]); + } +} diff --git a/app/Http/Controllers/EventoController.php b/app/Http/Controllers/EventoController.php index d2811f1..51687d8 100644 --- a/app/Http/Controllers/EventoController.php +++ b/app/Http/Controllers/EventoController.php @@ -13,6 +13,7 @@ use App\ComissaoEvento; use App\User; use App\Trabalho; use App\AreaModalidade; +use App\CoordenadorComissao; use Illuminate\Http\Request; use Carbon\Carbon; use Illuminate\Support\Facades\Storage; @@ -54,8 +55,8 @@ class EventoController extends Controller */ public function create() { - // - return view('evento.criarEvento'); + $coordenadors = CoordenadorComissao::with('user')->get(); + return view('evento.criarEvento', ['coordenadors' => $coordenadors]); } /** @@ -120,9 +121,12 @@ class EventoController extends Controller 'inicioRevisao' => $request->inicioRevisao, 'fimRevisao' => $request->fimRevisao, 'resultado' => $request->resultado, - 'coordenadorId' => Auth::user()->id, + 'coordenadorId' => $request->coordenador_id, ]); + // $user = User::find($request->coordenador_id); + // $user->coordenadorComissao()->editais()->save($evento); + // se vou me tornar coordenador do Evento // if($request->isCoordenador == true){ @@ -130,7 +134,7 @@ class EventoController extends Controller // $evento->save(); // } - $evento->coordenadorId = Auth::user()->id; + //$evento->coordenadorId = Auth::user()->id; $pdfEdital = $request->pdfEdital; $path = 'pdfEdital/' . $evento->id . '/'; @@ -149,10 +153,10 @@ class EventoController extends Controller $evento->save(); - $user = Auth::user(); - $subject = "Evento Criado"; - Mail::to($user->email) - ->send(new EventoCriado($user, $subject)); + // $user = Auth::user(); + // $subject = "Evento Criado"; + // Mail::to($user->email) + // ->send(new EventoCriado($user, $subject)); return redirect()->route('coord.home'); } @@ -169,29 +173,29 @@ class EventoController extends Controller $hasTrabalho = false; $hasTrabalhoCoautor = false; $hasFile = false; - $trabalhos = Trabalho::where('autorId', Auth::user()->id)->get(); - $trabalhosCount = Trabalho::where('autorId', Auth::user()->id)->count(); - $trabalhosId = Trabalho::where('eventoId', $evento->id)->select('id')->get(); - $trabalhosIdCoautor = Coautor::whereIn('trabalhoId', $trabalhosId)->where('autorId', Auth::user()->id)->select('trabalhoId')->get(); - $coautorCount = Coautor::whereIn('trabalhoId', $trabalhosId)->where('autorId', Auth::user()->id)->count(); - $trabalhosCoautor = Trabalho::whereIn('id', $trabalhosIdCoautor)->get(); + $trabalhos = Trabalho::where('proponente_id', Auth::user()->id)->get(); + $trabalhosCount = Trabalho::where('proponente_id', Auth::user()->id)->count(); + $trabalhosId = Trabalho::where('evento_id', $evento->id)->select('id')->get(); + //$trabalhosIdCoautor = Proponente::whereIn('trabalhoId', $trabalhosId)->where('proponente_id', Auth::user()->id)->select('trabalhoId')->get(); + //$coautorCount = Coautor::whereIn('trabalhoId', $trabalhosId)->where('proponente_id', Auth::user()->id)->count(); + //$trabalhosCoautor = Trabalho::whereIn('id', $trabalhosIdCoautor)->get(); if($trabalhosCount != 0){ $hasTrabalho = true; $hasFile = true; } - if($coautorCount != 0){ - $hasTrabalhoCoautor = true; - $hasFile = true; - } + // if($coautorCount != 0){ + // $hasTrabalhoCoautor = true; + // $hasFile = true; + // } $mytime = Carbon::now('America/Recife'); // dd(false); return view('evento.visualizarEvento', [ 'evento' => $evento, 'trabalhos' => $trabalhos, - 'trabalhosCoautor' => $trabalhosCoautor, + // 'trabalhosCoautor' => $trabalhosCoautor, 'hasTrabalho' => $hasTrabalho, - 'hasTrabalhoCoautor' => $hasTrabalhoCoautor, + // 'hasTrabalhoCoautor' => $hasTrabalhoCoautor, 'hasFile' => $hasFile, 'mytime' => $mytime ]); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 6ded0ef..2c2f07d 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Auth; +use Illuminate\Support\Facades\Log; class HomeController extends Controller { @@ -14,7 +15,7 @@ class HomeController extends Controller */ public function __construct() { - $this->middleware(['auth','verified']); + $this->middleware(['auth']); } /** @@ -23,7 +24,8 @@ class HomeController extends Controller * @return \Illuminate\Contracts\Support\Renderable */ public function index() - { + { + $eventos = \App\Evento::all(); if(Auth::check()){ if(Auth::user()->tipo == 'administrador'){ return view('administrador.index'); @@ -31,6 +33,9 @@ class HomeController extends Controller else if (Auth::user()->tipo == 'administradorResponsavel') { return view('administradorResponsavel.index'); } + else if (Auth::user()->tipo == 'coordenador') { + return view('coordenadorComissao.index'); + } else if (Auth::user()->tipo == 'proponente') { return view('proponente.index'); } @@ -38,8 +43,8 @@ class HomeController extends Controller return view('participante.index'); } } - // - return view('home'); + Log::debug('HomeController'); + return view('index', ['eventos' => $eventos]); } public function downloadArquivo(Request $request){ diff --git a/app/Http/Controllers/TrabalhoController.php b/app/Http/Controllers/TrabalhoController.php index 0323cec..bbde486 100644 --- a/app/Http/Controllers/TrabalhoController.php +++ b/app/Http/Controllers/TrabalhoController.php @@ -15,6 +15,7 @@ use App\Arquivo; use App\GrandeArea; use App\SubArea; use App\FuncaoParticipantes; +use App\Participante; use Carbon\Carbon; use Auth; use Illuminate\Http\Request; @@ -66,105 +67,188 @@ class TrabalhoController extends Controller * @return \Illuminate\Http\Response */ public function store(Request $request){ - dd($request->all()); + // dd($request->all()); $mytime = Carbon::now('America/Recife'); $mytime = $mytime->toDateString(); - $evento = Evento::find($request->eventoId); + $evento = Evento::find($request->editalId); + if($evento->inicioSubmissao > $mytime){ if($mytime >= $evento->fimSubmissao){ return redirect()->route('home'); } } - $validatedData = $request->validate([ - 'nomeTrabalho' => ['required', 'string',], - 'areaId' => ['required', 'integer'], - 'modalidadeId' => ['required', 'integer'], - 'eventoId' => ['required', 'integer'], - 'resumo' => ['nullable','string'], - 'nomeCoautor.*' => ['string'], - 'emailCoautor.*' => ['string'], - 'arquivo' => ['required', 'file', 'mimes:pdf', 'max:2000000'], - ]); + + //O anexo de Decisão do CONSU dependo do tipo de edital + if( $evento->tipo == 'PIBIC' || $evento->tipo == 'PIBIC-EM'){ + $validatedData = $request->validate([ + 'editalId' => ['required', 'integer'], + 'nomeProjeto' => ['required', 'string',], + 'grandeAreaId' => ['required', 'integer'], + 'areaId' => ['required', 'integer'], + 'subAreaId' => ['required', 'integer'], + 'pontuacaoPlanilha' => ['required', 'integer'], + 'linkGrupo' => ['required', 'string'], + 'linkLattesEstudante' => ['required', 'string'], + 'nomeCoordenador' => ['required', 'string'], + 'nomeParticipante.*' => ['required', 'string'], + 'emailParticipante.*' => ['string'], + 'nomePlanoTrabalho.*' => ['string'], + 'anexoProjeto' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + 'anexoCONSU' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + 'anexoLatterCoordenador' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + 'anexoPlanilha' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + 'anexoPlanoTrabalho.*' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + ]); - $autor = Auth::user(); - $trabalhosDoAutor = Trabalho::where('eventoId', $request->eventoId)->where('autorId', Auth::user()->id)->count(); - $areaModalidade = AreaModalidade::where('areaId', $request->areaId)->where('modalidadeId', $request->modalidadeId)->first(); - Log::debug('Numero de trabalhos' . $evento); - if($trabalhosDoAutor >= $evento->numMaxTrabalhos){ - return redirect()->back()->withErrors(['numeroMax' => 'Número máximo de trabalhos permitidos atingido.']); - } + $trabalho = Trabalho::create([ + 'titulo' => $request->nomeProjeto, + 'grande_area_id' => $request->grandeAreaId, + 'area_id' => $request->areaId, + 'sub_area_id' => $request->subAreaId, + 'coordenador' => $request->nomeCoordenador, + 'pontuacaoPlanilha' => $request->pontuacaoPlanilha, + 'linkGrupoPesquisa' => $request->linkGrupo, + 'linkLattesEstudante' => $request->linkLattesEstudante, + 'data' => $mytime, + 'evento_id' => $request->editalId, + 'avaliado' => 0, + //Anexos + 'anexoDecisaoCONSU' => $request->anexoCONSU, + 'anexoProjeto' => $request->anexoProjeto, + 'anexoAutorizacaoComiteEtica' => $request->anexoComiteEtica, + 'anexoLattesCoordenador' => $request->anexoLatterCoordenador, + 'anexoPlanilhaPontuacao' => $request->anexoPlanilha, + ]); + }else{ + //Caso em que o anexo da Decisão do CONSU não necessário + $validatedData = $request->validate([ + 'editalId' => ['required', 'integer'], + 'nomeProjeto' => ['required', 'string',], + 'grandeAreaId' => ['required', 'integer'], + 'areaId' => ['required', 'integer'], + 'subAreaId' => ['required', 'integer'], + 'pontuacaoPlanilha' => ['required', 'integer'], + 'linkGrupo' => ['required', 'string'], + 'linkLattesEstudante' => ['required', 'string'], + 'nomeCoordenador' => ['required', 'string'], + 'nomeParticipante.*' => ['required', 'string'], + 'emailParticipante.*' => ['string'], + 'nomePlanoTrabalho.*' => ['string'], + 'anexoProjeto' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + 'anexoLatterCoordenador' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + 'anexoPlanilha' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + 'anexoPlanoTrabalho.*' => ['required', 'file', 'mimes:pdf', 'max:2000000'], + ]); + + $trabalho = Trabalho::create([ + 'titulo' => $request->nomeProjeto, + 'grande_area_id' => $request->grandeAreaId, + 'area_id' => $request->areaId, + 'sub_area_id' => $request->subAreaId, + 'coordenador' => $request->nomeCoordenador, + 'pontuacaoPlanilha' => $request->pontuacaoPlanilha, + 'linkGrupoPesquisa' => $request->linkGrupo, + 'linkLattesEstudante' => $request->linkLattesEstudante, + 'data' => $mytime, + 'evento_id' => $request->editalId, + 'avaliado' => 0, + //Anexos + 'anexoProjeto' => $request->anexoProjeto, + 'anexoAutorizacaoComiteEtica' => $request->anexoComiteEtica, + 'anexoLattesCoordenador' => $request->anexoLatterCoordenador, + 'anexoPlanilhaPontuacao' => $request->anexoPlanilha, + ]); - if($request->emailCoautor != null){ - $i = 0; - foreach ($request->emailCoautor as $key) { - $i++; - } - if($i > $evento->numMaxCoautores){ - return redirect()->back()->withErrors(['numeroMax' => 'Número de coautores deve ser menor igual a '.$evento->numMaxCoautores]); - } } - if($request->emailCoautor != null){ - $i = 0; - foreach ($request->emailCoautor as $key) { - $userCoautor = User::where('email', $key)->first(); - if($userCoautor == null){ + //Relaciona o projeto criado com o proponente que criou o projeto + $trabalho->proponente()->save(Auth()->user()); + + //Envia email com senha temp para cada participante do projeto + if($request->emailParticipante != null){ + + foreach ($request->emailParticipante as $key => $value) { + + $userParticipante = User::where('email', $value)->first(); + + if($userParticipante == null){ + $passwordTemporario = Str::random(8); - Mail::to($key)->send(new EmailParaUsuarioNaoCadastrado(Auth()->user()->name, ' ', 'Coautor', $evento->nome, $passwordTemporario)); + Mail::to($value)->send(new EmailParaUsuarioNaoCadastrado(Auth()->user()->name, ' ', 'Participante', $evento->nome, $passwordTemporario)); $usuario = User::create([ - 'email' => $key, + 'email' => $value, 'password' => bcrypt($passwordTemporario), 'usuarioTemp' => true, - 'name' => $request->nomeCoautor[$i], + 'name' => $request->nomeParticipante[$key], + 'funcao_participante_id' => $request->funcaoParticipante[$key], + ]); + + $participante = $usuario->participantes()->create([ + 'trabalho_id' => $trabalho->id, ]); + + $participante->trabalhos()->save($trabalho); + }else{ + + $subject = "Participante de Projeto"; + $email = $value; + Mail::to($email) + ->send(new SubmissaoTrabalho($userParticipante, $subject)); } - $i++; } } + + $anexos = array( + $request->anexoCONSU, + $request->anexoProjeto, + $request->anexoComiteEtica, + $request->anexoLatterCoordenador, + $request->anexoPlanilha, + ); - $trabalho = Trabalho::create([ - 'titulo' => $request->nomeTrabalho, - 'modalidadeId' => $areaModalidade->modalidade->id, - 'areaId' => $areaModalidade->area->id, - 'autorId' => $autor->id, - 'eventoId' => $evento->id, - 'avaliado' => 'nao' - ]); + foreach ($anexos as $key => $value) { - if($request->emailCoautor != null){ - foreach ($request->emailCoautor as $key) { - $userCoautor = User::where('email', $key)->first(); - Coautor::create([ - 'ordem' => '-', - 'autorId' => $userCoautor->id, + $file = $value; + $path = 'trabalhos/' . $request->editalId . '/' . $trabalho->id .'/'; + $nome = "1.pdf"; + Storage::putFileAs($path, $file, $nome); + + $arquivo = Arquivo::create([ + 'nome' => $path . $nome, + 'trabalhoId' => $trabalho->id, + 'data' => $mytime, + 'versaoFinal' => true, + ]); + + } + + if($request->anexoPlanoTrabalho != null){ + foreach ($request->anexoPlanoTrabalho as $key => $value) { + + $file = $value; + $path = 'trabalhos/' . $request->editalId . '/' . $trabalho->id .'/'; + $nome = $request->nomePlanoTrabalho[$key] .".pdf"; + Storage::putFileAs($path, $file, $nome); + + $arquivo = Arquivo::create([ + 'nome' => $path . $nome, 'trabalhoId' => $trabalho->id, + 'data' => $mytime, + 'versaoFinal' => true, ]); + } } - $file = $request->arquivo; - $path = 'trabalhos/' . $request->eventoId . '/' . $trabalho->id .'/'; - $nome = "1.pdf"; - Storage::putFileAs($path, $file, $nome); + //dd($trabalho); - $arquivo = Arquivo::create([ - 'nome' => $path . $nome, - 'trabalhoId' => $trabalho->id, - 'versaoFinal' => true, - ]); $subject = "Submissão de Trabalho"; + $autor = Auth()->user(); Mail::to($autor->email) ->send(new SubmissaoTrabalho($autor, $subject)); - if($request->emailCoautor != null){ - foreach ($request->emailCoautor as $key) { - $userCoautor = User::where('email', $key)->first(); - Mail::to($userCoautor->email) - ->send(new SubmissaoTrabalho($userCoautor, $subject)); - } - } - - return redirect()->route('evento.visualizar',['id'=>$request->eventoId]); + + return redirect()->route('evento.visualizar',['id'=>$request->editalId]); } /** diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 4061fb3..7c52ef6 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -9,14 +9,22 @@ use App\User; use App\Endereco; use App\Trabalho; use App\Coautor; +use App\Evento; +use Illuminate\Support\Facades\Log; class UserController extends Controller { - // - public function index(){ - if(Auth::user()){ - return redirect()->route('home'); - } + + public function index() + { + $eventos = Evento::all(); + if(Auth::check()){ + Log::debug('UserController check'); + return redirect()->route('home'); + } + Log::debug('UserController index'); + return view('index', ['eventos' => $eventos]); + //return view('auth.login'); } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 77ee1dc..af326a4 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -19,6 +19,7 @@ class Kernel extends HttpKernel \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, \App\Http\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, + //\App\Http\Middleware\checkAdministrador::class ]; /** @@ -62,6 +63,7 @@ class Kernel extends HttpKernel 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, 'isTemp' => \App\Http\Middleware\IsTemp::class, + 'checkAdministrador' => \App\Http\Middleware\checkAdministrador::class, ]; /** diff --git a/app/Http/Middleware/checkAdministrador.php b/app/Http/Middleware/checkAdministrador.php index b269260..cdfe1d6 100644 --- a/app/Http/Middleware/checkAdministrador.php +++ b/app/Http/Middleware/checkAdministrador.php @@ -1,8 +1,9 @@ with('error', 'É necessário estar logado para utilizar esta funcionalidade'); + Log::debug('checkAdministrador'); + return redirect('/'); } if(Auth::user()->tipo=='administrador'){ return $next($request); diff --git a/app/Participante.php b/app/Participante.php new file mode 100644 index 0000000..5b5cb1c --- /dev/null +++ b/app/Participante.php @@ -0,0 +1,17 @@ +belongsTo('App\User'); + } + public function trabalhos(){ + return $this->belongsToMany('App\Trabalho', 'trabalho_participante'); + } +} diff --git a/app/Proponente.php b/app/Proponente.php index e57bd83..c597aae 100644 --- a/app/Proponente.php +++ b/app/Proponente.php @@ -9,4 +9,7 @@ class Proponente extends Model public function user(){ return $this->belongsTo('App\User'); } + public function trabalhos(){ + return $this->belongsToMany('App\Trabalho', 'trabalho_proponente'); + } } diff --git a/app/Trabalho.php b/app/Trabalho.php index fb741cd..3092579 100644 --- a/app/Trabalho.php +++ b/app/Trabalho.php @@ -12,7 +12,25 @@ class Trabalho extends Model * @var array */ protected $fillable = [ - 'titulo', 'autores', 'data', 'modalidadeId', 'areaId', 'autorId', 'eventoId', 'resumo', 'avaliado' + 'titulo', + 'data', + 'avaliado', + 'decisaoCONSU', + 'pontuacaoPlanilha', + 'linkGrupoPesquisa', + 'linkLattesEstudante', + + 'anexoDecisaoCONSU', + 'anexoAutorizacaoComiteEtica', + 'anexoLattesCoordenador', + 'anexoPlanilhaPontuacao', + 'anexoProjeto', + + 'grande_area_id', + 'area_id', + 'sub_area_id', + 'evento_id', + 'proponente_id', ]; public function recurso(){ @@ -53,4 +71,10 @@ class Trabalho extends Model public function planoTrabalho(){ return $this->hasMany('App\PlanoTrabalho'); } + public function participantes(){ + return $this->belongsToMany('App\Participante', 'trabalho_participante'); + } + public function proponentes(){ + return $this->belongsToMany('App\Proponente', 'trabalho_proponente'); + } } diff --git a/app/User.php b/app/User.php index 7e1cb46..6822501 100644 --- a/app/User.php +++ b/app/User.php @@ -85,6 +85,15 @@ class User extends Authenticatable implements MustVerifyEmail public function AdministradorResponsavel(){ return $this->hasMany('App\AdministradorResponsavel'); } + public function participantes(){ + return $this->hasMany('App\Participante'); + } + public function avaliadors(){ + return $this->hasMany('App\Avaliador'); + } + public function coordenadorComissao(){ + return $this->hasMany('App\CoordenadorComissao'); + } public function sendPasswordResetNotification($token){ $this->notify(new recuperacaoSenha($token)); diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index 00d6f2b..55ad718 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -16,17 +16,16 @@ class CreateUsersTable extends Migration Schema::create('users', function (Blueprint $table) { $table->bigIncrements('id'); $table->string('name')->nullable(); - $table->string('email')->unique(); - $table->timestamp('email_verified_at')->nullable(); + $table->string('email')->unique(); $table->string('password'); $table->string('instituicao')->nullable(); $table->string('celular')->nullable(); $table->string('cpf')->nullable(); - $table->string('especProfissional')->nullable(); - $table->boolean('usuarioTemp')->nullable(); $table->string('tipo')->nullable(); + $table->boolean('usuarioTemp')->nullable(); $table->rememberToken(); $table->timestamps(); + $table->timestamp('email_verified_at')->nullable(); $table->integer('enderecoId')->nullable(); }); diff --git a/database/migrations/2020_02_05_123048_create_trabalhos_table.php b/database/migrations/2020_02_05_123048_create_trabalhos_table.php index 3452f46..ff970a8 100644 --- a/database/migrations/2020_02_05_123048_create_trabalhos_table.php +++ b/database/migrations/2020_02_05_123048_create_trabalhos_table.php @@ -15,31 +15,26 @@ class CreateTrabalhosTable extends Migration { Schema::create('trabalhos', function (Blueprint $table) { $table->bigIncrements('id'); - $table->timestamps(); $table->string('titulo'); - $table->string('grandeArea'); - $table->string('area'); - $table->string('subArea'); - $table->string('decisaoCONSU'); - $table->string('anexoDecisaoCONSU'); - $table->string('autorizacaoComiteEtica'); - $table->string('anexoAutorizacaoComiteEtica'); - $table->string('coordenador'); //preencher automaticamente - $table->string('anexoLattesCoordenador'); - $table->string('anexoPlanilhaPontuacao'); - $table->string('pontuacaoPlanilha'); + $table->boolean('avaliado')->nullable(); $table->string('linkGrupoPesquisa'); $table->string('linkLattesEstudante'); - $table->string('autores')->nullable(); + $table->string('pontuacaoPlanilha'); $table->date('data')->nullable(); - $table->text('resumo')->nullable(); - $table->text('avaliado')->nullable(); + //Anexos + $table->string('anexoProjeto'); + $table->string('anexoDecisaoCONSU')->nullable(); + $table->string('anexoPlanilhaPontuacao'); + $table->string('anexoLattesCoordenador'); + $table->string('anexoAutorizacaoComiteEtica'); + //chaves estrangeiras + $table->unsignedBigInteger('grande_area_id'); + $table->unsignedBigInteger('area_id'); + $table->unsignedBigInteger('sub_area_id'); + $table->unsignedBigInteger('evento_id'); + $table->unsignedBigInteger('proponente_id'); - $table->integer('modalidadeId'); - $table->integer('areaId'); - $table->integer('autorId'); - $table->integer('eventoId'); - $table->integer('proponente_id'); + $table->timestamps(); }); } diff --git a/database/migrations/2020_02_06_132418_chaves_estrangeiras.php b/database/migrations/2020_02_06_132418_chaves_estrangeiras.php index 10beab5..81ec836 100644 --- a/database/migrations/2020_02_06_132418_chaves_estrangeiras.php +++ b/database/migrations/2020_02_06_132418_chaves_estrangeiras.php @@ -101,18 +101,18 @@ class ChavesEstrangeiras extends Migration //------------------------------------------------------------------------ - Schema::table('trabalhos', function (Blueprint $table) { - $table->foreign('modalidadeId')->references('id')->on('modalidades'); - }); + // Schema::table('trabalhos', function (Blueprint $table) { + // $table->foreign('modalidadeId')->references('id')->on('modalidades'); + // }); // Schema::table('trabalhos', function (Blueprint $table) { // $table->foreign('areaId')->references('id')->on('areas'); // }); - Schema::table('trabalhos', function (Blueprint $table) { - $table->foreign('autorId')->references('id')->on('users'); - }); - Schema::table('trabalhos', function (Blueprint $table) { - $table->foreign('eventoId')->references('id')->on('eventos'); - }); + // Schema::table('trabalhos', function (Blueprint $table) { + // $table->foreign('autorId')->references('id')->on('users'); + // }); + // Schema::table('trabalhos', function (Blueprint $table) { + // $table->foreign('eventoId')->references('id')->on('eventos'); + // }); //------------------------------------------------------------------------ @@ -122,12 +122,12 @@ class ChavesEstrangeiras extends Migration //------------------------------------------------------------------------ - Schema::table('revisors', function (Blueprint $table) { - $table->foreign('revisorId')->references('id')->on('users'); - }); - Schema::table('revisors', function (Blueprint $table) { - $table->foreign('eventoId')->references('id')->on('eventos'); - }); + // Schema::table('revisors', function (Blueprint $table) { + // $table->foreign('revisorId')->references('id')->on('users'); + // }); + // Schema::table('revisors', function (Blueprint $table) { + // $table->foreign('eventoId')->references('id')->on('eventos'); + // }); // Schema::table('revisors', function (Blueprint $table) { // $table->foreign('areaId')->references('id')->on('areas'); // }); diff --git a/database/migrations/2020_05_20_211421_create_proponentes_table.php b/database/migrations/2020_05_20_211421_create_proponentes_table.php index 259937e..317d8a4 100644 --- a/database/migrations/2020_05_20_211421_create_proponentes_table.php +++ b/database/migrations/2020_05_20_211421_create_proponentes_table.php @@ -15,9 +15,9 @@ class CreateProponentesTable extends Migration { Schema::create('proponentes', function (Blueprint $table) { $table->bigIncrements('id'); - $table->string('CPF'); + //$table->string('CPF'); $table->string('SIAPE'); - $table->string('email')->unique(); + //$table->string('email')->unique(); $table->string('cargo'); $table->string('vinculo'); $table->string('titulacaoMaxima'); diff --git a/database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php b/database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php index fb6f0f6..ffbc2c0 100644 --- a/database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php +++ b/database/migrations/2020_05_21_014825_add_trabalhos_to_proponentes_table.php @@ -14,7 +14,7 @@ class AddTrabalhosToProponentesTable extends Migration public function up() { Schema::table('proponentes', function (Blueprint $table) { - $table->unsignedBigInteger('trabalho_id'); + $table->unsignedBigInteger('trabalho_id')->nullable(); $table->foreign('trabalho_id')->references('id')->on('trabalhos'); }); } diff --git a/database/migrations/2020_05_23_054649_create_coordenador_comissaos_table.php b/database/migrations/2020_05_23_054649_create_coordenador_comissaos_table.php new file mode 100644 index 0000000..88d8d24 --- /dev/null +++ b/database/migrations/2020_05_23_054649_create_coordenador_comissaos_table.php @@ -0,0 +1,31 @@ +bigIncrements('id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('coordenador_comissaos'); + } +} diff --git a/database/migrations/2020_05_23_054741_add_users_to_coordenador_comissaos_table.php b/database/migrations/2020_05_23_054741_add_users_to_coordenador_comissaos_table.php new file mode 100644 index 0000000..a5a7e30 --- /dev/null +++ b/database/migrations/2020_05_23_054741_add_users_to_coordenador_comissaos_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('user_id'); + $table->foreign('user_id')->references('id')->on('users'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('coordenador_comissaos', function (Blueprint $table) { + $table->dropForeign('coordenador_comissaos_user_id_foreign'); + $table->dropColumn('user_id'); + }); + } +} diff --git a/database/migrations/2020_05_23_054805_create_avaliadors_table.php b/database/migrations/2020_05_23_054805_create_avaliadors_table.php new file mode 100644 index 0000000..72c8866 --- /dev/null +++ b/database/migrations/2020_05_23_054805_create_avaliadors_table.php @@ -0,0 +1,31 @@ +bigIncrements('id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('avaliadors'); + } +} diff --git a/database/migrations/2020_05_23_054859_add_users_to_avaliadors_table.php b/database/migrations/2020_05_23_054859_add_users_to_avaliadors_table.php new file mode 100644 index 0000000..edecce5 --- /dev/null +++ b/database/migrations/2020_05_23_054859_add_users_to_avaliadors_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('user_id'); + $table->foreign('user_id')->references('id')->on('users'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('avaliadors', function (Blueprint $table) { + $table->dropForeign('avaliadors_user_id_foreign'); + $table->dropColumn('user_id'); + }); + } +} diff --git a/database/migrations/2020_05_23_054945_create_participantes_table.php b/database/migrations/2020_05_23_054945_create_participantes_table.php new file mode 100644 index 0000000..a0132d8 --- /dev/null +++ b/database/migrations/2020_05_23_054945_create_participantes_table.php @@ -0,0 +1,31 @@ +bigIncrements('id'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('participantes'); + } +} diff --git a/database/migrations/2020_05_23_055033_add_users_to_participantes_table.php b/database/migrations/2020_05_23_055033_add_users_to_participantes_table.php new file mode 100644 index 0000000..19e71cf --- /dev/null +++ b/database/migrations/2020_05_23_055033_add_users_to_participantes_table.php @@ -0,0 +1,36 @@ +unsignedBigInteger('user_id')->nullable(); + $table->foreign('user_id')->references('id')->on('users'); + $table->unsignedBigInteger('trabalho_id')->nullable(); + $table->foreign('trabalho_id')->references('id')->on('trabalhos'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('participantes', function (Blueprint $table) { + $table->dropForeign('participantes_user_id_foreign'); + $table->dropColumn('user_id'); + }); + } +} diff --git a/database/migrations/2020_05_23_071949_add_foreign_to_trabalhos_table.php b/database/migrations/2020_05_23_071949_add_foreign_to_trabalhos_table.php new file mode 100644 index 0000000..3f33152 --- /dev/null +++ b/database/migrations/2020_05_23_071949_add_foreign_to_trabalhos_table.php @@ -0,0 +1,45 @@ +foreign('grande_area_id')->references('id')->on('grande_areas'); + $table->foreign('area_id')->references('id')->on('areas'); + $table->foreign('sub_area_id')->references('id')->on('sub_areas'); + $table->foreign('evento_id')->references('id')->on('eventos'); + $table->foreign('proponente_id')->references('id')->on('proponentes'); + + //$table->foreignId('user_id')->constrained(); + // $table->integer('coordenador'); + // $table->integer('grandeArea_id'); + // $table->integer('area'); + // $table->integer('subArea'); + // $table->integer('eventoId'); + // $table->integer('proponente_id'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('trabalhos', function (Blueprint $table) { + // + }); + } +} diff --git a/database/migrations/2020_05_23_182520_create_trabalhos_participantes_table.php b/database/migrations/2020_05_23_182520_create_trabalhos_participantes_table.php new file mode 100644 index 0000000..8f37ce9 --- /dev/null +++ b/database/migrations/2020_05_23_182520_create_trabalhos_participantes_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('trabalho_id'); + $table->unsignedBigInteger('participante_id'); + + $table->foreign('trabalho_id')->references('id')->on('trabalhos'); + $table->foreign('participante_id')->references('id')->on('participantes'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('trabalho_participante'); + } +} diff --git a/database/migrations/2020_05_23_182551_create_trabalhos_proponentes_table.php b/database/migrations/2020_05_23_182551_create_trabalhos_proponentes_table.php new file mode 100644 index 0000000..abceca4 --- /dev/null +++ b/database/migrations/2020_05_23_182551_create_trabalhos_proponentes_table.php @@ -0,0 +1,34 @@ +unsignedBigInteger('trabalho_id'); + $table->unsignedBigInteger('proponente_id'); + + $table->foreign('trabalho_id')->references('id')->on('trabalhos'); + $table->foreign('proponente_id')->references('id')->on('proponentes'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('trabalho_proponente'); + } +} diff --git a/database/seeds/CoordenadorComissaoSeeder.php b/database/seeds/CoordenadorComissaoSeeder.php new file mode 100644 index 0000000..41e3652 --- /dev/null +++ b/database/seeds/CoordenadorComissaoSeeder.php @@ -0,0 +1,26 @@ +where('name','Coordenador1')->pluck('id'); + + DB::table('coordenador_comissaos')->insert([ + 'user_id' => $user_id[0], + ]); + + $user_id = DB::table('users')->where('name','Coordenador2')->pluck('id'); + + DB::table('coordenador_comissaos')->insert([ + 'user_id' => $user_id[0], + ]); + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index c4f7ca5..1ad9dfe 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -15,10 +15,12 @@ class DatabaseSeeder extends Seeder $this->call(UsuarioSeeder::class); $this->call(AdministradorSeeder::class); $this->call(AdministradorResponsavelSeeder::class); + $this->call(ProponenteSeeder::class); $this->call(GrandeAreaSeeder::class); $this->call(AreaSeeder::class); $this->call(SubAreaSeeder::class); $this->call(FuncaoParticipanteSeeder::class); + $this->call(CoordenadorComissaoSeeder::class); // $this->call(UsersTableSeeder::class); // DB::table('enderecos')->insert([ // 1 @@ -67,8 +69,8 @@ class DatabaseSeeder extends Seeder 'nome'=>'II CONGRESSO REGIONAL DE ZOOTECNIA', // 'numeroParticipantes'=>60, 'descricao'=>'Cada autor inscrito poderá submeter até dois (2) resumos; -O número máximo de autores por trabalho será seis autores; -Os trabalhos deverão ser submetidos na forma de resumo simples com no máximo uma (01) página, no formato PDF;', + O número máximo de autores por trabalho será seis autores; + Os trabalhos deverão ser submetidos na forma de resumo simples com no máximo uma (01) página, no formato PDF;', 'tipo'=>'teste', 'inicioSubmissao'=>'2020-03-30', 'fimSubmissao'=>'2020-09-20', @@ -94,67 +96,5 @@ Os trabalhos deverão ser submetidos na forma de resumo simples com no máximo u // ]; - - for($i = 0; $i < 40; $i++){ - DB::table('users')->insert([ // - 'name' => 'teste', - 'email' => 'teste@teste'.$i, - 'password' => bcrypt('12345678'), - 'cpf' => ''.$i, - 'instituicao' => 'd', - 'celular' => 2, - 'especProfissional' => 'e', - ]); - - if($i < 20){ - DB::table('trabalhos')->insert([ - 'titulo' => 'trabalho' . $i, - 'autores' => '-', - 'data' => '2020-02-15', - 'modalidadeId' => 1, - 'areaId' => 1, - 'autorId' => $i+2, - 'eventoId' => 1, - 'avaliado' => 'nao' - ]); - } - if($i >= 20 && $i < 30){ - DB::table('trabalhos')->insert([ - 'titulo' => 'trabalho' . $i, - 'autores' => '-', - 'data' => '2020-02-15', - 'modalidadeId' => 1, - 'areaId' => 2, - 'eventoId' => 1, - 'autorId' => $i+2, - 'avaliado' => 'nao' - ]); - } - if($i >= 30){ - DB::table('trabalhos')->insert([ - 'titulo' => 'trabalho' . $i, - 'autores' => '-', - 'data' => '2020-02-15', - 'modalidadeId' => 1, - 'areaId' => 3, - 'eventoId' => 1, - 'autorId' => $i+2, - 'avaliado' => 'nao' - ]); - } - - } - - DB::table('users')->insert([ // - 'name' => 'eu', - 'email' => 'asd@asd', - 'password' => bcrypt('12345678'), - 'cpf' => 123132131, - 'instituicao' => 'd', - 'celular' => 2, - 'especProfissional' => 'e', - 'email_verified_at' => '2020-02-15', - ]); ->>>>>>> 006bbf698ee22e7e9cf1b30c8de36a7e10331f3b } } diff --git a/database/seeds/ProponenteSeeder.php b/database/seeds/ProponenteSeeder.php index 48507d3..357c68a 100644 --- a/database/seeds/ProponenteSeeder.php +++ b/database/seeds/ProponenteSeeder.php @@ -16,7 +16,21 @@ class ProponenteSeeder extends Seeder DB::table('proponentes')->insert([ 'user_id' => $user_id[0], + //'CPF' => '123123123', + 'SIAPE' => '123123123', + //'email' => '123123123', + //'email' => '123123123', + 'cargo' => '123123123', + 'vinculo' => '123123123', + 'titulacaoMaxima' => '123123123', + 'anoTitulacao' => '123123123', + 'grandeArea' => '123123123', + 'area' => '123123123', + 'subArea' => '123123123', + 'bolsistaProdutividade' => '123123123', + 'nivel' => '123123123', + 'linkLattes' => '123123123', ]); } -} +} \ No newline at end of file diff --git a/database/seeds/UsuarioSeeder.php b/database/seeds/UsuarioSeeder.php index a5679c1..0c896f9 100644 --- a/database/seeds/UsuarioSeeder.php +++ b/database/seeds/UsuarioSeeder.php @@ -39,5 +39,23 @@ class UsuarioSeeder extends Seeder 'tipo'=>'proponente', 'email_verified_at'=>'2020-01-01' ]); + + DB::table('users')->insert([ + + 'name'=>'Coordenador1', + 'email'=>'coordenador1@ufrpe.br', + 'password'=>Hash::make('12345678'), + 'tipo'=>'coordenador', + 'email_verified_at'=>'2020-01-01' + ]); + + DB::table('users')->insert([ + + 'name'=>'Coordenador2', + 'email'=>'coordenador2@ufrpe.br', + 'password'=>Hash::make('12345678'), + 'tipo'=>'coordenador', + 'email_verified_at'=>'2020-01-01' + ]); } } diff --git a/resources/views/administrador/index.blade.php b/resources/views/administrador/index.blade.php index 66158c1..35ebc13 100644 --- a/resources/views/administrador/index.blade.php +++ b/resources/views/administrador/index.blade.php @@ -4,7 +4,7 @@
-

Administrador

+

{{ Auth()->user()->name }}

@@ -19,7 +19,7 @@
- +

Natureza

@@ -28,7 +28,7 @@
- +

Usuários

diff --git a/resources/views/administrador/usuarios.blade.php b/resources/views/administrador/usuarios.blade.php new file mode 100644 index 0000000..34e60dd --- /dev/null +++ b/resources/views/administrador/usuarios.blade.php @@ -0,0 +1,64 @@ +@extends('layouts.app') + +@section('content') + +
+ +

Administrador

+ +
+
+ +
+
+

Pró-Reitor

+
+ +
+ +
+ +
+ +
+
+

Coordenador de Comitê de Avaliação

+
+
+ +
+
+ +
+
+

Avaliador

+
+
+ +
+
+ +
+
+

Proponente

+
+
+ +
+
+ +
+
+

Participante

+
+
+ +
+
+ + + + +
+ +@endsection diff --git a/resources/views/administradorResponsavel/index.blade.php b/resources/views/administradorResponsavel/index.blade.php index 4c4a083..4b23e93 100644 --- a/resources/views/administradorResponsavel/index.blade.php +++ b/resources/views/administradorResponsavel/index.blade.php @@ -4,7 +4,7 @@
-

Administrador Responsavel

+

{{ Auth()->user()->name }}

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 1dc6793..66d5538 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -210,7 +210,7 @@
- Cancelar Cadastro + Cancelar Cadastro
@@ -80,7 +32,7 @@
{{$evento->nome}} - @can('isCoordenador', $evento) + {{-- @can('isCoordenador', $evento) --}}
+
+
+

Editais

+
+ +
+ +
+ +
+ +
+
+

Usuários

+
+
+ +
+
+ + + + +
+ +@endsection diff --git a/resources/views/coordenadorComissao/listarUsuarios.blade.php b/resources/views/coordenadorComissao/listarUsuarios.blade.php new file mode 100644 index 0000000..13711d9 --- /dev/null +++ b/resources/views/coordenadorComissao/listarUsuarios.blade.php @@ -0,0 +1,41 @@ +@extends('layouts.app') + +@section('content') + +
+ +
+
+
+

Usuarios

+
+
+
+
+ + + + + + + + + + @foreach ($usuarios as $usuario) + + + + + + @endforeach + +
Nome do UsuárioData de CriaçãoOpção
{{ $usuario->user->name }}{{ $usuario->user->email }}3
+
+ +@endsection + +@section('javascript') + +@endsection diff --git a/resources/views/coordenadorComissao/usuarios.blade.php b/resources/views/coordenadorComissao/usuarios.blade.php new file mode 100644 index 0000000..28c97a9 --- /dev/null +++ b/resources/views/coordenadorComissao/usuarios.blade.php @@ -0,0 +1,55 @@ +@extends('layouts.app') + +@section('content') + +
+ +

{{ Auth()->user()->name }}

+ +
+ + +
+ +
+
+

Coordenador de Comitê de Avaliação

+
+
+ +
+
+ +
+
+

Avaliador

+
+
+ +
+
+ +
+
+

Proponente

+
+
+ +
+
+ +
+
+

Participante

+
+
+ +
+
+ + + + +
+ +@endsection diff --git a/resources/views/evento/criarEvento.blade.php b/resources/views/evento/criarEvento.blade.php index 0b8f8ea..a9a0e18 100644 --- a/resources/views/evento/criarEvento.blade.php +++ b/resources/views/evento/criarEvento.blade.php @@ -56,7 +56,18 @@
- +
+
+ + +
+
+

Projetos

@@ -161,7 +172,7 @@
- Cancelar + Cancelar
- @endif + @endif --}} @endif
- Voltar + Voltar
@if($evento->inicioSubmissao <= $mytime) diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 6e142a5..5b244c4 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -28,7 +28,7 @@ {{-- Navbar --}} \ No newline at end of file diff --git a/resources/views/naturezas/area/index.blade.php b/resources/views/naturezas/area/index.blade.php new file mode 100644 index 0000000..d8d3daf --- /dev/null +++ b/resources/views/naturezas/area/index.blade.php @@ -0,0 +1,67 @@ +@extends('layouts.app') + +@section('content') + +
+ +
+
+
+

Editais

+
+
+ Criar Edital +
+
+
+
+ + + + + + + + + +{{-- @foreach ($eventos as $evento) + + + + + + @endforeach --}} + +
Nome do EditalData de CriaçãoOpção
+ + {{ $evento->nome }} + + 10/05/2020 +
+ +
+ + + Detalhes + + + + Editar + +
+ {{ csrf_field() }} + {{ method_field('DELETE') }} + + +
+
+
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/naturezas/grandeArea/index.blade.php b/resources/views/naturezas/grandeArea/index.blade.php new file mode 100644 index 0000000..8ed3203 --- /dev/null +++ b/resources/views/naturezas/grandeArea/index.blade.php @@ -0,0 +1,9 @@ +@extends('layouts.app') + +@section('content') + +
+ +
+ +@endsection \ No newline at end of file diff --git a/resources/views/naturezas/index.blade.php b/resources/views/naturezas/index.blade.php new file mode 100644 index 0000000..dd7344e --- /dev/null +++ b/resources/views/naturezas/index.blade.php @@ -0,0 +1,44 @@ +@extends('layouts.app') + +@section('content') + +
+ +

Administrador

+ +
+
+ +
+
+

Grande Area

+
+ +
+ +
+ +
+ +
+
+

Area

+
+
+ +
+
+ +
+
+

Subárea

+
+
+ +
+
+ + +
+ +@endsection diff --git a/resources/views/naturezas/subArea/index.blade.php b/resources/views/naturezas/subArea/index.blade.php new file mode 100644 index 0000000..8ed3203 --- /dev/null +++ b/resources/views/naturezas/subArea/index.blade.php @@ -0,0 +1,9 @@ +@extends('layouts.app') + +@section('content') + +
+ +
+ +@endsection \ No newline at end of file diff --git a/resources/views/participante/index.blade.php b/resources/views/participante/index.blade.php new file mode 100644 index 0000000..07c1bf5 --- /dev/null +++ b/resources/views/participante/index.blade.php @@ -0,0 +1,27 @@ +@extends('layouts.app') + +@section('content') + +
+ +

{{ Auth()->user()->name }}

+ +
+
+ +
+
+

Editais

+
+ +
+ +
+
+ + + + +
+ +@endsection diff --git a/routes/web.php b/routes/web.php index 39e6f5d..74a5bb8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -11,26 +11,30 @@ | */ use App\Evento; - -Route::get('/', function () { - if(Auth::check()){ - return redirect()->route('home'); - } - - $eventos = Evento::all(); - return view('index',['eventos'=>$eventos]); -}); - -Route::get('/#', function () { - if(Auth::check()){ - return redirect()->route('home'); - } - - $eventos = Evento::all(); - return view('index',['eventos'=>$eventos]); -})->name('cancelarCadastro'); - - Route::get('/evento/visualizar/naologado/{id}','EventoController@showNaoLogado')->name('evento.visualizarNaoLogado'); +use Illuminate\Support\Facades\Log; + +// Route::get('/', function () { +// if(Auth::check()){ +// return redirect()->route('home'); +// } + +// $eventos = Evento::all(); +// return view('index',['eventos'=>$eventos]); +// }); +Log::debug('routes'); +Route::get('/', 'UserController@index')->name('home-user'); +//Route::get('/visualizarEvento', 'UserController@index')->name('visualizarEvento'); +Log::debug('depois de login'); +// Route::get('/#', function () { +// if(Auth::check()){ +// return redirect()->route('home'); +// } + +// $eventos = Evento::all(); +// return view('index',['eventos'=>$eventos]); +// })->name('cancelarCadastro'); + +Route::get('/evento/visualizar/naologado/{id}','EventoController@showNaoLogado')->name('evento.visualizarNaoLogado'); Auth::routes(['verify' => true]); @@ -39,10 +43,21 @@ Route::post('/perfil','UserController@editarPerfil')->name('perfil')->middleware // Rotas Administrador Route::get('/home-admin', 'AdministradorController@index')->middleware('checkAdministrador')->name('admin.index'); +Route::get('/naturezas', 'AdministradorController@naturezas')->middleware('checkAdministrador')->name('admin.naturezas'); +Route::get('/usuarios', 'AdministradorController@usuarios')->middleware('checkAdministrador')->name('admin.usuarios'); +// Rotas Coordenador + +Route::get('/coordenador/home', 'CoordenadorComissaoController@index')->name('coordenador.index'); +Route::get('/coordenador/editais', 'CoordenadorComissaoController@editais')->name('coordenador.editais'); +Route::get('/coordenador/usuarios', 'CoordenadorComissaoController@usuarios')->name('coordenador.usuarios'); +Route::get('/coordenador/listarCoord', 'CoordenadorComissaoController@coordenadorComite')->name('coordenador.coord'); +Route::get('/coordenador/listarAvaliador', 'CoordenadorComissaoController@avaliador')->name('coordenador.avaliador'); +Route::get('/coordenador/listarProponente', 'CoordenadorComissaoController@proponente')->name('coordenador.proponente'); +Route::get('/coordenador/listarParticipante', 'CoordenadorComissaoController@participante')->name('coordenador.participante'); Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ - Route::get('/home', 'EventoController@index')->name('home'); + Route::get('/home/evento', 'EventoController@index')->name('visualizarEvento'); // rotas de teste Route::get('/coordenador/home','EventoController@index')->name('coord.home'); @@ -101,5 +116,6 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ Route::get( '/area/comissao', 'EventoController@listComissaoTrabalhos' )->name('area.comissao'); }); - -Route::get('/home', 'HomeController@index')->name('home')->middleware('verified'); \ No newline at end of file +Log::debug('antes de home'); +Route::get('/home', 'HomeController@index')->name('home')->middleware('verified'); +Log::debug('depois de home'); \ No newline at end of file -- GitLab