Skip to content

GitLab

Unverified Commit 2b7850ea authored by Edgar Vinicius Carvalho Vital's avatar Edgar Vinicius Carvalho Vital Committed by GitHub
Browse files

Merge pull request #843 from Edgarvital/master 

Tentativa de correção de bug na adição de integrantes da proposta, e correção da validação dos campos na edição do usuário
parents 23132513 c7672936
Hide whitespace changes
Inline Side-by-side
Showing
with 75 additions and 49 deletions
+75 -49
.gitignore
View file @ 2b7850ea
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
/vendor /vendor
.env .env
.env.backup .env.backup
.idea
.phpunit.result.cache .phpunit.result.cache
Homestead.json Homestead.json
Homestead.yaml Homestead.yaml
......
app/Http/Controllers/UserController.php
View file @ 2b7850ea
...@@ -75,7 +75,6 @@ class UserController extends Controller ...@@ -75,7 +75,6 @@ class UserController extends Controller
$id = Auth()->user()->id; $id = Auth()->user()->id;
$user = User::find($id); $user = User::find($id);
if ($request->tipo != "proponente") { if ($request->tipo != "proponente") {
$validated = $request->validate([ $validated = $request->validate([
'name' => ['required', 'string', 'max:255'], 'name' => ['required', 'string', 'max:255'],
'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'],
...@@ -83,21 +82,6 @@ class UserController extends Controller ...@@ -83,21 +82,6 @@ class UserController extends Controller
'celular' => ['required', 'string'], 'celular' => ['required', 'string'],
'cpf' => ['required', 'cpf'], 'cpf' => ['required', 'cpf'],
]); ]);
} else if ($user->tipo == 'participante') {
$validated = $request->validate([
'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
'cpf' => ['required', 'cpf', 'unique:users'],
'rg' => ['required', 'unique:participantes'],
'celular' => ['required', 'string', 'telefone'],
'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'],
'instituicaoSelect' => ['required_without:instituicao'],
'outroCursoEstudante' => ['required_if:cursoEstudante,Outro', 'max:255'],
'cursoEstudante' => ['required_without:outroCursoEstudante'],
'perfil' => ['required'],
'linkLattes' => ['required'],
]);
} else { } else {
$validated = $request->validate([ $validated = $request->validate([
'name' => ['required', 'string', 'max:255'], 'name' => ['required', 'string', 'max:255'],
...@@ -126,6 +110,24 @@ class UserController extends Controller ...@@ -126,6 +110,24 @@ class UserController extends Controller
]); ]);
} }
if ($user->tipo == 'participante') {
$validated = $request->validate([
'name' => ['required', 'string', 'max:255'],
'email' => ['required_if:alterarSenhaCheckBox,on', 'string', 'email', 'max:255', Rule::unique('users')->ignore($user->id)],
'password' => ['required_if:alterarSenhaCheckBox,on', 'string', 'min:8', 'confirmed'],
'cpf' => ['required', 'cpf', Rule::unique('users')->ignore($user->id)],
'rg' => ['required', Rule::unique('participantes')->ignore($user->participantes->first()->id)],
'celular' => ['required', 'string', 'telefone'],
'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'],
'instituicaoSelect' => ['required_without:instituicao'],
'outroCursoEstudante' => ['required_if:cursoEstudante,Outro', 'max:255'],
'cursoEstudante' => ['required_without:outroCursoEstudante'],
'perfil' => ['required'],
'linkLattes' => ['required', 'url'],
]);
}
if ($request->alterarSenhaCheckBox != null) { if ($request->alterarSenhaCheckBox != null) {
if (!(Hash::check($request->senha_atual, $user->password))) { if (!(Hash::check($request->senha_atual, $user->password))) {
return redirect()->back()->withErrors(['senha_atual' => 'Senha atual não correspondente']); return redirect()->back()->withErrors(['senha_atual' => 'Senha atual não correspondente']);
...@@ -135,13 +137,13 @@ class UserController extends Controller ...@@ -135,13 +137,13 @@ class UserController extends Controller
return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']); return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']);
} }
} }
if($user->avaliadors != null && $request->area != null && $user->tipo == "avaliador"){ if($user->avaliadors != null && $request->area != null && $user->tipo == "avaliador"){
$avaliador = Avaliador::where('user_id', '=', $id)->first(); $avaliador = Avaliador::where('user_id', '=', $id)->first();
$avaliador->user_id = $user->id; $avaliador->user_id = $user->id;
//$avaliador->area_id = $request->area; //$avaliador->area_id = $request->area;
$avaliador->naturezas()->sync($request->natureza); $avaliador->naturezas()->sync($request->natureza);
$avaliador->update(); $avaliador->update();
} }
...@@ -259,7 +261,7 @@ class UserController extends Controller ...@@ -259,7 +261,7 @@ class UserController extends Controller
if($user->endereco()->first() == null){ if($user->endereco()->first() == null){
$endereco = Endereco::create(); $endereco = Endereco::create();
$endereco->user()->save($user); $endereco->user()->save($user);
} }
if ($user->participantes()->exists() && $user->participantes()->first()->curso_id) if ($user->participantes()->exists() && $user->participantes()->first()->curso_id)
...@@ -290,5 +292,5 @@ class UserController extends Controller ...@@ -290,5 +292,5 @@ class UserController extends Controller
'cursoPart' => $cursoPart, 'cursoPart' => $cursoPart,
'areaTematica' => $areaTematica 'areaTematica' => $areaTematica
]); ]);
} }
} }
resources/views/evento/formulario/integrantes.blade.php
View file @ 2b7850ea
...@@ -216,40 +216,63 @@ ...@@ -216,40 +216,63 @@
document.getElementById(`rg${modal_id}`).value = data[2]['rg']; document.getElementById(`rg${modal_id}`).value = data[2]['rg'];
document.getElementById(`rg${modal_id}`).setAttribute("readonly", ""); document.getElementById(`rg${modal_id}`).setAttribute("readonly", "");
document.getElementById(`celular${modal_id}`).value = data[0]['celular']; document.getElementById(`celular${modal_id}`).value = data[0]['celular'];
document.getElementById(`celular${modal_id}`).setAttribute("readonly", ""); document.getElementById(`celular${modal_id}`).setAttribute("readonly", "");
document.getElementById(`cep${modal_id}`).value = data[3]['cep']; if (data?.[3]?.cep) {
document.getElementById(`cep${modal_id}`).setAttribute("readonly", ""); document.getElementById(`cep${modal_id}`).value = data[3].cep;
document.getElementById(`cep${modal_id}`).setAttribute("readonly", "");
}
document.getElementById(`uf${modal_id}`).value = data[3]['uf']; if (data?.[3]?.cep) {
document.getElementById(`uf${modal_id}`).setAttribute("readonly", ""); document.getElementById(`cep${modal_id}`).value = data[3].cep;
document.getElementById(`cep${modal_id}`).setAttribute("readonly", "");
}
document.getElementById(`cidade${modal_id}`).value = data[3]['cidade']; if (data?.[3]?.uf) {
document.getElementById(`cidade${modal_id}`).setAttribute("readonly", ""); document.getElementById(`uf${modal_id}`).value = data[3].uf;
document.getElementById(`uf${modal_id}`).setAttribute("readonly", "");
document.getElementById(`bairro${modal_id}`).value = data[3]['bairro']; }
document.getElementById(`bairro${modal_id}`).setAttribute("readonly", "");
document.getElementById(`rua${modal_id}`).value = data[3]['rua']; if (data?.[3]?.cidade) {
document.getElementById(`rua${modal_id}`).setAttribute("readonly", ""); document.getElementById(`cidade${modal_id}`).value = data[3].cidade;
document.getElementById(`cidade${modal_id}`).setAttribute("readonly", "");
document.getElementById(`numero${modal_id}`).value = data[3]['numero']; }
document.getElementById(`numero${modal_id}`).setAttribute("readonly", "");
if (data?.[3]?.bairro) {
document.getElementById(`complemento${modal_id}`).value = data[3]['complemento']; document.getElementById(`bairro${modal_id}`).value = data[3].bairro;
document.getElementById(`complemento${modal_id}`).setAttribute("readonly", ""); document.getElementById(`bairro${modal_id}`).setAttribute("readonly", "");
}
document.getElementById(`instituicao[${modal_id}]`).value = data[0]['instituicao'];
document.getElementById(`instituicao[${modal_id}]`).setAttribute("readonly", ""); if (data?.[3]?.rua) {
document.getElementById(`rua${modal_id}`).value = data[3].rua;
document.getElementById(`rua${modal_id}`).setAttribute("readonly", "");
}
if (data?.[3]?.numero) {
document.getElementById(`numero${modal_id}`).value = data[3].numero;
document.getElementById(`numero${modal_id}`).setAttribute("readonly", "");
}
if (data?.[3]?.complemento) {
document.getElementById(`complemento${modal_id}`).value = data[3].complemento;
document.getElementById(`complemento${modal_id}`).setAttribute("readonly", "");
}
if (data?.[0]?.instituicao) {
document.getElementById(`instituicao[${modal_id}]`).value = data[0].instituicao;
document.getElementById(`instituicao[${modal_id}]`).setAttribute("readonly", "");
}
if (data?.[2]?.curso) {
document.getElementById(`curso[${modal_id}]`).value = data[2].curso;
document.getElementById(`curso[${modal_id}]`).setAttribute("readonly", "");
}
document.getElementById(`curso[${modal_id}]`).value = data[2]['curso'];
document.getElementById(`curso[${modal_id}]`).setAttribute("readonly", "");
console.log(document.getElementById(`funcaoParticipante${modal_id}`)); console.log(document.getElementById(`funcaoParticipante${modal_id}`));
document.getElementById(`funcaoParticipante${modal_id}`).value = data[1]['nome']; document.getElementById(`funcaoParticipante${modal_id}`).value = data[1]['nome'];
if(data[1].nome != "Bolsista" && data[1].nome != "Voluntário"){ if(data[1].nome != "Bolsista" && data[1].nome != "Voluntário"){
document.getElementById(`plano-titulo${modal_id}`).setAttribute('hidden', ""); document.getElementById(`plano-titulo${modal_id}`).setAttribute('hidden', "");
document.getElementById(`plano-nome${modal_id}`).setAttribute('hidden', ""); document.getElementById(`plano-nome${modal_id}`).setAttribute('hidden', "");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment