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
7dee742b
Unverified
Commit
7dee742b
authored
Jul 07, 2021
by
José Rômulo
Committed by
GitHub
Jul 07, 2021
Browse files
Merge branch 'lmts-ufape:master' into master
parents
55a0747c
14b8b4d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/TrabalhoController.php
View file @
7dee742b
...
...
@@ -847,12 +847,16 @@ class TrabalhoController extends Controller
}
DB
::
commit
();
if
(
!
$request
->
has
(
'rascunho'
)
)
{
Notification
::
send
(
Auth
::
user
(),
new
SubmissaoNotification
(
$id
));
}
else
{
}
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
'Proposta atualizada!'
]);
}
catch
(
\
Throwable
$th
)
{
DB
::
rollback
();
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
$th
->
getMessage
()]);
...
...
@@ -952,8 +956,13 @@ class TrabalhoController extends Controller
$trabalho
->
save
();
DB
::
commit
();
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
'Proposta submetida!'
]);
if
(
!
$request
->
has
(
'rascunho'
)
)
{
Notification
::
send
(
Auth
::
user
(),
new
SubmissaoNotification
(
$trabalho
->
id
));
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
'Proposta submetida!'
]);
}
else
{
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
'Rascunho salvo!'
]);
}
}
catch
(
\
Throwable
$th
)
{
DB
::
rollback
();
return
redirect
(
route
(
'proponente.projetos'
))
->
with
([
'mensagem'
=>
$th
->
getMessage
()]);
...
...
resources/views/projeto/formularioVisualizar/proponente.blade.php
View file @
7dee742b
...
...
@@ -45,7 +45,7 @@
</div>
<div
class=
"form-group col-md-6"
>
<label
for=
"pontuacaoPlanilha"
>
Valor da planilha de pontuação
<span
style=
"color: red; font-weight:bold"
>
*
</span></label>
<input
class=
"form-control @error('pontuacaoPlanilha') is-invalid @enderror"
type=
"number"
min=
"0"
name=
"pontuacaoPlanilha"
<input
class=
"form-control @error('pontuacaoPlanilha') is-invalid @enderror"
type=
"number"
min=
"0"
step=
".01"
name=
"pontuacaoPlanilha"
value=
"{{ $projeto->pontuacaoPlanilha }}"
disabled
>
@error('pontuacaoPlanilha')
...
...
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