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
253c5cdb
Commit
253c5cdb
authored
Apr 09, 2022
by
Guilherme Silva
Browse files
Adicionada pontuação ao parecer externo caso o edital seja pibex
parent
fc44964c
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/Avaliador.php
View file @
253c5cdb
...
...
@@ -19,7 +19,7 @@ class Avaliador extends Model
return
$this
->
belongsTo
(
'App\User'
);
}
public
function
trabalhos
(){
return
$this
->
belongsToMany
(
'App\Trabalho'
)
->
withPivot
(
'status'
,
'AnexoParecer'
,
'parecer'
,
'recomendacao'
,
'created_at'
);
return
$this
->
belongsToMany
(
'App\Trabalho'
)
->
withPivot
(
'status'
,
'AnexoParecer'
,
'parecer'
,
'recomendacao'
,
'created_at'
,
'pontuacao'
);
}
public
function
planoTrabalhos
(){
return
$this
->
belongsToMany
(
'App\Arquivo'
,
'avaliadors_plano_trabalho'
)
->
withPivot
(
'status'
,
'AnexoParecer'
,
'parecer'
,
'recomendacao'
,
'created_at'
);
...
...
app/Http/Controllers/AvaliadorController.php
View file @
253c5cdb
...
...
@@ -194,18 +194,27 @@ class AvaliadorController extends Controller
$trabalho
->
save
();
$data
=
Carbon
::
now
(
'America/Recife'
);
if
(
$request
->
anexoParecer
==
''
){
if
(
$evento
->
tipo
==
"PIBEX"
){
$avaliador
->
trabalhos
()
->
updateExistingPivot
(
$trabalho
->
id
,[
'status'
=>
1
,
'parecer'
=>
$request
->
textParecer
,
'recomendacao'
=>
$request
->
recomendacao
,
'created_at'
=>
$data
,
'pontuacao'
=>
$request
->
pontuacao
]);
}
else
{
$avaliador
->
trabalhos
()
->
updateExistingPivot
(
$trabalho
->
id
,[
'status'
=>
1
,
'parecer'
=>
$request
->
textParecer
,
'recomendacao'
=>
$request
->
recomendacao
,
'created_at'
=>
$data
]);
->
updateExistingPivot
(
$trabalho
->
id
,[
'status'
=>
1
,
'parecer'
=>
$request
->
textParecer
,
'recomendacao'
=>
$request
->
recomendacao
,
'created_at'
=>
$data
]);
}
}
else
{
$anexoParecer
=
$request
->
anexoParecer
;
$path
=
'anexoParecer/'
.
$avaliador
->
id
.
$trabalho
->
id
.
'/'
;
$nome
=
$anexoParecer
->
getClientOriginalName
();
Storage
::
putFileAs
(
$path
,
$anexoParecer
,
$nome
);
$anexoParecer
=
$path
.
$nome
;
$avaliador
->
trabalhos
()
->
updateExistingPivot
(
$trabalho
->
id
,[
'status'
=>
1
,
'parecer'
=>
$request
->
textParecer
,
'AnexoParecer'
=>
$anexoParecer
,
'recomendacao'
=>
$request
->
recomendacao
,
'created_at'
=>
$data
]);
Storage
::
putFileAs
(
$path
,
$anexoParecer
,
$nome
);
$anexoParecer
=
$path
.
$nome
;
if
(
$evento
->
tipo
==
"PIBEX"
){
$avaliador
->
trabalhos
()
->
updateExistingPivot
(
$trabalho
->
id
,[
'status'
=>
1
,
'parecer'
=>
$request
->
textParecer
,
'AnexoParecer'
=>
$anexoParecer
,
'recomendacao'
=>
$request
->
recomendacao
,
'created_at'
=>
$data
,
'pontuacao'
=>
$request
->
pontuacao
]);
}
else
{
$avaliador
->
trabalhos
()
->
updateExistingPivot
(
$trabalho
->
id
,[
'status'
=>
1
,
'parecer'
=>
$request
->
textParecer
,
'AnexoParecer'
=>
$anexoParecer
,
'recomendacao'
=>
$request
->
recomendacao
,
'created_at'
=>
$data
]);
}
}
...
...
app/Parecer.php
View file @
253c5cdb
...
...
@@ -12,7 +12,7 @@ class Parecer extends Model
* @var array
*/
protected
$fillable
=
[
'resultado'
,
'revisorId'
,
'trabalhoId'
,
'resultado'
,
'revisorId'
,
'trabalhoId'
];
public
function
user
(){
...
...
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