Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
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
d7a3dc68
Commit
d7a3dc68
authored
3 years ago
by
Guilherme Silva
Browse files
Options
Download
Email Patches
Plain Diff
Adicionado envio de email ao avaliador externo com o formulário de avaliação
parent
0436bbd1
master
carl-branch
dependabot/composer/dompdf/dompdf-1.2.2
dependabot/composer/guzzlehttp/guzzle-6.5.8
dependabot/composer/symfony/http-kernel-4.4.50
dependabot/npm_and_yarn/decode-uri-component-0.2.2
dependabot/npm_and_yarn/express-4.18.2
dependabot/npm_and_yarn/json5-and-json5-2.2.3
dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2
dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8
dependabot/npm_and_yarn/qs-and-express-6.11.0
excluir_projeto_submetido
updates_mar
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/Http/Controllers/AdministradorController.php
+8
-2
app/Http/Controllers/AdministradorController.php
app/Notifications/AtribuicaoAvaliadorExternoNotification.php
+72
-0
app/Notifications/AtribuicaoAvaliadorExternoNotification.php
with
80 additions
and
2 deletions
+80
-2
app/Http/Controllers/AdministradorController.php
View file @
d7a3dc68
...
@@ -32,6 +32,8 @@ use App\Mail\EmailLembrete;
...
@@ -32,6 +32,8 @@ use App\Mail\EmailLembrete;
use
Illuminate\Pagination\Paginator
;
use
Illuminate\Pagination\Paginator
;
use
Illuminate\Support\Collection
;
use
Illuminate\Support\Collection
;
use
Illuminate\Pagination\LengthAwarePaginator
;
use
Illuminate\Pagination\LengthAwarePaginator
;
use
Illuminate\Support\Facades\Notification
;
use
App\Notifications\AtribuicaoAvaliadorExternoNotification
;
class
AdministradorController
extends
Controller
class
AdministradorController
extends
Controller
{
{
...
@@ -147,8 +149,6 @@ class AdministradorController extends Controller
...
@@ -147,8 +149,6 @@ class AdministradorController extends Controller
$trabalhos
=
$trabalhos
->
sort
(
function
(
$item
,
$next
)
{
$trabalhos
=
$trabalhos
->
sort
(
function
(
$item
,
$next
)
{
return
$item
->
pontuacao
>=
$next
->
pontuacao
?
-
1
:
1
;
return
$item
->
pontuacao
>=
$next
->
pontuacao
?
-
1
:
1
;
});
});
$trabalhos
=
$this
->
paginate
(
$trabalhos
)
->
withPath
(
'/usuarios/showResultados?evento_id='
.
$evento
->
id
);;
return
view
(
'administrador.resultadosProjetos'
)
->
with
([
'evento'
=>
$evento
,
'trabalhos'
=>
$trabalhos
]);
return
view
(
'administrador.resultadosProjetos'
)
->
with
([
'evento'
=>
$evento
,
'trabalhos'
=>
$trabalhos
]);
}
}
...
@@ -575,6 +575,9 @@ class AdministradorController extends Controller
...
@@ -575,6 +575,9 @@ class AdministradorController extends Controller
$trabalho
->
save
();
$trabalho
->
save
();
foreach
(
$avaliadores
as
$avaliador
){
foreach
(
$avaliadores
as
$avaliador
){
$userTemp
=
User
::
find
(
$avaliador
->
user
->
id
);
$notificacao
=
Notificacao
::
create
([
$notificacao
=
Notificacao
::
create
([
'remetente_id'
=>
Auth
::
user
()
->
id
,
'remetente_id'
=>
Auth
::
user
()
->
id
,
'destinatario_id'
=>
$avaliador
->
user_id
,
'destinatario_id'
=>
$avaliador
->
user_id
,
...
@@ -583,6 +586,9 @@ class AdministradorController extends Controller
...
@@ -583,6 +586,9 @@ class AdministradorController extends Controller
'tipo'
=>
5
,
'tipo'
=>
5
,
]);
]);
$notificacao
->
save
();
$notificacao
->
save
();
if
(
$avaliador
->
tipo
==
"Externo"
){
Notification
::
send
(
$userTemp
,
new
AtribuicaoAvaliadorExternoNotification
(
$userTemp
,
$trabalho
));
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/Notifications/AtribuicaoAvaliadorExternoNotification.php
0 → 100644
View file @
d7a3dc68
<?php
namespace
App\Notifications
;
use
Illuminate\Bus\Queueable
;
use
Illuminate\Support\Facades\Auth
;
use
Illuminate\Notifications\Notification
;
use
Illuminate\Contracts\Queue\ShouldQueue
;
use
Illuminate\Notifications\Messages\MailMessage
;
class
AtribuicaoAvaliadorExternoNotification
extends
Notification
{
use
Queueable
;
public
$data
;
public
$url
;
/**
* Create a new notification instance.
*
* @return void
*/
public
function
__construct
(
$usuario
,
$trabalho
)
{
$this
->
data
=
date
(
'd/m/Y \à\s H:i\h'
,
strtotime
(
now
()));
$url
=
"/avaliador/editais"
;
$this
->
url
=
url
(
$url
);
$this
->
user
=
$usuario
;
$this
->
titulo
=
$trabalho
->
titulo
;
$this
->
trabalho
=
$trabalho
;
}
/**
* Get the notification's delivery channels.
*
* @param mixed $notifiable
* @return array
*/
public
function
via
(
$notifiable
)
{
return
[
'mail'
];
}
/**
* Get the mail representation of the notification.
*
* @param mixed $notifiable
* @return \Illuminate\Notifications\Messages\MailMessage
*/
public
function
toMail
(
$notifiable
)
{
return
(
new
MailMessage
)
->
subject
(
'Sistema Submeta - Avaliar proposta / projeto'
)
->
greeting
(
"Saudações!"
)
->
line
(
"Prezado avaliador, você foi convidado a avaliar a proposta / projeto intitulada(o)
{
$this
->
titulo
}
."
)
->
action
(
'Acessar'
,
$this
->
url
)
->
attach
(
storage_path
()
.
"/app/pdfFormAvalExterno/
{
$this
->
trabalho
->
evento_id
}
/formulario de avaliação externo.pdf"
)
->
markdown
(
'vendor.notifications.email'
);
}
/**
* Get the array representation of the notification.
*
* @param mixed $notifiable
* @return array
*/
public
function
toArray
(
$notifiable
)
{
return
[
//
];
}
}
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help