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
5ac2f872
Commit
5ac2f872
authored
2 years ago
by
Lucas Henrique
Browse files
Options
Download
Email Patches
Plain Diff
Resolve bug de consistência das informações do plano de trabalho
parent
80b785de
master
carl-branch
excluir_projeto_submetido
updates_mar
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
app/Http/Requests/UpdateTrabalho.php
+3
-3
app/Http/Requests/UpdateTrabalho.php
resources/views/avaliador/listarTrabalhos.blade.php
+2
-2
resources/views/avaliador/listarTrabalhos.blade.php
resources/views/projeto/editaFormulario/proponente.blade.php
+6
-3
resources/views/projeto/editaFormulario/proponente.blade.php
resources/views/projeto/formularioVisualizar/proponente2.blade.php
+5
-2
.../views/projeto/formularioVisualizar/proponente2.blade.php
with
16 additions
and
10 deletions
+16
-10
app/Http/Requests/UpdateTrabalho.php
View file @
5ac2f872
...
...
@@ -71,9 +71,9 @@ class UpdateTrabalho extends FormRequest
}
}
}
else
{
$
proponente
=
Proponente
::
find
(
$projeto
->
proponente_id
);
$rules
[
'anexoPlanoTrabalho'
]
=
[
Rule
::
requiredIf
(
$
proponente
->
planoTrabalh
o
==
null
)];
$rules
[
'nomePlanoTrabalho'
]
=
[
Rule
::
requiredIf
(
$
proponente
->
planoTrabalh
o
->
titulo
==
null
),
'string'
];
$
arquivo
=
Arquivo
::
where
(
"trabalhoId"
,
$projeto
->
id
)
->
first
(
);
$rules
[
'anexoPlanoTrabalho'
]
=
[
Rule
::
requiredIf
(
$
arquiv
o
==
null
)];
$rules
[
'nomePlanoTrabalho'
]
=
[
Rule
::
requiredIf
(
$
arquiv
o
->
titulo
==
null
),
'string'
];
}
// dd($this->all());
...
...
This diff is collapsed.
Click to expand it.
resources/views/avaliador/listarTrabalhos.blade.php
View file @
5ac2f872
...
...
@@ -87,7 +87,7 @@
<
td
>
@
if
(
$evento
->
numParticipantes
==
0
)
@
php
$planoTrabalho
=
$trabalho
->
proponente
->
planoTrabalho
$planoTrabalho
=
App\Arquivo
::
where
(
"trabalhoId"
,
$trabalho
->
id
)
->
first
();
@
endphp
<
a
href
=
"{{ route('baixar.plano', ['id' =>
$planoTrabalho->id
]) }}"
target
=
"_new"
style
=
"font-size: 20px; color: #114048ff;"
class
=
"btn btn-light"
>
<
img
class
=
""
src
=
"
{
{asset('img/icons/file-download-solid.svg')}
}
"
style
=
"width:15px"
>
...
...
@@ -198,7 +198,7 @@
<
td
style
=
"text-align: center"
>
@
if
(
$evento
->
numParticipantes
==
0
)
@
php
$planoTrabalho
=
$trabalho
->
proponente
->
planoTrabalho
$planoTrabalho
=
App\Arquivo
::
where
(
"trabalhoId"
,
$trabalho
->
id
)
->
first
();
@
endphp
<
a
href
=
"{{ route('baixar.plano', ['id' =>
$planoTrabalho->id
]) }}"
target
=
"_new"
style
=
"font-size: 20px; color: #114048ff;"
class
=
"btn btn-light"
>
<
img
class
=
""
src
=
"
{
{asset('img/icons/file-download-solid.svg')}
}
"
style
=
"width:15px"
>
...
...
This diff is collapsed.
Click to expand it.
resources/views/projeto/editaFormulario/proponente.blade.php
View file @
5ac2f872
...
...
@@ -97,13 +97,16 @@
@endif
@if ($edital->numParticipantes == 0)
@php
$arquivo = App\Arquivo::where("trabalhoId", $projeto->id)->first();
@endphp
<div
class=
"col-md-3"
>
<br>
<label
for=
"nomePlanoTrabalho"
class=
"col-form-label font-tam"
style=
"font-weight: bold"
>
{{ __('Título do plano de trabalho: ') }}
<span
style=
"color: red; font-weight:bold"
>
*
</span></label>
</div>
<div
class=
"col-md-9"
>
<br>
<input
type=
"text"
class=
"form-control"
value=
"{{old('nomePlanoTrabalho') ?? $
proponente->planoTrabalh
o->titulo ?? "
"
}}"
name=
"nomePlanoTrabalho"
maxlength=
"255"
id=
"nomePlanoTrabalho"
required
>
<input
type=
"text"
class=
"form-control"
value=
"{{old('nomePlanoTrabalho') ?? $
arquiv
o->titulo ?? "
"
}}"
name=
"nomePlanoTrabalho"
maxlength=
"255"
id=
"nomePlanoTrabalho"
required
>
<span
style=
"color: red; font-size: 12px"
id=
"caracsRestantesnomePlanoTrabalho"
>
</span>
@error('nomePlanoTrabalho')
...
...
@@ -117,9 +120,9 @@
<br>
<label
for=
"anexoPlanoTrabalho"
class=
"col-form-label font-tam"
style=
"font-weight: bold"
>
{{ __('Anexo do plano de trabalho: ') }}
<span
style=
"color: red; font-weight:bold"
>
*
</span></label>
@if ($proponente != null
&&
$
proponente->planoTrabalh
o)
@if ($proponente != null
&&
$
arquiv
o)
<a
style=
"margin-left: 5px"
href=
"{{ route('baixar.plano', ['id' => $
proponente->planoTrabalh
o->id]) }}"
>
href=
"{{ route('baixar.plano', ['id' => $
arquiv
o->id]) }}"
>
<i
class=
"fas fa-file-pdf fa-2x"
></i></a>
@else
<p><i
class=
"fas fa-times-circle fa-2x"
></i></p>
...
...
This diff is collapsed.
Click to expand it.
resources/views/projeto/formularioVisualizar/proponente2.blade.php
View file @
5ac2f872
...
...
@@ -77,15 +77,18 @@
@endif
@if ($edital->numParticipantes == 0)
@php
$arquivo = App\Arquivo::where("trabalhoId", $projeto->id)->first();
@endphp
<div
class=
"col-md-12"
>
<br>
<b
style=
"color: #4D4D4D;"
>
Título do Plano de Trabalho:
</b>
<a
style=
"color: #4D4D4D;"
>
{{$
projeto->proponente->planoTrabalh
o->titulo}}
</a>
<a
style=
"color: #4D4D4D;"
>
{{$
arquiv
o->titulo}}
</a>
</div>
<div
class=
"col-sm-4"
style=
"float: left"
>
<label
for=
"anexoProjeto"
class=
"col-form-label font-tam"
style=
"font-weight: bold"
>
{{ __('Anexo do Plano de Trabalho: ') }}
</label>
<a
href=
"{{ route('baixar.plano', ['id' => $
projeto->proponente->planoTrabalh
o->id]) }}"
><img
class=
""
src=
"{{asset('img/icons/pdf.ico')}}"
style=
"width:40px"
alt=
""
></a>
<a
href=
"{{ route('baixar.plano', ['id' => $
arquiv
o->id]) }}"
><img
class=
""
src=
"{{asset('img/icons/pdf.ico')}}"
style=
"width:40px"
alt=
""
></a>
</div>
@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
Menu
Projects
Groups
Snippets
Help