diff --git a/app/Http/Controllers/AdministradorController.php b/app/Http/Controllers/AdministradorController.php index 988f715b251e81135b0ea4506f0443f203f432c8..bde05323ecdd73203fe9d00aeca3d403bf194d84 100644 --- a/app/Http/Controllers/AdministradorController.php +++ b/app/Http/Controllers/AdministradorController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Administrador; use App\User; +use App\Area; use App\Avaliador; use App\AdministradorResponsavel; use App\Participante; @@ -15,6 +16,7 @@ use App\FuncaoParticipantes; use Illuminate\Support\Str; use Illuminate\Support\Facades\Hash; use App\Evento; +use Illuminate\Support\Facades\Storage; use App\CoordenadorComissao; use Illuminate\Validation\Rule; use App\Mail\EmailParaUsuarioNaoCadastrado; @@ -189,21 +191,36 @@ class AdministradorController extends Controller public function edit($id) { $user = User::find($id); + $editalParticipante = null; + $editais = Evento::all(); + $funcaoParticipantes = FuncaoParticipantes::all(); + $projetos = Trabalho::all(); + $areas = Area::all(); $adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first(); $avaliador = Avaliador::where('user_id', '=', $id)->first(); $proponente = Proponente::where('user_id', '=', $id)->first(); $participante = Participante::where('user_id', '=', $id)->first(); + if ($participante != null) { + $editalParticipante = Evento::where('id', Trabalho::where('id', $participante->trabalho_id)->first()->evento_id)->first(); + } return view ('administrador.editar_user')->with(['user' => $user, + 'avaliador' => $avaliador, 'adminResp' => $adminResp, 'proponente' => $proponente, - 'participante' => $participante,]); + 'participante' => $participante, + 'editais' => $editais, + 'funcaoParticipantes' => $funcaoParticipantes, + 'projetos' => $projetos, + 'editalParticipante' => $editalParticipante, + 'areas' => $areas,]); } public function update(Request $request, $id) { $user = User::find($id); - + + //validação de dados if ($request->tipo != "proponente") { $validated = $request->validate([ 'name' => ['required', 'string', 'max:255'], @@ -214,35 +231,151 @@ class AdministradorController extends Controller 'celular' => ['required', 'string', 'telefone'], 'cpf' => ['required', 'cpf'], ]); + } else if ($request->tipo === "participante") { + $validated = $request->validate([ + 'name' => ['required', 'string', 'max:255'], + 'tipo' => ['required'], + 'email' => ['required', 'string', 'email', 'max:255'], + 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], + 'instituicaoSelect' => ['required_without:instituicao'], + 'celular' => ['required', 'string', 'telefone'], + 'cpf' => ['required', 'cpf'], + 'edital' => 'required', + 'projeto' => 'required', + 'funcaoParticipante' => 'required', + ]); + } else if ($request->tipo === "avaliador") { + $validated = $request->validate([ + 'name' => ['required', 'string', 'max:255'], + 'tipo' => ['required'], + 'email' => ['required', 'string', 'email', 'max:255'], + 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], + 'instituicaoSelect' => ['required_without:instituicao'], + 'celular' => ['required', 'string', 'telefone'], + 'cpf' => ['required', 'cpf'], + 'area' => 'required', + ]); } else { $validated = $request->validate([ - 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255'], - 'tipo' => ['required'], - 'cpf' => ['required', 'cpf',], - 'celular' => ['required', 'string', 'telefone'], - 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], - 'instituicaoSelect' => ['required_without:instituicao'], - 'cargo' => ['required'], - 'vinculo' => ['required'], - 'outro' => ['required_if:vinculo,Outro'], - 'titulacaoMaxima' => ['required_with:anoTitulacao,areaFormacao,bolsistaProdutividade'], - 'titulacaoMaxima' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), - 'anoTitulacao' => ['required_with:titulacaoMaxima,areaFormacao,bolsistaProdutividade,linkLattes'], - 'anoTitulacao' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), - 'areaFormacao' => ['required_with:titulacaoMaxima,anoTitulacao,bolsistaProdutividade,linkLattes'], - 'areaFormacao' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), - 'bolsistaProdutividade' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,linkLattes'], - 'bolsistaProdutividade' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), - 'nivel' => ['required_if:bolsistaProdutividade,sim'], - //'nivel' => [(isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando') ? 'required':''], - 'linkLattes' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,bolsistaProdutividade'], - 'linkLattes' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,bolsistaProdutividade'], - 'linkLattes' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,bolsistaProdutividade'], - 'linkLattes' => [(isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando') ? 'required':''], - 'linkLattes' => [(isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando') ? 'link_lattes':''], + 'name' => ['required', 'string', 'max:255'], + 'email' => ['required', 'string', 'email', 'max:255'], + 'cpf' => ['required', 'cpf'], + 'celular' => ['required', 'string', 'telefone'], + 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], + 'instituicaoSelect' => ['required_without:instituicao'], + 'cargo' => ['required'], + 'vinculo' => ['required'], + 'outro' => ['required_if:vinculo,Outro'], + 'titulacaoMaxima' => ['required_with:anoTitulacao,areaFormacao,bolsistaProdutividade'], + 'titulacaoMaxima' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), + 'anoTitulacao' => ['required_with:titulacaoMaxima,areaFormacao,bolsistaProdutividade,linkLattes'], + 'anoTitulacao' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), + 'areaFormacao' => ['required_with:titulacaoMaxima,anoTitulacao,bolsistaProdutividade,linkLattes'], + 'areaFormacao' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), + 'bolsistaProdutividade' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,linkLattes'], + 'bolsistaProdutividade' => Rule::requiredIf((isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando')), + 'nivel' => ['required_if:bolsistaProdutividade,sim'], + //'nivel' => [(isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando') ? 'required':''], + 'linkLattes' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,bolsistaProdutividade'], + 'linkLattes' => [(isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando') ? 'required':''], + 'linkLattes' => [(isset($data['cargo']) && $data['cargo'] !== 'Estudante') || (isset($data['cargo']) && $data['cargo'] === 'Estudante' && isset($data['vinculo']) && $data['vinculo'] === 'Pós-doutorando') ? 'link_lattes':''], ]); } + //validação de mudança de tipo se confirmar a mudança exclui os dados do usuário atual e adiciona o novo perfil + if ($user->tipo != $request->tipo && $request->confirmarMudançaDeTipo == null) { + return redirect()->back()->withErrors(['tipo' => 'A mudança de tipo irá excluir tudo associado ao tipo atual do usuário!']); + } else if ($request->confirmarMudançaDeTipo != null) { + // dd($request); + switch ($user->tipo) { + case "administradorResponsavel": + $adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first(); + $adminResp->delete(); + break; + case "coordenador": + $coordenador = CoordenadorComissao::where('user_id', '=', $id)->first(); + + $projetos = Trabalho::where('coordenador_id', $coordenador->id)->get(); + + foreach ($projetos as $projeto) { + Storage::deleteDirectory('trabalhos/' . $projeto->evento->id . '/' . $projeto->id ); + $projeto->delete(); + } + + // PENDENTE: chave estrangeira (trabalhos) não deixa apagar o coordenador mesmo que o mesmo não esteja vinculado a nenhum projeto + $coordenador->delete(); + break; + case "avaliador": + $avaliador = Avaliador::where('user_id', '=', $id)->first(); + $avaliador->delete(); + break; + case "proponente": + $proponente = Proponente::where('user_id', '=', $id)->first(); + $projetos = Trabalho::where('proponente_id', $proponente->id)->get(); + + foreach ($projetos as $projeto) { + Storage::deleteDirectory('trabalhos/' . $projeto->evento->id . '/' . $projeto->id ); + $projeto->delete(); + } + + $proponente->delete(); + break; + case "participante": + $participante = Participante::where('user_id', '=', $id)->first(); + $participante->delete(); + break; + } + + switch ($request->tipo) { + case "administradorResponsavel": + $adminResp = new AdministradorResponsavel(); + $adminResp->user_id = $user->id; + $adminResp->save(); + break; + case "coordenador": + $coordenador = new CoordenadorComissao(); + $coordenador->user_id = $user->id; + $coordenador->save(); + break; + case "avaliador": + $avaliador = new Avaliador(); + $avaliador->user_id = $user->id; + $avaliador->area_id = $request->area; + $avaliador->save(); + break; + case "proponente": + $proponente = new Proponente(); + if ($request->SIAPE != null) { + $proponente->SIAPE = $request->SIAPE; + } + $proponente->cargo = $request->cargo; + + if ($request->vinculo != 'Outro') { + $proponente->vinculo = $request->vinculo; + } else { + $proponente->vinculo = $request->outro; + } + + $proponente->titulacaoMaxima = $request->titulacaoMaxima; + $proponente->anoTitulacao = $request->anoTitulacao; + $proponente->areaFormacao = $request->areaFormacao; + $proponente->bolsistaProdutividade = $request->bolsistaProdutividade; + if ($request->bolsistaProdutividade == 'sim') { + $proponente->nivel = $request->nivel; + } + $proponente->linkLattes = $request->linkLattes; + + $proponente->user_id = $user->id; + $proponente->save(); + break; + case "participante": + $participante = new Participante(); + $participante->user_id = $user->id; + $participante->trabalho_id = $request->projeto; + $participante->funcao_participante_id = $request->funcaoParticipante; + $participante->save(); + break; + } + } // if (!(Hash::check($request->senha_atual, $user->password))) { // return redirect()->back()->withErrors(['senha_atual' => 'Senha atual não correspondente']); @@ -252,52 +385,54 @@ class AdministradorController extends Controller // return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']); // } - switch ($request->tipo) { - case "administradorResponsavel": - $adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first(); - $adminResp->user_id = $user->id; - $adminResp->update(); - break; - case "coordenador": - $coordenador = CoordenadorComissao::where('user_id', '=', $id)->first(); - $coordenador->user_id = $user->id; - $coordenador->update(); - break; - case "avaliador": - $avaliador = Avaliador::where('user_id', '=', $id)->first(); - $avaliador->user_id = $user->id; - $avaliador->update(); - break; - case "proponente": - $proponente = Proponente::where('user_id', '=', $id)->first(); - if ($request->SIAPE != null) { - $proponente->SIAPE = $request->SIAPE; - } - $proponente->cargo = $request->cargo; - - if ($request->vinculo != 'Outro') { - $proponente->vinculo = $request->vinculo; - } else { - $proponente->vinculo = $request->outro; - } - - $proponente->titulacaoMaxima = $request->titulacaoMaxima; - $proponente->anoTitulacao = $request->anoTitulacao; - $proponente->areaFormacao = $request->areaFormacao; - $proponente->bolsistaProdutividade = $request->bolsistaProdutividade; - if ($request->bolsistaProdutividade == 'sim') { - $proponente->nivel = $request->nivel; - } - $proponente->linkLattes = $request->linkLattes; - - $proponente->user_id = $user->id; - $proponente->update(); - break; - case "participante": - $participante = Participante::where('user_id', '=', $id)->first(); - $participante->user_id = $user->id; - $participante->update(); - break; + if ($request->confirmarMudançaDeTipo == null) { + switch ($request->tipo) { + case "administradorResponsavel": + $adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first(); + $adminResp->user_id = $user->id; + $adminResp->update(); + break; + case "coordenador": + $coordenador = CoordenadorComissao::where('user_id', '=', $id)->first(); + $coordenador->user_id = $user->id; + $coordenador->update(); + break; + case "avaliador": + $avaliador = Avaliador::where('user_id', '=', $id)->first(); + $avaliador->user_id = $user->id; + $avaliador->update(); + break; + case "proponente": + $proponente = Proponente::where('user_id', '=', $id)->first(); + if ($request->SIAPE != null) { + $proponente->SIAPE = $request->SIAPE; + } + $proponente->cargo = $request->cargo; + + if ($request->vinculo != 'Outro') { + $proponente->vinculo = $request->vinculo; + } else { + $proponente->vinculo = $request->outro; + } + + $proponente->titulacaoMaxima = $request->titulacaoMaxima; + $proponente->anoTitulacao = $request->anoTitulacao; + $proponente->areaFormacao = $request->areaFormacao; + $proponente->bolsistaProdutividade = $request->bolsistaProdutividade; + if ($request->bolsistaProdutividade == 'sim') { + $proponente->nivel = $request->nivel; + } + $proponente->linkLattes = $request->linkLattes; + + $proponente->user_id = $user->id; + $proponente->update(); + break; + case "participante": + $participante = Participante::where('user_id', '=', $id)->first(); + $participante->user_id = $user->id; + $participante->update(); + break; + } } $user->name = $request->name; diff --git a/app/Http/Controllers/AreaController.php b/app/Http/Controllers/AreaController.php index cf83aabe0d29be65613d46f318bbd470463abbf1..bf46872fee39616a118f90f150b9c49569cf64ef 100644 --- a/app/Http/Controllers/AreaController.php +++ b/app/Http/Controllers/AreaController.php @@ -122,6 +122,6 @@ class AreaController extends Controller $id = json_decode($request->id) ; $areas = Area::where('grande_area_id', $id)->orderBy('nome')->get(); return response()->json($areas); - return $areas->toJson(); + // return $areas->toJson(); } } diff --git a/app/Http/Controllers/EventoController.php b/app/Http/Controllers/EventoController.php index 7ec5c2d3b6d62eef9fde81a6b4afecdbb20b3a92..fd83e1fe26e9e85726082282bff45c3ca7c0716c 100644 --- a/app/Http/Controllers/EventoController.php +++ b/app/Http/Controllers/EventoController.php @@ -94,9 +94,9 @@ class EventoController extends Controller // validar datas nulas antes, pois pode gerar um bug if( - $request->inicioSubmissao == null || - $request->fimSubmissao == null || - $request->inicioRevisao == null || + $request->inícioDaSubmissão == null || + $request->fimDaSubmissão == null || + $request->inícioDaRevisão == null || $request->fimRevisao == null || $request->resultado == null @@ -107,12 +107,12 @@ class EventoController extends Controller 'tipo' => ['required', 'string'], 'natureza' => ['required'], 'coordenador_id' => ['required'], - 'inicioSubmissao' => ['required', 'date'], - 'fimSubmissao' => ['required', 'date'], - 'inicioRevisao' => ['required', 'date'], - 'fimRevisao' => ['required', 'date'], - 'inicio_recurso' => ['required', 'date'], - 'fim_recurso' => ['required', 'date'], + 'inícioDaSubmissão' => ['required', 'date'], + 'fimDaSubmissão' => ['required', 'date'], + 'inícioDaRevisão' => ['required', 'date'], + 'fimDaRevisão' => ['required', 'date'], + 'início_do_recurso' => ['required', 'date'], + 'fim_do_recurso' => ['required', 'date'], 'resultado_final' => ['required', 'date'], 'resultado_preliminar'=> ['required', 'date'], 'pdfEdital' => [($request->pdfEditalPreenchido!=='sim'?'required':''), 'file', 'mimes:pdf', 'max:2048'], @@ -308,11 +308,13 @@ class EventoController extends Controller $coordenadors = CoordenadorComissao::with('user')->get(); $naturezas = Natureza::orderBy('nome')->get(); $yesterday = Carbon::yesterday('America/Recife'); + // $today = Carbon::toDay('America/Recife')->toDateString(); $yesterday = $yesterday->toDateString(); return view('evento.editarEvento',['evento'=>$evento, 'coordenadores'=>$coordenadors, 'naturezas'=>$naturezas, - 'ontem'=>$yesterday]); + 'ontem'=>$yesterday, + /* 'hoje' =>$today*/]); } /** @@ -341,13 +343,13 @@ class EventoController extends Controller 'descricao' => ['required', 'string'], 'tipo' => ['required', 'string'], 'natureza' => ['required'], - 'inicioSubmissao' => ['required', 'date'], - 'fimSubmissao' => ['required', 'date'], - 'inicioRevisao' => ['required', 'date', 'after:yesterday'], - 'fimRevisao' => ['required', 'date'], - 'resultado_preliminar'=> ['required', 'date'], - 'inicio_recurso' => ['required', 'date'], - 'fim_recurso' => ['required', 'date'], + 'inícioDaSubmissão' => ['required', 'date'], + 'fimDaSubmissão' => ['required', 'date'], + 'inícioDaRevisão' => ['required', 'date'], + 'fimDaRevisão' => ['required', 'date'], + 'início_do_recurso' => ['required', 'date'], + 'fim_do_recurso' => ['required', 'date'], + 'resultado_preliminar'=> ['required', 'date'], 'resultado_final' => ['required', 'date'], 'pdfEdital' => ['file', 'mimes:pdf', 'max:2048'], 'modeloDocumento' => ['file', 'mimes:zip,doc,docx,odt,pdf', 'max:2048'], @@ -359,13 +361,13 @@ class EventoController extends Controller 'descricao' => ['required', 'string', 'max:1500'], 'tipo' => ['required', 'string'], 'natureza' => ['required'], - 'inicioSubmissao' => ['required', 'date', 'after:yesterday'], - 'fimSubmissao' => ['required', 'date', 'after_or_equal:inicioSubmissao'], - 'inicioRevisao' => ['required', 'date', 'after:yesterday'], - 'fimRevisao' => ['required', 'date', 'after:inicioRevisao', 'after:fimSubmissao'], + 'inícioDaSubmissão' => ['required', 'date', 'after:yesterday'], + 'fimDaSubmissão' => ['required', 'date', 'after_or_equal:inicioSubmissao'], + 'inícioDaRevisão' => ['required', 'date', 'after:yesterday'], + 'fimDaRevisão' => ['required', 'date', 'after:inicioRevisao', 'after:fimSubmissao'], 'resultado_preliminar'=> ['required', 'date', 'after_or_equal:fimRevisao'], - 'inicio_recurso' => ['required', 'date', 'after_or_equal:resultado_preliminar'], - 'fim_recurso' => ['required', 'date', 'after:inicio_recurso'], + 'início_do_recurso' => ['required', 'date', 'after_or_equal:resultado_preliminar'], + 'fim_do_recurso' => ['required', 'date', 'after:inicio_recurso'], 'resultado_final' => ['required', 'date', 'after:fim_recurso'], 'modeloDocumento' => ['file', 'mimes:zip,doc,docx,odt,pdf', 'max:2048'], ]); @@ -374,12 +376,12 @@ class EventoController extends Controller $evento->descricao = $request->descricao; $evento->tipo = $request->tipo; $evento->natureza_id = $request->natureza; - $evento->inicioSubmissao = $request->inicioSubmissao; - $evento->fimSubmissao = $request->fimSubmissao; - $evento->inicioRevisao = $request->inicioRevisao; - $evento->fimRevisao = $request->fimRevisao; - $evento->inicio_recurso = $request->inicio_recurso; - $evento->fim_recurso = $request->fim_recurso; + $evento->inicioSubmissao = $request->inícioDaSubmissão; + $evento->fimSubmissao = $request->fimDaSubmissão; + $evento->inicioRevisao = $request->inícioDaRevisão; + $evento->fimRevisao = $request->fimDaRevisão; + $evento->inicio_recurso = $request->início_do_recurso; + $evento->fim_recurso = $request->fim_do_recurso; $evento->resultado_preliminar = $request->resultado_preliminar; $evento->resultado_final = $request->resultado_final; $evento->coordenadorId = $request->coordenador_id; @@ -403,7 +405,7 @@ class EventoController extends Controller $evento->update(); $eventos = Evento::all(); - return view('coordenador.home',['eventos'=>$eventos]); + return redirect( route('admin.editais') ); } /** diff --git a/app/Http/Controllers/TrabalhoController.php b/app/Http/Controllers/TrabalhoController.php index 3791ebe7c1c5a74a71bb7a6bd60e9d85332f8413..f01d7ef056e6faca0d288ae4c341d052c056548d 100644 --- a/app/Http/Controllers/TrabalhoController.php +++ b/app/Http/Controllers/TrabalhoController.php @@ -968,4 +968,9 @@ class TrabalhoController extends Controller return abort(404); } + public function consulta(Request $request) { + $id = json_decode($request->id) ; + $projetos = Trabalho::where('evento_id', $id)->orderBy('titulo')->get(); + return response()->json($projetos); + } } diff --git a/composer.lock b/composer.lock index 9dc4204167b468a3016e9d18d4f3ffde2d5acb00..857ff7fa9a6668d6d9f94c1e878457876b2318a0 100644 --- a/composer.lock +++ b/composer.lock @@ -2467,16 +2467,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d" + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", - "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/1c302646f6efc070cd46856e600e5e0684d6b454", + "reference": "1c302646f6efc070cd46856e600e5e0684d6b454", "shasum": "" }, "require": { @@ -2488,7 +2488,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2525,20 +2525,20 @@ "polyfill", "portable" ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-iconv", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035" + "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035", - "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36", + "reference": "6c2f78eb8f5ab8eaea98f6d414a5915f2e0fce36", "shasum": "" }, "require": { @@ -2550,7 +2550,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2588,25 +2588,26 @@ "portable", "shim" ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a57f8161502549a742a63c09f0a604997bf47027" + "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027", - "reference": "a57f8161502549a742a63c09f0a604997bf47027", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", + "reference": "bc6549d068d0160e0f10f7a5a23c7d1406b95ebe", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php70": "^1.10", "symfony/polyfill-php72": "^1.10" }, "suggest": { @@ -2615,7 +2616,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2639,6 +2640,10 @@ "name": "Laurent Bassin", "email": "laurent@bassin.info" }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" @@ -2654,20 +2659,87 @@ "portable", "shim" ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", + "reference": "37078a8dd4a2a1e9ab0231af7c6cb671b2ed5a7e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "7110338d81ce1cbc3e273136e4574663627037a7" + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7", - "reference": "7110338d81ce1cbc3e273136e4574663627037a7", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/a6977d63bf9a0ad4c65cd352709e230876f9904a", + "reference": "a6977d63bf9a0ad4c65cd352709e230876f9904a", "shasum": "" }, "require": { @@ -2679,7 +2751,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2717,20 +2789,83 @@ "portable", "shim" ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" + }, + { + "name": "symfony/polyfill-php70", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php70.git", + "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", + "reference": "0dd93f2c578bdc9c72697eaa5f1dd25644e618d3", + "shasum": "" + }, + "require": { + "paragonie/random_compat": "~1.0|~2.0|~9.99", + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php70\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.17.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "f048e612a3905f34931127360bdd2def19a5e582" + "reference": "639447d008615574653fb3bc60d1986d7172eaae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582", - "reference": "f048e612a3905f34931127360bdd2def19a5e582", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/639447d008615574653fb3bc60d1986d7172eaae", + "reference": "639447d008615574653fb3bc60d1986d7172eaae", "shasum": "" }, "require": { @@ -2739,7 +2874,11 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -2772,20 +2911,20 @@ "portable", "shim" ], - "time": "2020-05-12T16:47:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a" + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a", - "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fffa1a52a023e782cdcc221d781fe1ec8f87fcca", + "reference": "fffa1a52a023e782cdcc221d781fe1ec8f87fcca", "shasum": "" }, "require": { @@ -2794,7 +2933,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2834,20 +2973,20 @@ "portable", "shim" ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.17.1", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2" + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2", - "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/d87d5766cbf48d72388a9f6b85f280c8ad51f981", + "reference": "d87d5766cbf48d72388a9f6b85f280c8ad51f981", "shasum": "" }, "require": { @@ -2856,7 +2995,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2900,7 +3039,7 @@ "portable", "shim" ], - "time": "2020-06-06T08:46:27+00:00" + "time": "2020-07-14T12:35:20+00:00" }, { "name": "symfony/process", @@ -3305,26 +3444,26 @@ }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.2", + "version": "2.2.3", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15" + "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/dda2ee426acd6d801d5b7fd1001cde9b5f790e15", - "reference": "dda2ee426acd6d801d5b7fd1001cde9b5f790e15", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/b43b05cf43c1b6d849478965062b6ef73e223bb5", + "reference": "b43b05cf43c1b6d849478965062b6ef73e223bb5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", - "php": "^5.5 || ^7.0", + "php": "^5.5 || ^7.0 || ^8.0", "symfony/css-selector": "^2.7 || ^3.0 || ^4.0 || ^5.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^7.5" }, "type": "library", "extra": { @@ -3350,26 +3489,26 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "time": "2019-10-24T08:53:34+00:00" + "time": "2020-07-13T06:12:54+00:00" }, { "name": "vlucas/phpdotenv", - "version": "v3.6.6", + "version": "v3.6.7", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "4669484ccbc38fe7c4e0c50456778f2010566aad" + "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/4669484ccbc38fe7c4e0c50456778f2010566aad", - "reference": "4669484ccbc38fe7c4e0c50456778f2010566aad", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2065beda6cbe75e2603686907b2e45f6f3a5ad82", + "reference": "2065beda6cbe75e2603686907b2e45f6f3a5ad82", "shasum": "" }, "require": { "php": "^5.4 || ^7.0 || ^8.0", "phpoption/phpoption": "^1.5.2", - "symfony/polyfill-ctype": "^1.16" + "symfony/polyfill-ctype": "^1.17" }, "require-dev": { "ext-filter": "*", @@ -3413,7 +3552,7 @@ "env", "environment" ], - "time": "2020-06-02T14:08:54+00:00" + "time": "2020-07-14T19:04:52+00:00" } ], "packages-dev": [ @@ -3475,16 +3614,16 @@ }, { "name": "facade/flare-client-php", - "version": "1.3.2", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/facade/flare-client-php.git", - "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004" + "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/flare-client-php/zipball/db1e03426e7f9472c9ecd1092aff00f56aa6c004", - "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004", + "url": "https://api.github.com/repos/facade/flare-client-php/zipball/0eeb0de4fc1078433f0915010bd8f41e998adcb4", + "reference": "0eeb0de4fc1078433f0915010bd8f41e998adcb4", "shasum": "" }, "require": { @@ -3492,9 +3631,11 @@ "illuminate/pipeline": "^5.5|^6.0|^7.0", "php": "^7.1", "symfony/http-foundation": "^3.3|^4.1|^5.0", + "symfony/mime": "^3.4|^4.0|^5.1", "symfony/var-dumper": "^3.4|^4.0|^5.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", "larapack/dd": "^1.1", "phpunit/phpunit": "^7.5.16", "spatie/phpunit-snapshot-assertions": "^2.0" @@ -3525,20 +3666,20 @@ "flare", "reporting" ], - "time": "2020-03-02T15:52:04+00:00" + "time": "2020-07-13T23:25:57+00:00" }, { "name": "facade/ignition", - "version": "1.16.1", + "version": "1.16.3", "source": { "type": "git", "url": "https://github.com/facade/ignition.git", - "reference": "af05ac5ee8587395d7474ec0681c08776a2cb09d" + "reference": "19674150bb46a4de0ba138c747f538fe7be11dbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition/zipball/af05ac5ee8587395d7474ec0681c08776a2cb09d", - "reference": "af05ac5ee8587395d7474ec0681c08776a2cb09d", + "url": "https://api.github.com/repos/facade/ignition/zipball/19674150bb46a4de0ba138c747f538fe7be11dbc", + "reference": "19674150bb46a4de0ba138c747f538fe7be11dbc", "shasum": "" }, "require": { @@ -3596,25 +3737,30 @@ "laravel", "page" ], - "time": "2020-03-05T12:39:07+00:00" + "time": "2020-07-13T15:54:05+00:00" }, { "name": "facade/ignition-contracts", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/facade/ignition-contracts.git", - "reference": "f445db0fb86f48e205787b2592840dd9c80ded28" + "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/f445db0fb86f48e205787b2592840dd9c80ded28", - "reference": "f445db0fb86f48e205787b2592840dd9c80ded28", + "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/aeab1ce8b68b188a43e81758e750151ad7da796b", + "reference": "aeab1ce8b68b188a43e81758e750151ad7da796b", "shasum": "" }, "require": { "php": "^7.1" }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.14", + "phpunit/phpunit": "^7.5|^8.0", + "vimeo/psalm": "^3.12" + }, "type": "library", "autoload": { "psr-4": { @@ -3640,7 +3786,7 @@ "flare", "ignition" ], - "time": "2019-08-30T14:06:08+00:00" + "time": "2020-07-14T10:10:28+00:00" }, { "name": "filp/whoops", @@ -5403,23 +5549,23 @@ }, { "name": "theseer/tokenizer", - "version": "1.1.3", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" + "reference": "75a63c33a8577608444246075ea0af0d052e452a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", - "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/75a63c33a8577608444246075ea0af0d052e452a", + "reference": "75a63c33a8577608444246075ea0af0d052e452a", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -5439,7 +5585,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2019-06-13T22:48:21+00:00" + "time": "2020-07-12T23:59:07+00:00" }, { "name": "webmozart/assert", diff --git a/resources/views/administrador/editar_user.blade.php b/resources/views/administrador/editar_user.blade.php index 1fe7f62db227f682f762f37e551231d3314ede68..d5524dbd936b522f8349fca699a30f8522324356 100644 --- a/resources/views/administrador/editar_user.blade.php +++ b/resources/views/administrador/editar_user.blade.php @@ -16,7 +16,7 @@
- + @error('name') @@ -27,7 +27,7 @@
- + @error('cpf') @@ -66,19 +66,38 @@
- + @if (old('tipo') != null) + @if(auth()->user()->tipo == 'administrador') + + @endif + + + + + @else + @if(auth()->user()->tipo == 'administrador') + + @endif + + + + @endif - - - - + + @error('tipo') + + {{ $message }} + + @enderror + + +
- + @error('celular') @@ -89,10 +108,10 @@
- {{-- Email | Senha | Confirmar Senha --}} + {{-- Email --}}
-
+
@@ -103,6 +122,104 @@ @enderror
+
+ + + + @error('edital') + + {{ $message }} + + @enderror +
+ +
+ + + + @error('projeto') + + {{ $message }} + + @enderror +
+ +
+ + + + @error('area') + + {{ $message }} + + @enderror +
+ +
+ + + + @error('funcaoParticipante') + + {{ $message }} + + @enderror +
@if(!(is_null($proponente))) @@ -116,9 +233,15 @@ @error('cargo') @@ -131,14 +254,26 @@
@@ -165,13 +300,22 @@
- + @if (old('titulacaoMaxima') != null) + + + + + + + @else + + + + + + + @endif @error('titulacaoMaxima') @@ -183,7 +327,7 @@
- + @error('anoTitulacao') @@ -193,7 +337,7 @@
- + @error('areaFormacao') @@ -207,7 +351,7 @@
- + @error('SIAPE') @@ -218,7 +362,7 @@
- + @error('linkLattes') @@ -230,9 +374,15 @@

@error('bolsistaProdutividade') @@ -241,8 +391,8 @@ @enderror
- @if ($proponente->bolsistaProdutividade =='sim') -
+ @if (old('nivel') == null) +
bolsistaProdutividade =='sim') style="display: block;" @else style="display: none;" @endif> - - - - - + + + + + @error('nivel') @@ -348,7 +498,7 @@
- @@ -366,7 +516,7 @@
- + @error('anoTitulacao') @@ -376,7 +526,7 @@
- + @error('areaFormacao') @@ -390,7 +540,7 @@
- + @error('SIAPE') @@ -401,7 +551,7 @@
- + @error('linkLattes') @@ -424,15 +574,15 @@ @enderror
-