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
a24cb148
Commit
a24cb148
authored
3 years ago
by
José Rômulo
Browse files
Options
Download
Email Patches
Plain Diff
Reenvio de email, email para avaliador ja cadastra
parent
10fc053d
master
carl-branch
dependabot/composer/dompdf/dompdf-1.2.2
dependabot/composer/guzzlehttp/guzzle-6.5.8
dependabot/composer/guzzlehttp/psr7-1.8.5
dependabot/composer/symfony/http-kernel-4.4.50
dependabot/npm_and_yarn/axios-0.21.2
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
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/Http/Controllers/AdministradorController.php
+34
-10
app/Http/Controllers/AdministradorController.php
resources/views/administrador/selecionarAvaliadores.blade.php
+8
-2
...urces/views/administrador/selecionarAvaliadores.blade.php
routes/web.php
+1
-0
routes/web.php
with
43 additions
and
12 deletions
+43
-12
app/Http/Controllers/AdministradorController.php
View file @
a24cb148
...
...
@@ -410,7 +410,11 @@ class AdministradorController extends Controller
$aval
=
Avaliador
::
where
(
'id'
,
$request
->
avaliador_id
)
->
first
();
$aval
->
eventos
()
->
attach
(
$evento
);
$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
();
...
...
@@ -472,13 +476,13 @@ class AdministradorController extends Controller
$passwordTemporario
=
Str
::
random
(
8
);
$subject
=
"Convite para avaliar projetos da UFAPE"
;
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
{
$passwordTemporario
=
Str
::
random
(
8
);
$subject
=
"Convite para avaliar projetos da UFAPE"
;
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
([
'email'
=>
$emailAvaliador
,
'password'
=>
bcrypt
(
$passwordTemporario
),
...
...
@@ -488,7 +492,7 @@ class AdministradorController extends Controller
]);
}
if
(
$user
->
avaliadors
==
null
){
$avaliador
=
new
Avaliador
();
$avaliador
->
save
();
$avaliador
->
area
()
->
associate
(
$area
);
...
...
@@ -497,10 +501,30 @@ class AdministradorController extends Controller
$user
->
save
();
$avaliador
->
save
();
}
else
{
$avaliador
=
$user
->
avaliadors
;
$avaliador
->
eventos
()
->
attach
(
$evento
);
$user
->
save
();
$avaliador
->
save
();
}
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) {
// return Storage::download($request->anexo);
// }
...
...
This diff is collapsed.
Click to expand it.
resources/views/administrador/selecionarAvaliadores.blade.php
View file @
a24cb148
...
...
@@ -102,13 +102,19 @@
@
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"
>
@
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-danger"
@
if
(
$avaliador
->
trabalhos
->
where
(
'evento_id'
,
$evento
->
id
)
->
count
()
!=
0
)
disabled
=
"disabled"
@
endif
>
Remover
</
button
>
</
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
>
</
tr
>
@
endforeach
...
...
This diff is collapsed.
Click to expand it.
routes/web.php
View file @
a24cb148
...
...
@@ -175,6 +175,7 @@ Route::prefix('usuarios')->name('admin.')->group(function(){
Route
::
post
(
'/removerAvalEvento'
,
'AdministradorController@remover'
)
->
name
(
'remover'
);
Route
::
post
(
'/atribuirAvaliadorProjeto'
,
'AdministradorController@atribuicaoProjeto'
)
->
name
(
'atribuicao.projeto'
);
Route
::
post
(
'/enviarConviteAvaliador'
,
'AdministradorController@enviarConvite'
)
->
name
(
'enviarConvite'
);
Route
::
post
(
'/reenviarConviteAvaliador'
,
'AdministradorController@reenviarConvite'
)
->
name
(
'reenviarConvite'
);
Route
::
post
(
'/visualizarParecer'
,
'AdministradorController@visualizarParecer'
)
->
name
(
'visualizarParecer'
);
Route
::
get
(
'/pareceresProjetos'
,
'AdministradorController@pareceres'
)
->
name
(
'pareceres'
);
Route
::
get
(
'/analisarProjetos'
,
'AdministradorController@analisar'
)
->
name
(
'analisar'
);
...
...
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