Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Walter Felipe
submeta
Commits
7c6239e0
Commit
7c6239e0
authored
May 27, 2022
by
Guilherme Silva
Browse files
Retirada de restrição de alguns campos obrigatorios para coordenador, como cpf, celular, etc.
parent
645a89ca
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/AdministradorController.php
View file @
7c6239e0
...
...
@@ -245,7 +245,19 @@ class AdministradorController extends Controller
public
function
salvar
(
Request
$request
)
{
if
(
$request
->
tipo
!=
"proponente"
)
{
if
(
$request
->
tipo
==
"coordenador"
)
{
$validated
=
$request
->
validate
([
'name'
=>
[
'required'
,
'string'
,
'max:255'
],
'tipo'
=>
[
'required'
],
'email'
=>
[
'required'
,
'string'
,
'email'
,
'max:255'
,
'unique:users'
],
'instituicao'
=>
[
'required_if:instituicaoSelect,Outra'
,
'max:255'
],
'instituicaoSelect'
=>
[
'required_without:instituicao'
],
'senha'
=>
[
'required'
,
'min:8'
],
'confirmar_senha'
=>
[
'required'
,
'min:8'
],
'celular'
=>
(
$request
[
'celular'
]
!=
null
?
'required|string|telefone'
:
'nullable'
),
'cpf'
=>
(
$request
[
'cpf'
]
!=
null
?
'required|cpf|unique:users'
:
'nullable'
),
]);
}
else
if
(
$request
->
tipo
!=
"proponente"
)
{
$validated
=
$request
->
validate
([
'name'
=>
[
'required'
,
'string'
,
'max:255'
],
'tipo'
=>
[
'required'
],
...
...
@@ -377,7 +389,18 @@ class AdministradorController extends Controller
public
function
update
(
Request
$request
,
$id
)
{
$user
=
User
::
find
(
$id
);
if
(
$request
->
tipo
!=
"proponente"
)
{
if
(
$request
->
tipo
==
"coordenador"
)
{
$validated
=
$request
->
validate
([
'name'
=>
[
'required'
,
'string'
,
'max:255'
],
'tipo'
=>
[
'required'
],
'email'
=>
[
'required'
,
'string'
,
'email'
,
'max:255'
,
'unique:users'
],
'instituicao'
=>
[
'required_if:instituicaoSelect,Outra'
,
'max:255'
],
'instituicaoSelect'
=>
[
'required_without:instituicao'
],
'celular'
=>
(
$request
[
'celular'
]
!=
null
?
'required|string|telefone'
:
'nullable'
),
'cpf'
=>
(
$request
[
'cpf'
]
!=
null
?
'required|cpf|unique:users'
:
'nullable'
),
]);
}
else
if
(
$request
->
tipo
!=
"proponente"
)
{
$validated
=
$request
->
validate
([
'name'
=>
[
'required'
,
'string'
,
'max:255'
],
'tipo'
=>
[
'required'
],
...
...
resources/views/administrador/editar_user.blade.php
View file @
7c6239e0
...
...
@@ -27,7 +27,7 @@
<
div
class
=
"col-md-4"
>
<
label
for
=
"cpf"
class
=
"col-form-label"
>
{{
__
(
'CPF*'
)
}}
</
label
>
<
input
id
=
"cpf"
type
=
"text"
class
=
"form-control @error('cpf') is-invalid @enderror"
name
=
"cpf"
value
=
"{{
$user->cpf
}}"
required
autocomplete
=
"cpf"
autofocus
>
<
input
id
=
"cpf"
type
=
"text"
class
=
"form-control @error('cpf') is-invalid @enderror"
name
=
"cpf"
value
=
"{{
$user->cpf
}}"
autocomplete
=
"cpf"
autofocus
>
@
error
(
'cpf'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
...
...
@@ -78,7 +78,7 @@
</
div
>
<
div
class
=
"col-md-2"
>
<
label
for
=
"celular"
class
=
"col-form-label"
>
{{
__
(
'Celular*'
)
}}
</
label
>
<
input
id
=
"celular"
type
=
"text"
class
=
"form-control @error('celular') is-invalid @enderror"
name
=
"celular"
value
=
"{{
$user->celular
}}"
required
autocomplete
=
"celular"
autofocus
>
<
input
id
=
"celular"
type
=
"text"
class
=
"form-control @error('celular') is-invalid @enderror"
name
=
"celular"
value
=
"{{
$user->celular
}}"
autocomplete
=
"celular"
autofocus
>
@
error
(
'celular'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
...
...
resources/views/administrador/novo_user.blade.php
View file @
7c6239e0
...
...
@@ -28,7 +28,7 @@
<
div
class
=
"col-md-4"
>
<
label
for
=
"cpf"
class
=
"col-form-label"
>
{{
__
(
'CPF*'
)
}}
</
label
>
<
input
id
=
"cpf"
type
=
"text"
class
=
"form-control @error('cpf') is-invalid @enderror"
name
=
"cpf"
value
=
"{{ old('cpf') }}"
required
autocomplete
=
"cpf"
autofocus
>
<
input
id
=
"cpf"
type
=
"text"
class
=
"form-control @error('cpf') is-invalid @enderror"
name
=
"cpf"
value
=
"{{ old('cpf') }}"
autocomplete
=
"cpf"
autofocus
>
@
error
(
'cpf'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
...
...
@@ -85,7 +85,7 @@
<
div
class
=
"col-md-2"
>
<
label
for
=
"celular"
class
=
"col-form-label"
>
{{
__
(
'Celular*'
)
}}
</
label
>
<
input
id
=
"celular"
type
=
"text"
class
=
"form-control @error('celular') is-invalid @enderror"
name
=
"celular"
value
=
"{{ old('celular') }}"
required
autocomplete
=
"celular"
autofocus
>
<
input
id
=
"celular"
type
=
"text"
class
=
"form-control @error('celular') is-invalid @enderror"
name
=
"celular"
value
=
"{{ old('celular') }}"
autocomplete
=
"celular"
autofocus
>
@
error
(
'celular'
)
<
span
class
=
"invalid-feedback"
role
=
"alert"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment