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
a24cb148
Commit
a24cb148
authored
Jul 21, 2021
by
José Rômulo
Browse files
Reenvio de email, email para avaliador ja cadastra
parent
10fc053d
Changes
3
Show whitespace changes
Inline
Side-by-side
app/Http/Controllers/AdministradorController.php
View file @
a24cb148
...
@@ -410,7 +410,11 @@ class AdministradorController extends Controller
...
@@ -410,7 +410,11 @@ class AdministradorController extends Controller
$aval
=
Avaliador
::
where
(
'id'
,
$request
->
avaliador_id
)
->
first
();
$aval
=
Avaliador
::
where
(
'id'
,
$request
->
avaliador_id
)
->
first
();
$aval
->
eventos
()
->
attach
(
$evento
);
$aval
->
eventos
()
->
attach
(
$evento
);
$aval
->
save
();
$aval
->
save
();
$user
=
$aval
->
user
()
->
first
();
$subject
=
"Convite para avaliar projetos da UFAPE"
;
Mail
::
to
(
$user
->
email
)
->
send
(
new
EmailParaUsuarioNaoCadastrado
(
$user
->
name
,
' '
,
'Avaliador-Cadastrado'
,
$evento
->
nome
,
' '
,
$subject
,
$evento
->
tipo
));
return
redirect
()
->
back
();
return
redirect
()
->
back
();
...
@@ -472,13 +476,13 @@ class AdministradorController extends Controller
...
@@ -472,13 +476,13 @@ class AdministradorController extends Controller
$passwordTemporario
=
Str
::
random
(
8
);
$passwordTemporario
=
Str
::
random
(
8
);
$subject
=
"Convite para avaliar projetos da UFAPE"
;
$subject
=
"Convite para avaliar projetos da UFAPE"
;
Mail
::
to
(
$emailAvaliador
)
Mail
::
to
(
$emailAvaliador
)
->
send
(
new
EmailParaUsuarioNaoCadastrado
(
$nomeAvaliador
,
' '
,
'Avaliador-Cadastrado'
,
$evento
->
nome
,
$passwordTemporario
,
$subject
));
->
send
(
new
EmailParaUsuarioNaoCadastrado
(
$nomeAvaliador
,
' '
,
'Avaliador-Cadastrado'
,
$evento
->
nome
,
$passwordTemporario
,
$subject
,
$evento
->
tipo
));
}
else
{
}
else
{
$passwordTemporario
=
Str
::
random
(
8
);
$passwordTemporario
=
Str
::
random
(
8
);
$subject
=
"Convite para avaliar projetos da UFAPE"
;
$subject
=
"Convite para avaliar projetos da UFAPE"
;
Mail
::
to
(
$emailAvaliador
)
Mail
::
to
(
$emailAvaliador
)
->
send
(
new
EmailParaUsuarioNaoCadastrado
(
$nomeAvaliador
,
' '
,
'Avaliador'
,
$evento
->
nome
,
$passwordTemporario
,
$subject
));
->
send
(
new
EmailParaUsuarioNaoCadastrado
(
$nomeAvaliador
,
' '
,
'Avaliador'
,
$evento
->
nome
,
$passwordTemporario
,
$subject
,
$evento
->
tipo
));
$user
=
User
::
create
([
$user
=
User
::
create
([
'email'
=>
$emailAvaliador
,
'email'
=>
$emailAvaliador
,
'password'
=>
bcrypt
(
$passwordTemporario
),
'password'
=>
bcrypt
(
$passwordTemporario
),
...
@@ -488,7 +492,7 @@ class AdministradorController extends Controller
...
@@ -488,7 +492,7 @@ class AdministradorController extends Controller
]);
]);
}
}
if
(
$user
->
avaliadors
==
null
){
$avaliador
=
new
Avaliador
();
$avaliador
=
new
Avaliador
();
$avaliador
->
save
();
$avaliador
->
save
();
$avaliador
->
area
()
->
associate
(
$area
);
$avaliador
->
area
()
->
associate
(
$area
);
...
@@ -497,10 +501,30 @@ class AdministradorController extends Controller
...
@@ -497,10 +501,30 @@ class AdministradorController extends Controller
$user
->
save
();
$user
->
save
();
$avaliador
->
save
();
$avaliador
->
save
();
}
else
{
$avaliador
=
$user
->
avaliadors
;
$avaliador
->
eventos
()
->
attach
(
$evento
);
$user
->
save
();
$avaliador
->
save
();
}
return
redirect
()
->
back
();
return
redirect
()
->
back
();
}
}
public
function
reenviarConvite
(
Request
$request
){
$evento
=
Evento
::
where
(
'id'
,
$request
->
evento_id
)
->
first
();
$avaliador
=
Avaliador
::
where
(
'id'
,
$request
->
avaliador_id
)
->
first
();
$user
=
$avaliador
->
user
()
->
first
();
$subject
=
"Convite para avaliar projetos da UFAPE - Reenvio"
;
Mail
::
to
(
$user
->
email
)
->
send
(
new
EmailParaUsuarioNaoCadastrado
(
$user
->
name
,
' '
,
'Avaliador-Cadastrado'
,
$evento
->
nome
,
''
,
$subject
,
$evento
->
tipo
));
return
redirect
()
->
back
();
}
// public function baixarAnexo(Request $request) {
// public function baixarAnexo(Request $request) {
// return Storage::download($request->anexo);
// return Storage::download($request->anexo);
// }
// }
...
...
resources/views/administrador/selecionarAvaliadores.blade.php
View file @
a24cb148
...
@@ -102,13 +102,19 @@
...
@@ -102,13 +102,19 @@
@
endif
@
endif
<
td
style
=
"text-align:center
"
>
<
td
@
if
(
$avaliador
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
!=
null
)
style
=
"text-align:center"
@
endif
style
=
"text-align:center; display:flex; justify-content: space-evenly
"
>
<
form
action
=
"{{ route('admin.remover') }}"
method
=
"POST"
>
<
form
action
=
"{{ route('admin.remover') }}"
method
=
"POST"
>
@
csrf
@
csrf
<
input
type
=
"hidden"
name
=
"avaliador_id"
value
=
"{{
$avaliador->id
}}"
>
<
input
type
=
"hidden"
name
=
"avaliador_id"
value
=
"{{
$avaliador->id
}}"
>
<
input
type
=
"hidden"
name
=
"evento_id"
value
=
"{{
$evento->id
}}"
>
<
input
type
=
"hidden"
name
=
"evento_id"
value
=
"{{
$evento->id
}}"
>
<
button
type
=
"submit"
class
=
"btn btn-danger"
@
if
(
$avaliador
->
trabalhos
->
where
(
'evento_id'
,
$evento
->
id
)
->
count
()
!=
0
)
disabled
=
"disabled"
@
endif
>
Remover
</
button
>
<
button
type
=
"submit"
class
=
"btn btn-danger"
@
if
(
$avaliador
->
trabalhos
->
where
(
'evento_id'
,
$evento
->
id
)
->
count
()
!=
0
)
disabled
=
"disabled"
@
endif
>
Remover
</
button
>
</
form
>
</
form
>
<
form
action
=
"{{ route('admin.reenviarConvite') }}"
method
=
"POST"
>
@
csrf
<
input
type
=
"hidden"
name
=
"avaliador_id"
value
=
"{{
$avaliador->id
}}"
>
<
input
type
=
"hidden"
name
=
"evento_id"
value
=
"{{
$evento->id
}}"
>
<
button
type
=
"submit"
class
=
"btn btn-secondary"
@
if
(
$avaliador
->
eventos
->
where
(
'id'
,
$evento
->
id
)
->
first
()
->
pivot
->
convite
!=
null
)
disabled
hidden
@
endif
>
Reenviar
convite
</
button
>
</
form
>
</
td
>
</
td
>
</
tr
>
</
tr
>
@
endforeach
@
endforeach
...
...
routes/web.php
View file @
a24cb148
...
@@ -175,6 +175,7 @@ Route::prefix('usuarios')->name('admin.')->group(function(){
...
@@ -175,6 +175,7 @@ Route::prefix('usuarios')->name('admin.')->group(function(){
Route
::
post
(
'/removerAvalEvento'
,
'AdministradorController@remover'
)
->
name
(
'remover'
);
Route
::
post
(
'/removerAvalEvento'
,
'AdministradorController@remover'
)
->
name
(
'remover'
);
Route
::
post
(
'/atribuirAvaliadorProjeto'
,
'AdministradorController@atribuicaoProjeto'
)
->
name
(
'atribuicao.projeto'
);
Route
::
post
(
'/atribuirAvaliadorProjeto'
,
'AdministradorController@atribuicaoProjeto'
)
->
name
(
'atribuicao.projeto'
);
Route
::
post
(
'/enviarConviteAvaliador'
,
'AdministradorController@enviarConvite'
)
->
name
(
'enviarConvite'
);
Route
::
post
(
'/enviarConviteAvaliador'
,
'AdministradorController@enviarConvite'
)
->
name
(
'enviarConvite'
);
Route
::
post
(
'/reenviarConviteAvaliador'
,
'AdministradorController@reenviarConvite'
)
->
name
(
'reenviarConvite'
);
Route
::
post
(
'/visualizarParecer'
,
'AdministradorController@visualizarParecer'
)
->
name
(
'visualizarParecer'
);
Route
::
post
(
'/visualizarParecer'
,
'AdministradorController@visualizarParecer'
)
->
name
(
'visualizarParecer'
);
Route
::
get
(
'/pareceresProjetos'
,
'AdministradorController@pareceres'
)
->
name
(
'pareceres'
);
Route
::
get
(
'/pareceresProjetos'
,
'AdministradorController@pareceres'
)
->
name
(
'pareceres'
);
Route
::
get
(
'/analisarProjetos'
,
'AdministradorController@analisar'
)
->
name
(
'analisar'
);
Route
::
get
(
'/analisarProjetos'
,
'AdministradorController@analisar'
)
->
name
(
'analisar'
);
...
...
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