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
a925c2e1
Unverified
Commit
a925c2e1
authored
Nov 04, 2023
by
Antônio Durval
Committed by
GitHub
Nov 04, 2023
Browse files
Merge pull request #934 from antonioDurval/master
correção na lógica da verificação das datas
parents
c20b6808
d767c5dc
Changes
1
Show whitespace changes
Inline
Side-by-side
resources/views/proponente/projetos.blade.php
View file @
a925c2e1
...
@@ -87,7 +87,11 @@
...
@@ -87,7 +87,11 @@
<
td
style
=
"text-align: center"
>
{{
date
(
'd-m-Y \à\s H:i\h'
,
strtotime
(
$projeto
->
updated_at
))
}}
</
td
>
<
td
style
=
"text-align: center"
>
{{
date
(
'd-m-Y \à\s H:i\h'
,
strtotime
(
$projeto
->
updated_at
))
}}
</
td
>
@
if
(
$projeto
->
status
!=
null
)
@
if
(
$projeto
->
status
!=
null
)
@
if
(
$projeto
->
status
===
"aprovado"
)
@
if
(
$projeto
->
status
===
"aprovado"
)
@
if
(
date
(
'd-m-Y'
)
>
date
(
'd-m-Y'
,
strtotime
(
$projeto
->
evento
->
fimProjeto
))
)
@
php
$hoje
=
\
Carbon\Carbon
::
now
();
$fimProjeto
=
\
Carbon\Carbon
::
parse
(
$projeto
->
evento
->
fimProjeto
);
@
endphp
@
if
(
$hoje
->
greaterThan
(
$fimProjeto
))
<
td
style
=
"color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;"
>
Finalizado
</
td
>
<
td
style
=
"color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;"
>
Finalizado
</
td
>
@
else
@
else
<
td
style
=
"color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;"
>
Em
Execução
</
td
>
<
td
style
=
"color: rgb(6, 85, 6); text-align: center;text-transform: capitalize;"
>
Em
Execução
</
td
>
...
...
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