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
46d2122b
Commit
46d2122b
authored
2 years ago
by
GuilhermeGz
Browse files
Options
Download
Email Patches
Plain Diff
mudança na exibição de avaliação de relatório quando se tem substituição pendente
parent
1c991cce
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
resources/views/administrador/analisarProposta.blade.php
+10
-8
resources/views/administrador/analisarProposta.blade.php
with
10 additions
and
8 deletions
+10
-8
resources/views/administrador/analisarProposta.blade.php
View file @
46d2122b
...
@@ -503,7 +503,7 @@
...
@@ -503,7 +503,7 @@
<
div
class
=
"form-row mt-3"
>
<
div
class
=
"form-row mt-3"
>
<
div
class
=
"col-sm-9"
><
h5
style
=
"color: #234B8B; font-weight: bold"
>
Relatórios
</
h5
></
div
>
<
div
class
=
"col-sm-9"
><
h5
style
=
"color: #234B8B; font-weight: bold"
>
Relatórios
</
h5
></
div
>
<
div
class
=
"col-sm-3 text-sm-right"
>
<
div
class
=
"col-sm-3 text-sm-right"
>
@
if
(
$
flagS
ubstituic
a
o
==
1
)
@
if
(
$
s
ubstituico
esPendentes
->
count
()
==
0
)
<
a
href
=
"{{route('planos.listar', ['id' =>
$trabalho->id
])}}"
class
=
"button"
>
Listar
<
a
href
=
"{{route('planos.listar', ['id' =>
$trabalho->id
])}}"
class
=
"button"
>
Listar
Relatórios
</
a
>
Relatórios
</
a
>
@
else
@
else
...
@@ -558,8 +558,8 @@
...
@@ -558,8 +558,8 @@
<
div
class
=
"form-row mt-3"
>
<
div
class
=
"form-row mt-3"
>
<
div
class
=
"col-sm-11"
><
h5
style
=
"color: #234B8B; font-weight: bold"
>
Avaliações
de
<
div
class
=
"col-sm-11"
><
h5
style
=
"color: #234B8B; font-weight: bold"
>
Avaliações
de
Relatórios
</
h5
></
div
>
Relatórios
</
h5
></
div
>
@
if
((
$evento
->
dt_fimRelatorioParcial
<
$hoje
&&
$hoje
<
$evento
->
dt_inicioRelatorioFinal
)
@
if
((
(
$evento
->
dt_fimRelatorioParcial
<
$hoje
&&
$hoje
<
$evento
->
dt_inicioRelatorioFinal
)
||
(
$hoje
>
$evento
->
dt_fimRelatorioFinal
))
||
(
$hoje
>
$evento
->
dt_fimRelatorioFinal
))
&&
(
$substituicoesPendentes
->
count
()
==
0
)
)
<
div
class
=
"col-md-1 text-sm-right"
>
<
div
class
=
"col-md-1 text-sm-right"
>
<
a
type
=
"button"
value
=
"{{
$trabalho->id
}}"
id
=
"atribuir1"
data
-
toggle
=
"modal"
<
a
type
=
"button"
value
=
"{{
$trabalho->id
}}"
id
=
"atribuir1"
data
-
toggle
=
"modal"
data
-
target
=
"#avaliacaoRelatorioModal"
>
data
-
target
=
"#avaliacaoRelatorioModal"
>
...
@@ -574,6 +574,7 @@
...
@@ -574,6 +574,7 @@
</
div
>
</
div
>
@
endif
@
endif
<!--
Modal
-->
<!--
Modal
-->
@
if
(
$substituicoesPendentes
->
count
()
==
0
)
<
div
class
=
"modal fade"
id
=
"avaliacaoRelatorioModal"
data
-
bs
-
backdrop
=
"static"
<
div
class
=
"modal fade"
id
=
"avaliacaoRelatorioModal"
data
-
bs
-
backdrop
=
"static"
data
-
bs
-
keyboard
=
"false"
tabindex
=
"-1"
aria
-
labelledby
=
"staticBackdropLabel"
data
-
bs
-
keyboard
=
"false"
tabindex
=
"-1"
aria
-
labelledby
=
"staticBackdropLabel"
aria
-
hidden
=
"true"
style
=
"overflow-y: auto"
>
aria
-
hidden
=
"true"
style
=
"overflow-y: auto"
>
...
@@ -582,7 +583,7 @@
...
@@ -582,7 +583,7 @@
<
div
class
=
"modal-header modal-header-submeta"
>
<
div
class
=
"modal-header modal-header-submeta"
>
<
div
class
=
"col-md-8"
style
=
"padding-left: 0px"
>
<
div
class
=
"col-md-8"
style
=
"padding-left: 0px"
>
<
h5
class
=
"modal-title titulo-table"
id
=
"avaliacaoModalLongTitle"
>
<
h5
class
=
"modal-title titulo-table"
id
=
"avaliacaoModalLongTitle"
>
@
if
(
isset
(
$participa
nte
->
planoTrabalho
)
)
Seleciones
o
(
s
)
avaliador
(
es
)
@
else
Pendências
de
Substituição
@
endif
</
h5
>
@
if
(
$substituicoesPende
nte
s
->
count
()
==
0
)
Seleciones
o
(
s
)
avaliador
(
es
)
@
else
Pendências
de
Substituição
@
endif
</
h5
>
</
div
>
</
div
>
<
div
class
=
"col-md-4"
style
=
"text-align: right"
>
<
div
class
=
"col-md-4"
style
=
"text-align: right"
>
<
button
type
=
"button"
id
=
"enviarConviteButton"
class
=
"btn btn-info"
<
button
type
=
"button"
id
=
"enviarConviteButton"
class
=
"btn btn-info"
...
@@ -676,6 +677,7 @@
...
@@ -676,6 +677,7 @@
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
@
endif
</
div
>
</
div
>
<
hr
style
=
"border-top: 1px solid#1492E6"
>
<
hr
style
=
"border-top: 1px solid#1492E6"
>
...
...
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