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
253c5cdb
Commit
253c5cdb
authored
3 years ago
by
Guilherme Silva
Browse files
Options
Download
Email Patches
Plain Diff
Adicionada pontuação ao parecer externo caso o edital seja pibex
parent
fc44964c
master
carl-branch
dependabot/composer/dompdf/dompdf-1.2.2
dependabot/composer/guzzlehttp/guzzle-6.5.8
dependabot/composer/symfony/http-kernel-4.4.50
dependabot/npm_and_yarn/decode-uri-component-0.2.2
dependabot/npm_and_yarn/express-4.18.2
dependabot/npm_and_yarn/json5-and-json5-2.2.3
dependabot/npm_and_yarn/loader-utils-and-webpack-cli-1.4.2
dependabot/npm_and_yarn/minimist-and-mkdirp-1.2.8
dependabot/npm_and_yarn/qs-and-express-6.11.0
excluir_projeto_submetido
updates_mar
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/Avaliador.php
+1
-1
app/Avaliador.php
app/Http/Controllers/AvaliadorController.php
+16
-7
app/Http/Controllers/AvaliadorController.php
app/Parecer.php
+1
-1
app/Parecer.php
with
18 additions
and
9 deletions
+18
-9
app/Avaliador.php
View file @
253c5cdb
...
@@ -19,7 +19,7 @@ class Avaliador extends Model
...
@@ -19,7 +19,7 @@ class Avaliador extends Model
return
$this
->
belongsTo
(
'App\User'
);
return
$this
->
belongsTo
(
'App\User'
);
}
}
public
function
trabalhos
(){
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
(){
public
function
planoTrabalhos
(){
return
$this
->
belongsToMany
(
'App\Arquivo'
,
'avaliadors_plano_trabalho'
)
->
withPivot
(
'status'
,
'AnexoParecer'
,
'parecer'
,
'recomendacao'
,
'created_at'
);
return
$this
->
belongsToMany
(
'App\Arquivo'
,
'avaliadors_plano_trabalho'
)
->
withPivot
(
'status'
,
'AnexoParecer'
,
'parecer'
,
'recomendacao'
,
'created_at'
);
...
...
This diff is collapsed.
Click to expand it.
app/Http/Controllers/AvaliadorController.php
View file @
253c5cdb
...
@@ -194,18 +194,27 @@ class AvaliadorController extends Controller
...
@@ -194,18 +194,27 @@ class AvaliadorController extends Controller
$trabalho
->
save
();
$trabalho
->
save
();
$data
=
Carbon
::
now
(
'America/Recife'
);
$data
=
Carbon
::
now
(
'America/Recife'
);
if
(
$request
->
anexoParecer
==
''
){
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
()
$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
{
}
else
{
$anexoParecer
=
$request
->
anexoParecer
;
$anexoParecer
=
$request
->
anexoParecer
;
$path
=
'anexoParecer/'
.
$avaliador
->
id
.
$trabalho
->
id
.
'/'
;
$path
=
'anexoParecer/'
.
$avaliador
->
id
.
$trabalho
->
id
.
'/'
;
$nome
=
$anexoParecer
->
getClientOriginalName
();
$nome
=
$anexoParecer
->
getClientOriginalName
();
Storage
::
putFileAs
(
$path
,
$anexoParecer
,
$nome
);
Storage
::
putFileAs
(
$path
,
$anexoParecer
,
$nome
);
$anexoParecer
=
$path
.
$nome
;
$anexoParecer
=
$path
.
$nome
;
$avaliador
->
trabalhos
()
if
(
$evento
->
tipo
==
"PIBEX"
){
->
updateExistingPivot
(
$trabalho
->
id
,[
'status'
=>
1
,
'parecer'
=>
$request
->
textParecer
,
'AnexoParecer'
=>
$anexoParecer
,
'recomendacao'
=>
$request
->
recomendacao
,
'created_at'
=>
$data
]);
$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
]);
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/Parecer.php
View file @
253c5cdb
...
@@ -12,7 +12,7 @@ class Parecer extends Model
...
@@ -12,7 +12,7 @@ class Parecer extends Model
* @var array
* @var array
*/
*/
protected
$fillable
=
[
protected
$fillable
=
[
'resultado'
,
'revisorId'
,
'trabalhoId'
,
'resultado'
,
'revisorId'
,
'trabalhoId'
];
];
public
function
user
(){
public
function
user
(){
...
...
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