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
260d27c5
Commit
260d27c5
authored
Feb 08, 2022
by
Guilherme Silva
Browse files
Adicionado comentario ao projeto
parent
289d4dad
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/TrabalhoController.php
View file @
260d27c5
...
...
@@ -1664,7 +1664,15 @@ class TrabalhoController extends Controller
public
function
aprovarProposta
(
Request
$request
,
$id
){
$trabalho
=
Trabalho
::
find
(
$id
);
$trabalho
->
status
=
$request
->
statusProb
;
$trabalho
->
status
=
$request
->
statusProp
;
$trabalho
->
comentario
=
$request
->
comentario
;
$trabalho
->
save
();
if
(
$request
->
statusProp
==
"aprovado"
){
return
redirect
()
->
back
()
->
with
([
'sucesso'
=>
'Projeto aprovado com sucesso'
]);
}
elseif
(
$request
->
statusProp
==
"reprovado"
){
return
redirect
()
->
back
()
->
with
([
'sucesso'
=>
'Projeto reprovado com sucesso'
]);
}
else
{
return
redirect
()
->
back
()
->
with
([
'sucesso'
=>
'Projeto parcialmente aprovado com sucesso'
]);
}
}}
\ No newline at end of file
app/Trabalho.php
View file @
260d27c5
...
...
@@ -18,7 +18,8 @@ class Trabalho extends Model
'decisaoCONSU'
,
'pontuacaoPlanilha'
,
'linkGrupoPesquisa'
,
'linkLattesEstudante'
,
'linkLattesEstudante'
,
'comentario'
,
'anexoDecisaoCONSU'
,
'anexoAutorizacaoComiteEtica'
,
...
...
database/migrations/2022_02_07_035323_add_trabalho_comentario.php
0 → 100644
View file @
260d27c5
<?php
use
Illuminate\Database\Migrations\Migration
;
use
Illuminate\Database\Schema\Blueprint
;
use
Illuminate\Support\Facades\Schema
;
class
AddTrabalhoComentario
extends
Migration
{
/**
* Run the migrations.
*
* @return void
*/
public
function
up
()
{
Schema
::
table
(
'trabalhos'
,
function
(
Blueprint
$table
)
{
$table
->
text
(
'comentario'
)
->
nullable
();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public
function
down
()
{
Schema
::
table
(
'trabalhos'
,
function
(
Blueprint
$table
)
{
$table
->
dropColumn
(
'comentario'
);
});
}
}
resources/views/projeto/formularioVisualizar/resultado.blade.php
0 → 100644
View file @
260d27c5
<!-- projeto -->
<div
class=
"col-md-10"
style=
"text-align: center; margin-top:2rem"
><h4
style=
"margin-top: 1rem;"
>
Situação Atual
</h4></div>
<div
class=
"col-md-10"
>
<div
class=
"card"
style=
"border-radius: 12px"
>
<div
class=
"card-body"
>
<div
class=
"container"
>
<div
class=
"form-row mt-3"
>
<div
class=
"col-md-12"
><h5
style=
"color: #1492E6; margin-bottom:-0.4rem"
>
Resultado
</h5></div>
<div
class=
"col-md-12"
style=
"margin-bottom: -0.8rem;"
><hr
style=
"border-top: 1px solid#1492E6"
></div>
<div
class=
"form-group col-md-12"
style=
"margin-top: 10px"
>
<label
for=
"statusProjeto"
class=
"col-form-label"
>
{{ __('Status') }}
</label>
<input
id=
"statusProjeto"
type=
"text"
class=
"form-control"
name=
"statusProjeto"
value=
"{{ $projeto->status }}"
autocomplete=
"statusProjeto"
disabled
>
</div>
<div
class=
"form-group col-md-12"
style=
"margin-top: 10px"
>
<label
for=
"comentarioProjeto"
class=
"col-form-label"
>
{{ __('Comentário') }}
</label>
<textarea
id=
"comentarioProjeto"
type=
"text"
class=
"form-control"
name=
"comentarioProjeto"
disabled
>
{{ $projeto->comentario }}
</textarea>
</div>
</div>
</div>
</div>
</div>
</div>
<!--X projeto X-->
\ No newline at end of file
resources/views/projeto/visualizar.blade.php
View file @
260d27c5
...
...
@@ -29,6 +29,12 @@
@
component
(
'projeto.formularioVisualizar.participantes'
,
[
'estados'
=>
$estados
,
'enum_turno'
=>
$enum_turno
,
'projeto'
=>
$projeto
,
'participantes'
=>
$participantes
,
'arquivos'
=>
$arquivos
])
@
endcomponent
@
if
(
$projeto
->
comentario
!=
null
)
@
component
(
'projeto.formularioVisualizar.resultado'
,
[
'projeto'
=>
$projeto
])
@
endcomponent
@
endif
{{
--
@
component
(
'projeto.formularioVisualizar.finalizar'
,
[
'projeto'
=>
$projeto
])
@
endcomponent
--
}}
...
...
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