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
ebee9f0d
"resources/views/projeto/editaFormulario/projeto.blade.php" did not exist on "1a944ec7ad10f34b2d2e509aa8b4fd6475e3e8e9"
Commit
ebee9f0d
authored
Mar 17, 2022
by
KelwinJonas
Browse files
Adicionar instituicao de vinculo do avaliador no convite/cadastro
parent
49b52ab0
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/AdministradorController.php
View file @
ebee9f0d
...
...
@@ -607,6 +607,14 @@ class AdministradorController extends Controller
$area
=
Area
::
where
(
'id'
,
$request
->
area_id
)
->
first
();
$user
=
User
::
where
(
'email'
,
$emailAvaliador
)
->
first
();
if
(
$request
->
instituicao
==
"ufape"
){
$nomeInstituicao
=
"Universidade Federal do Agreste de Pernambuco"
;
$externoInterno
=
"Interno"
;
}
else
{
$nomeInstituicao
=
$request
->
outra
;
$externoInterno
=
"Externo"
;
}
//existe o caso de enviar o convite de novo para um mesmo usuário
// if(isset($user->avaliadors->eventos->where('id', $evento->id)->first()->pivot->convite) ){
// return redirect()->back()->with(['mensagem' => 'Usuário já recebeu um convite e está pendente']);
...
...
@@ -629,6 +637,7 @@ class AdministradorController extends Controller
'usuarioTemp'
=>
false
,
'name'
=>
$nomeAvaliador
,
'tipo'
=>
'avaliador'
,
'instituicao'
=>
$nomeInstituicao
,
]);
$user
->
markEmailAsVerified
();
...
...
@@ -636,6 +645,7 @@ class AdministradorController extends Controller
if
(
$user
->
avaliadors
==
null
){
$avaliador
=
new
Avaliador
();
$avaliador
->
tipo
=
$externoInterno
;
$avaliador
->
save
();
$avaliador
->
area
()
->
associate
(
$area
);
$avaliador
->
user
()
->
associate
(
$user
);
...
...
resources/views/administrador/selecionarAvaliadores.blade.php
View file @
ebee9f0d
...
...
@@ -152,16 +152,16 @@
<
input
type
=
"hidden"
name
=
"evento_id"
value
=
"{{
$evento->id
}}"
>
<
div
class
=
"form-group"
>
<
label
for
=
"exampleInputEmail1"
>
Nome
Completo
<
span
style
=
"color: red;"
>*</
span
></
label
>
<
input
type
=
"text"
class
=
"form-control"
name
=
"nomeAvaliador"
id
=
"exampleInputNome1"
>
<
input
type
=
"text"
class
=
"form-control"
name
=
"nomeAvaliador"
id
=
"exampleInputNome1"
required
>
</
div
>
<
div
class
=
"form-group"
>
<
label
for
=
"exampleInputEmail1"
>
Email
<
span
style
=
"color: red;"
>*</
span
></
label
>
<
input
type
=
"email"
class
=
"form-control"
name
=
"emailAvaliador"
id
=
"exampleInputEmail1"
>
<
input
type
=
"email"
class
=
"form-control"
name
=
"emailAvaliador"
id
=
"exampleInputEmail1"
required
>
</
div
>
<
div
class
=
"form-group"
>
<
label
for
=
"grandeArea"
class
=
"col-form-label"
>
{{
__
(
'Grande Área'
)
}}
<
span
style
=
"color: red; font-weight:bold"
>*</
span
></
label
>
<
select
class
=
"form-control"
id
=
"grandeArea"
name
=
"grande_area_id"
onchange
=
"areas()"
>
<
select
class
=
"form-control"
id
=
"grandeArea"
name
=
"grande_area_id"
onchange
=
"areas()"
required
>
<
option
value
=
""
disabled
selected
hidden
>--
Grande
Área
--</
option
>
@
foreach
(
$grandeAreas
as
$grandeArea
)
<
option
value
=
"
{
{$grandeArea->id}}">{{$grandeArea->nome}
}
</option>
...
...
@@ -169,7 +169,7 @@
</select>
<label for="
area
" class="
col
-
form
-
label
">{{ __('Área') }} <span style="
color
:
red
;
font
-
weight
:
bold
">*</span></label>
<select class="
form
-
control
@
error
(
'area'
)
is
-
invalid
@
enderror
" id="
area
" name="
area_id
" >
<select class="
form
-
control
@
error
(
'area'
)
is
-
invalid
@
enderror
" id="
area
" name="
area_id
"
required
>
<option value="" disabled selected hidden>-- Área --</option>
</select>
</div>
...
...
@@ -180,6 +180,25 @@
</select>
</div>
<div class="
form
-
group
">
<label for="
exampleFormControlSelect1
">Instituição <span style="
color
:
red
;
font
-
weight
:
bold
">*</span></label>
<select class="
form
-
control
" name="
instituicao
" id="
membro
" required onchange="
mostrarDiv
(
this
)
">
<option value="" disabled>-- Selecione a instituição --</option>
<option value="
ufape
" >Universidade Federal do Agreste de Pernambuco</option>
<option value="
outra
" >Outra</option>
</select>
</div>
<div class="
form
-
group
" id="
div
-
outra
" style="
@
if
(
old
(
'instituicao'
)
!=
null
&&
old
(
'instituicao'
)
==
"outra"
)
display
:
block
;
@
else
display
:
none
;
@
endif
">
<label for="
outra
">{{ __('Digite o nome da instituição') }}<span style="
color
:
red
;
font
-
weight
:
bold
;
"> *</span></label>
<input id="
outra
" class="
form
-
control
@
error
(
'outra'
)
is
-
invalid
@
enderror
" type="
text
" name="
outra
" value="
{{
old
(
'outra'
)}}
" autocomplete="
outra
" placeholder="
Universidade
Federal
...
">
@error('outra')
<div id="
validationServer03Feedback
" class="
invalid
-
feedback
">
{{
$message
}}
</div>
@enderror
</div>
<div class="
form
-
group
" style="
margin
-
top
:
40
px
;
margin
-
bottom
:
40
px
;
">
<button type="
submit
" class="
btn
btn
-
info
" style="
width
:
100
%
">Enviar</button>
</div>
...
...
@@ -254,5 +273,15 @@
})
}
function mostrarDiv(select) {
if(select.value == "
outra
") {
document.getElementById('div-outra').style.display = "
block
";
$("
#outra").prop('required',true);
}
else
if
(
select
.
value
==
"ufape"
){
document
.
getElementById
(
'div-outra'
)
.
style
.
display
=
"none"
;
$
(
"#outra"
)
.
prop
(
'required'
,
false
);
}
}
</
script
>
@
endsection
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