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
095f8312
Commit
095f8312
authored
Feb 25, 2023
by
Yuri Resende
Browse files
Exibindo a média das avaliações dos relatórios para o coordenador na página do projeto
parent
33b90a72
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/AdministradorController.php
View file @
095f8312
...
@@ -126,6 +126,11 @@ class AdministradorController extends Controller
...
@@ -126,6 +126,11 @@ class AdministradorController extends Controller
//$avaliacoesRelatorio = [];->join('users','users.id','=','candidatos.user_id')
//$avaliacoesRelatorio = [];->join('users','users.id','=','candidatos.user_id')
$AvalRelatParcial
=
[];
$AvalRelatParcial
=
[];
$AvalRelatFinal
=
[];
$AvalRelatFinal
=
[];
$MediaAvalRelatParcial
=
0
;
$AvalRelatParcialPendentes
=
0
;
$MediaAvalRelatFinal
=
0
;
$AvalRelatFinalPendentes
=
0
;
foreach
(
$trabalho
->
participantes
as
$participante
)
{
foreach
(
$trabalho
->
participantes
as
$participante
)
{
if
(
isset
(
$participante
->
planoTrabalho
))
{
if
(
isset
(
$participante
->
planoTrabalho
))
{
$avals
=
AvaliacaoRelatorio
::
where
(
'arquivo_id'
,
$participante
->
planoTrabalho
->
id
)
->
get
();
$avals
=
AvaliacaoRelatorio
::
where
(
'arquivo_id'
,
$participante
->
planoTrabalho
->
id
)
->
get
();
...
@@ -135,12 +140,30 @@ class AdministradorController extends Controller
...
@@ -135,12 +140,30 @@ class AdministradorController extends Controller
foreach
(
$avals
as
$aval
)
{
foreach
(
$avals
as
$aval
)
{
if
(
$aval
->
tipo
==
'Parcial'
)
{
if
(
$aval
->
tipo
==
'Parcial'
)
{
array_push
(
$AvalRelatParcial
,
$aval
);
array_push
(
$AvalRelatParcial
,
$aval
);
$MediaAvalRelatParcial
+=
$aval
->
nota
;
if
(
$aval
->
nota
==
null
){
$AvalRelatParcialPendentes
+=
1
;
}
}
else
{
}
else
{
array_push
(
$AvalRelatFinal
,
$aval
);
array_push
(
$AvalRelatFinal
,
$aval
);
$MediaAvalRelatFinal
+=
$aval
->
nota
;
if
(
$aval
->
nota
==
null
){
$AvalRelatFinalPendentes
+=
1
;
}
}
}
}
}
}
}
if
(
count
(
$AvalRelatParcial
)
>
0
){
$MediaAvalRelatParcial
=
$MediaAvalRelatParcial
/
count
(
$AvalRelatParcial
);
}
if
(
count
(
$AvalRelatFinal
)
>
0
){
$MediaAvalRelatFinal
=
$MediaAvalRelatFinal
/
count
(
$AvalRelatFinal
);
}
// Verficação de pendencia de substituição
// Verficação de pendencia de substituição
$aux
=
count
(
Substituicao
::
where
(
'status'
,
'Em Aguardo'
)
->
whereIn
(
'participanteSubstituido_id'
,
$trabalho
->
participantes
->
pluck
(
'id'
))
->
get
());
$aux
=
count
(
Substituicao
::
where
(
'status'
,
'Em Aguardo'
)
->
whereIn
(
'participanteSubstituido_id'
,
$trabalho
->
participantes
->
pluck
(
'id'
))
->
get
());
$flagSubstituicao
=
1
;
$flagSubstituicao
=
1
;
...
@@ -166,7 +189,12 @@ class AdministradorController extends Controller
...
@@ -166,7 +189,12 @@ class AdministradorController extends Controller
'AvalRelatFinal'
=>
$AvalRelatFinal
,
'AvalRelatFinal'
=>
$AvalRelatFinal
,
'hoje'
=>
$hoje
,
'hoje'
=>
$hoje
,
'flagSubstituicao'
=>
$flagSubstituicao
,
'flagSubstituicao'
=>
$flagSubstituicao
,
'areasTematicas'
=>
$areasTematicas
,
]);
'areasTematicas'
=>
$areasTematicas
,
'MediaAvalRelatParcial'
=>
$MediaAvalRelatParcial
,
'AvalRelatParcialPendentes'
=>
$AvalRelatParcialPendentes
,
'MediaAvalRelatFinal'
=>
$MediaAvalRelatFinal
,
'AvalRelatFinalPendentes'
=>
$AvalRelatFinalPendentes
,
]);
}
}
public
function
showProjetos
(
Request
$request
)
public
function
showProjetos
(
Request
$request
)
...
...
resources/views/administrador/analisarProposta.blade.php
View file @
095f8312
...
@@ -701,6 +701,11 @@
...
@@ -701,6 +701,11 @@
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
<
div
class
=
"col-md-11"
><
h6
style
=
"color: #234B8B; font-weight: bold"
>
Avaliações
de
Relatórios
Parciais
</
h6
></
div
>
<
div
class
=
"col-md-11"
><
h6
style
=
"color: #234B8B; font-weight: bold"
>
Avaliações
de
Relatórios
Parciais
</
h6
></
div
>
</
div
>
</
div
>
<
div
class
=
'row justify-content-start'
>
<
h6
class
=
'col-9'
style
=
"color: black; font-weight: bold"
>
Media
das
avaliações
:<
span
style
=
"font-weight: normal"
>
{{
$MediaAvalRelatParcial
}}
</
span
><
h6
>
<
h6
class
=
'col-3'
style
=
"color: black; font-weight: bold"
>
Avaliações
pendentes
:
<
span
style
=
"font-weight: normal"
>
{{
$AvalRelatParcialPendentes
}}
</
span
><
h6
>
<
br
><
br
>
</
div
>
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
@
foreach
(
$AvalRelatParcial
as
$aval
)
@
foreach
(
$AvalRelatParcial
as
$aval
)
<
div
class
=
"col-sm-1"
style
=
"margin-bottom: 7px"
>
<
div
class
=
"col-sm-1"
style
=
"margin-bottom: 7px"
>
...
@@ -771,6 +776,11 @@
...
@@ -771,6 +776,11 @@
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
<
div
class
=
"col-md-11"
><
h6
style
=
"color: #234B8B; font-weight: bold"
>
Avaliações
de
Relatórios
Finais
</
h6
></
div
>
<
div
class
=
"col-md-11"
><
h6
style
=
"color: #234B8B; font-weight: bold"
>
Avaliações
de
Relatórios
Finais
</
h6
></
div
>
</
div
>
</
div
>
<
div
class
=
'row justify-content-start'
>
<
h6
class
=
'col-9'
style
=
"color: black; font-weight: bold"
>
Media
das
avaliações
:<
span
style
=
"font-weight: normal"
>
{{
$MediaAvalRelatFinal
}}
</
span
><
h6
>
<
h6
class
=
'col-3'
style
=
"color: black; font-weight: bold"
>
Avaliações
pendentes
:
<
span
style
=
"font-weight: normal"
>
{{
$AvalRelatFinalPendentes
}}
</
span
><
h6
>
<
br
><
br
>
</
div
>
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
<
div
class
=
"row justify-content-start"
style
=
"alignment: center"
>
@
foreach
(
$AvalRelatFinal
as
$aval
)
@
foreach
(
$AvalRelatFinal
as
$aval
)
<
div
class
=
"col-sm-1"
style
=
"margin-bottom: 7px"
>
<
div
class
=
"col-sm-1"
style
=
"margin-bottom: 7px"
>
...
...
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