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
63792b7d
Commit
63792b7d
authored
May 13, 2023
by
Edgarvital
Browse files
Resolução de conflito
parents
daea650d
f6261e2e
Changes
2
Show whitespace changes
Inline
Side-by-side
database/seeders/UsuarioSeeder.php
View file @
63792b7d
...
@@ -76,7 +76,6 @@ class UsuarioSeeder extends Seeder
...
@@ -76,7 +76,6 @@ class UsuarioSeeder extends Seeder
]);
]);
DB
::
table
(
'users'
)
->
insert
([
DB
::
table
(
'users'
)
->
insert
([
'name'
=>
'Participante1'
,
'name'
=>
'Participante1'
,
'email'
=>
'part1@ufrpe.br'
,
'email'
=>
'part1@ufrpe.br'
,
'password'
=>
Hash
::
make
(
'12345678'
),
'password'
=>
Hash
::
make
(
'12345678'
),
...
...
resources/views/evento/formulario/integrantes.blade.php
View file @
63792b7d
...
@@ -62,15 +62,18 @@
...
@@ -62,15 +62,18 @@
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@elseif($funcao->nome != "Consultor" && $funcao->nome != "Pesquisador" && $funcao->nome != "Voluntário")
@elseif($funcao->nome != "Consultor" && $funcao->nome != "Pesquisador" && $funcao->nome != "Voluntário")
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@endif
@endif
@else
@else
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
<option value="{{$funcao->id}}">{{ $funcao->nome }}</option>
@endif
@endif
-->
-->
@endforeach
@endforeach
...
...
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