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
7745900e
Commit
7745900e
authored
3 years ago
by
unknown
Browse files
Options
Download
Email Patches
Plain Diff
Correção do erro ao arquivar
parent
84dcee23
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
resources/views/administrador/analisarProposta.blade.php
+19
-22
resources/views/administrador/analisarProposta.blade.php
with
19 additions
and
22 deletions
+19
-22
resources/views/administrador/analisarProposta.blade.php
View file @
7745900e
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
<
div
class
=
"col-md-12"
>
<
div
class
=
"col-md-12"
>
<
h5
style
=
"color: #234B8B; font-weight: bold"
>
Informações
da
Proposta
<
h5
style
=
"color: #234B8B; font-weight: bold"
>
Informações
da
Proposta
@
if
(
$trabalho
->
arquivado
==
false
)
@
if
(
$trabalho
->
arquivado
==
false
)
<
a
title
=
"Arquivar"
href
=
'javascript:arquivar.submit()'
>
<
a
title
=
"Arquivar"
href
=
'javascript:arquivar.submit()'
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#ed1212"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"
></
path
><
line
x1
=
"12"
y1
=
"11"
x2
=
"12"
y2
=
"17"
></
line
><
line
x1
=
"9"
y1
=
"14"
x2
=
"15"
y2
=
"14"
></
line
></
svg
>
</
a
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#ed1212"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"
></
path
><
line
x1
=
"12"
y1
=
"11"
x2
=
"12"
y2
=
"17"
></
line
><
line
x1
=
"9"
y1
=
"14"
x2
=
"15"
y2
=
"14"
></
line
></
svg
>
</
a
>
<
form
method
=
"GET"
name
=
'arquivar'
action
=
'{{route('
projeto
.
arquivar
')}}'
>
<
form
method
=
"GET"
name
=
'arquivar'
action
=
'{{route('
projeto
.
arquivar
')}}'
>
@
csrf
@
csrf
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
</
form
>
</
form
>
@
else
@
else
<
a
title
=
"Desarquivar"
href
=
'javascript:arquivar.submit()'
>
<
a
title
=
"Desarquivar"
href
=
'javascript:arquivar.submit()'
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#
ed1212
"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"
/></
svg
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#
808080
"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"
/></
svg
>
</
a
>
</
a
>
<
form
method
=
"GET"
name
=
'arquivar'
action
=
'{{route('
projeto
.
arquivar
')}}'
>
<
form
method
=
"GET"
name
=
'arquivar'
action
=
'{{route('
projeto
.
arquivar
')}}'
>
@
csrf
@
csrf
...
@@ -176,18 +176,19 @@
...
@@ -176,18 +176,19 @@
<
h5
class
=
"modal-title"
id
=
"exampleModalLabel"
style
=
"color:#1492E6"
>
<
h5
class
=
"modal-title"
id
=
"exampleModalLabel"
style
=
"color:#1492E6"
>
Informações
Participante
Informações
Participante
@
if
(
$participante
->
planoTrabalho
->
arquivado
==
false
)
@
if
(
$participante
->
planoTrabalho
->
arquivado
==
false
)
<
a
title
=
"Arquivar"
href
=
'javascript:arquivar2.submit()'
>
<
a
title
=
"Arquivar"
href
=
'javascript:arquivar1{{$participante->id}}.submit()'
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#ed1212"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"
></
path
><
line
x1
=
"12"
y1
=
"11"
x2
=
"12"
y2
=
"17"
></
line
><
line
x1
=
"9"
y1
=
"14"
x2
=
"15"
y2
=
"14"
></
line
></
svg
>
</
a
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#ed1212"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5l2 3h9a2 2 0 0 1 2 2z"
></
path
><
line
x1
=
"12"
y1
=
"11"
x2
=
"12"
y2
=
"17"
></
line
><
line
x1
=
"9"
y1
=
"14"
x2
=
"15"
y2
=
"14"
></
line
></
svg
>
</
a
>
<
form
method
=
"GET"
name
=
'arquivar
2
'
action
=
'{{route('
arquivo
.
arquivar
')}}'
>
<
form
method
=
"GET"
name
=
'arquivar
1{{$participante->id}}
'
action
=
'{{route('
arquivo
.
arquivar
')}}'
>
@
csrf
@
csrf
<
input
value
=
'{{$participante->planoTrabalho->id}}'
name
=
'arquivo_id'
type
=
'hidden'
/>
<
input
value
=
'{{$participante->planoTrabalho->id}}'
name
=
'arquivo_id'
type
=
'hidden'
/>
<
input
value
=
'1'
name
=
'arquivar_tipo'
type
=
'hidden'
/>
<
input
value
=
'1'
name
=
'arquivar_tipo'
type
=
'hidden'
/>
</
form
>
</
form
>
@
else
@
else
<
a
title
=
"Desarquivar"
href
=
'javascript:arquivar2.submit()'
>
<
a
title
=
"Desarquivar"
href
=
'javascript:arquivar2
{{$participante->id}}
.submit()'
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#
ed1212
"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"
/></
svg
>
<
svg
xmlns
=
"http://www.w3.org/2000/svg"
width
=
"24"
height
=
"24"
viewBox
=
"0 0 24 24"
fill
=
"none"
stroke
=
"#
808080
"
stroke
-
width
=
"2"
stroke
-
linecap
=
"round"
stroke
-
linejoin
=
"round"
><
path
d
=
"M22 19a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5c0-1.1.9-2 2-2h5l2 3h9a2 2 0 0 1 2 2v11zM9.9 16.1L14 12M9.9 11.9L14 16"
/></
svg
>
</
a
>
</
a
>
<
form
method
=
"GET"
name
=
'arquivar2'
action
=
'{{route('
arquivo
.
arquivar
')}}'
>
<
form
method
=
"GET"
name
=
'arquivar2
{{$participante->id}}
'
action
=
'{{route('
arquivo
.
arquivar
')}}'
>
@
csrf
@
csrf
<
input
value
=
'{{$participante->planoTrabalho->id}}'
name
=
'arquivo_id'
type
=
'hidden'
/>
<
input
value
=
'{{$participante->planoTrabalho->id}}'
name
=
'arquivo_id'
type
=
'hidden'
/>
<
input
value
=
'0'
name
=
'arquivar_tipo'
type
=
'hidden'
/>
<
input
value
=
'0'
name
=
'arquivar_tipo'
type
=
'hidden'
/>
...
@@ -901,9 +902,10 @@
...
@@ -901,9 +902,10 @@
href
=
"{{ route('admin.visualizarParecerInterno', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
Avaliado
</
a
>
@
endif
href
=
"{{ route('admin.visualizarParecerInterno', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
Avaliado
</
a
>
@
endif
</
h9
>
</
h9
>
<
br
>
<
br
>
{{
--
<
a
href
=
"{{ route('admin.removerProjAval', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
<
a
href
=
"{{ route('admin.removerProjAval', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
Remover
Remover
</
a
>--
}}
</
a
>
<
br
>
<
a
href
=
"{{ route('admin.reenviar.atribuicao.projeto', ['evento_id' =>
$evento->id
, 'avaliador_id'=>
$avaliador->id
, 'trabalho_id' =>
$trabalho->id
]) }}"
>
<
a
href
=
"{{ route('admin.reenviar.atribuicao.projeto', ['evento_id' =>
$evento->id
, 'avaliador_id'=>
$avaliador->id
, 'trabalho_id' =>
$trabalho->id
]) }}"
>
Reenviar
convite
Reenviar
convite
</
a
>
</
a
>
...
@@ -938,10 +940,10 @@
...
@@ -938,10 +940,10 @@
href
=
"{{ route('admin.visualizarParecerInterno', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
Avaliado
</
a
>
@
endif
href
=
"{{ route('admin.visualizarParecerInterno', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
Avaliado
</
a
>
@
endif
</
h9
>
</
h9
>
@
endif
@
endif
{{
--
<
br
>
<
br
>
<
a
href
=
"{{ route('admin.removerProjAval', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
<
a
href
=
"{{ route('admin.removerProjAval', ['trabalho_id' =>
$trabalho->id
, 'avaliador_id' =>
$avaliador->id
]) }}"
>
Remover
Remover
</
a
>
--
}}
</
a
>
<
br
>
<
br
>
<
a
href
=
"{{ route('admin.reenviar.atribuicao.projeto', ['evento_id' =>
$evento->id
, 'avaliador_id'=>
$avaliador->id
, 'trabalho_id' =>
$trabalho->id
]) }}"
>
<
a
href
=
"{{ route('admin.reenviar.atribuicao.projeto', ['evento_id' =>
$evento->id
, 'avaliador_id'=>
$avaliador->id
, 'trabalho_id' =>
$trabalho->id
]) }}"
>
Reenviar
convite
Reenviar
convite
...
@@ -963,7 +965,7 @@
...
@@ -963,7 +965,7 @@
<
div
class
=
"card-body"
style
=
"padding-top: 0.2rem;"
>
<
div
class
=
"card-body"
style
=
"padding-top: 0.2rem;"
>
<
div
class
=
"container"
>
<
div
class
=
"container"
>
<
div
class
=
"form-row mt-3"
>
<
div
class
=
"form-row mt-3"
>
<
div
class
=
"col-md-11"
><
h5
style
=
"color: #234B8B; font-weight: bold"
>
Recomendação
</
h5
></
div
>
<
div
class
=
"col-md-11"
><
h5
style
=
"color: #234B8B; font-weight: bold"
>
Recomendação
da
Proposta
</
h5
></
div
>
</
div
>
</
div
>
<
hr
style
=
"border-top: 1px solid#1492E6"
>
<
hr
style
=
"border-top: 1px solid#1492E6"
>
<
form
action
=
"{{ route('trabalho.aprovarProposta', ['id' =>
$trabalho->id
]) }}"
method
=
"post"
>
<
form
action
=
"{{ route('trabalho.aprovarProposta', ['id' =>
$trabalho->id
]) }}"
method
=
"post"
>
...
@@ -982,12 +984,7 @@
...
@@ -982,12 +984,7 @@
@
if
(
$trabalho
->
status
==
"aprovado"
)
checked
@
endif
>
@
if
(
$trabalho
->
status
==
"aprovado"
)
checked
@
endif
>
<
a
style
=
"color: #234B8B; font-weight: bold;font-size: 18px;"
>
Recomendado
</
a
>
<
a
style
=
"color: #234B8B; font-weight: bold;font-size: 18px;"
>
Recomendado
</
a
>
<
br
>
<
br
>
<
input
class
=
"col-md-1"
type
=
"radio"
id
=
"parcialAprovado"
name
=
"statusProp"
value
=
"corrigido"
required
@
if
(
$trabalho
->
status
==
"corrigido"
)
checked
@
endif
>
<
a
style
=
"color: #234B8B; font-weight: bold;font-size: 18px;"
>
Parcialmente
Recomendado
</
a
>
<
br
>
<
input
class
=
"col-md-1"
type
=
"radio"
id
=
"reprovado"
name
=
"statusProp"
<
input
class
=
"col-md-1"
type
=
"radio"
id
=
"reprovado"
name
=
"statusProp"
value
=
"reprovado"
required
value
=
"reprovado"
required
@
if
(
$trabalho
->
status
==
"reprovado"
)
checked
@
endif
>
@
if
(
$trabalho
->
status
==
"reprovado"
)
checked
@
endif
>
...
...
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