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
efc95cd6
Commit
efc95cd6
authored
2 years ago
by
GuilhermeGz
Browse files
Options
Download
Email Patches
Plain Diff
Retirada do envio de emails para administradores
parent
a1ef52cb
master
carl-branch
dependabot/composer/dompdf/dompdf-1.2.2
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
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/Http/Controllers/ArquivoController.php
+0
-30
app/Http/Controllers/ArquivoController.php
app/Http/Controllers/TrabalhoController.php
+0
-15
app/Http/Controllers/TrabalhoController.php
with
0 additions
and
45 deletions
+0
-45
app/Http/Controllers/ArquivoController.php
View file @
efc95cd6
...
@@ -149,21 +149,6 @@ class ArquivoController extends Controller
...
@@ -149,21 +149,6 @@ class ArquivoController extends Controller
$notificacao
->
save
();
$notificacao
->
save
();
Notification
::
send
(
$userTemp
,
new
RelatorioRecebimentoNotification
(
$arquivo
->
trabalho
->
id
,
$userTemp
,
Notification
::
send
(
$userTemp
,
new
RelatorioRecebimentoNotification
(
$arquivo
->
trabalho
->
id
,
$userTemp
,
$arquivo
->
trabalho
->
evento
->
nome
,
$arquivo
->
trabalho
->
titulo
,
'Parcial'
));
$arquivo
->
trabalho
->
evento
->
nome
,
$arquivo
->
trabalho
->
titulo
,
'Parcial'
));
//Admins
$admins
=
Administrador
::
all
();
foreach
(
$admins
as
$admin
)
{
$userTemp
=
User
::
find
(
$admin
->
user_id
);
$notificacao
=
Notificacao
::
create
([
'remetente_id'
=>
Auth
::
user
()
->
id
,
'destinatario_id'
=>
$admin
->
user_id
,
'trabalho_id'
=>
$arquivo
->
trabalho
->
id
,
'lido'
=>
false
,
'tipo'
=>
3
,
]);
$notificacao
->
save
();
Notification
::
send
(
$userTemp
,
new
RelatorioRecebimentoNotification
(
$arquivo
->
trabalho
->
id
,
$userTemp
,
$arquivo
->
trabalho
->
evento
->
nome
,
$arquivo
->
trabalho
->
titulo
,
'Parcial'
));
}
}
}
if
(
$request
->
relatorioFinal
!=
null
)
{
if
(
$request
->
relatorioFinal
!=
null
)
{
...
@@ -180,21 +165,6 @@ class ArquivoController extends Controller
...
@@ -180,21 +165,6 @@ class ArquivoController extends Controller
$notificacao
->
save
();
$notificacao
->
save
();
Notification
::
send
(
$userTemp
,
new
RelatorioRecebimentoNotification
(
$arquivo
->
trabalho
->
id
,
$userTemp
,
Notification
::
send
(
$userTemp
,
new
RelatorioRecebimentoNotification
(
$arquivo
->
trabalho
->
id
,
$userTemp
,
$arquivo
->
trabalho
->
evento
->
nome
,
$arquivo
->
trabalho
->
titulo
,
'Final'
));
$arquivo
->
trabalho
->
evento
->
nome
,
$arquivo
->
trabalho
->
titulo
,
'Final'
));
//Admins
$admins
=
Administrador
::
all
();
foreach
(
$admins
as
$admin
)
{
$userTemp
=
User
::
find
(
$admin
->
user_id
);
$notificacao
=
Notificacao
::
create
([
'remetente_id'
=>
Auth
::
user
()
->
id
,
'destinatario_id'
=>
$admin
->
user_id
,
'trabalho_id'
=>
$arquivo
->
trabalho
->
id
,
'lido'
=>
false
,
'tipo'
=>
4
,
]);
$notificacao
->
save
();
Notification
::
send
(
$userTemp
,
new
RelatorioRecebimentoNotification
(
$arquivo
->
trabalho
->
id
,
$userTemp
,
$arquivo
->
trabalho
->
evento
->
nome
,
$arquivo
->
trabalho
->
titulo
,
'Final'
));
}
}
}
$arquivo
->
save
();
$arquivo
->
save
();
return
redirect
(
route
(
'planos.listar'
,
[
'id'
=>
$request
->
projId
]))
->
with
([
'sucesso'
=>
"Relatório enviado com sucesso"
]);
return
redirect
(
route
(
'planos.listar'
,
[
'id'
=>
$request
->
projId
]))
->
with
([
'sucesso'
=>
"Relatório enviado com sucesso"
]);
...
...
This diff is collapsed.
Click to expand it.
app/Http/Controllers/TrabalhoController.php
View file @
efc95cd6
...
@@ -1122,21 +1122,6 @@ class TrabalhoController extends Controller
...
@@ -1122,21 +1122,6 @@ class TrabalhoController extends Controller
]);
]);
$notificacao
->
save
();
$notificacao
->
save
();
Notification
::
send
(
Auth
::
user
(),
new
SubmissaoNotification
(
$trabalho
->
id
,
$trabalho
->
titulo
));
Notification
::
send
(
Auth
::
user
(),
new
SubmissaoNotification
(
$trabalho
->
id
,
$trabalho
->
titulo
));
//Admins
$admins
=
App\Administrador
::
all
();
foreach
(
$admins
as
$admin
)
{
$userTemp
=
User
::
find
(
$admin
->
user_id
);
$notificacao
=
App\Notificacao
::
create
([
'remetente_id'
=>
Auth
::
user
()
->
id
,
'destinatario_id'
=>
$admin
->
user_id
,
'trabalho_id'
=>
$trabalho
->
id
,
'lido'
=>
false
,
'tipo'
=>
1
,
]);
$notificacao
->
save
();
Notification
::
send
(
$userTemp
,
new
SubmissaoRecebidaNotification
(
$trabalho
->
id
,
$trabalho
->
titulo
,
$userTemp
));
}
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
'Proposta submetida!'
]);
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
'Proposta submetida!'
]);
...
...
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