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
pad-upe
Commits
547b14c9
Commit
547b14c9
authored
May 06, 2023
by
Yuri Resende
Browse files
colocando a coluna de status de envio do PAD
parent
d608aa83
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/PadController.php
View file @
547b14c9
...
...
@@ -309,6 +309,29 @@ class PadController extends Controller
->
orderBy
(
'name'
)
->
get
();
//Informando se o PAD foi enviado ou não
$avaliador_pad
=
AvaliadorPad
::
where
(
function
(
$query
)
use
(
$pad
,
$user
)
{
$query
->
where
(
'user_id'
,
'='
,
$user
->
id
);
$query
->
where
(
'pad_id'
,
'='
,
$pad
->
id
);
})
->
first
();
foreach
(
$professores
as
$professor
){
$professor
->
status
=
"Pendente"
;
$userPad
=
$professor
->
userPads
()
->
where
(
'pad_id'
,
'='
,
$pad
->
id
)
->
first
();
$avaliacoes
=
$this
->
get_avaliacoes
(
$userPad
,
$avaliador_pad
);
$avaliacoes_ensino
=
$avaliacoes
[
'ensino'
];
$avaliacoes_pesquisa
=
$avaliacoes
[
'pesquisa'
];
$avaliacoes_extensao
=
$avaliacoes
[
'extensao'
];
$avaliacoes_gestao
=
$avaliacoes
[
'gestao'
];
if
(
$avaliacoes_ensino
->
all
()
!=
null
){
$professor
->
status
=
"Enviado"
;
}
}
return
view
(
"pad.avaliacao.professores"
,
compact
(
'professores'
,
'pad'
,
'index_menu'
));
}
...
...
@@ -322,13 +345,6 @@ class PadController extends Controller
$query
->
where
(
'pad_id'
,
'='
,
$pad
->
id
);
})
->
first
();
$dimensoes_permitidas
=
AvaliadorPadDimensao
::
where
(
'avaliador_pad_id'
,
'='
,
$avaliador_pad
->
id
)
->
select
(
'avaliador_pad_dimensao.dimensao'
)
->
get
();
$dimensoes
=
[];
foreach
(
$dimensoes_permitidas
as
$dimensao
)
{
array_push
(
$dimensoes
,
$dimensao
->
dimensao
);
}
$professor
=
User
::
find
(
$professor_id
);
$user_pad
=
UserPad
::
where
(
function
(
$query
)
use
(
$pad
,
$professor
)
{
$query
->
where
(
'user_id'
,
'='
,
$professor
->
id
);
...
...
@@ -339,11 +355,43 @@ class PadController extends Controller
$modalidades
=
Constants
::
listModalidade
();
$status
=
Status
::
listStatus
();
$avaliacoes
=
$this
->
get_avaliacoes
(
$user_pad
,
$avaliador_pad
);
$avaliacoes_ensino
=
$avaliacoes
[
'ensino'
];
$avaliacoes_pesquisa
=
$avaliacoes
[
'pesquisa'
];
$avaliacoes_extensao
=
$avaliacoes
[
'extensao'
];
$avaliacoes_gestao
=
$avaliacoes
[
'gestao'
];
return
view
(
'pad.avaliacao.taferas_professor'
,
compact
(
'pad'
,
'index_menu'
,
'professor'
,
'avaliacoes_ensino'
,
'avaliacoes_pesquisa'
,
'avaliacoes_extensao'
,
'avaliacoes_gestao'
,
'niveis'
,
'modalidades'
));
}
private
function
add_tipo_atividade
(
$query
,
$type
)
{
foreach
(
$query
as
&
$atividade
)
{
$atividade
[
'tipo_atividade'
]
=
$type
;
}
return
$query
;
}
private
function
get_avaliacoes
(
$user_pad
,
$avaliador_pad
)
{
$avaliacoes_ensino
=
[];
$avaliacoes_pesquisa
=
[];
$avaliacoes_extensao
=
[];
$avaliacoes_gestao
=
[];
$dimensoes_permitidas
=
AvaliadorPadDimensao
::
where
(
'avaliador_pad_id'
,
'='
,
$avaliador_pad
->
id
)
->
select
(
'avaliador_pad_dimensao.dimensao'
)
->
get
();
$dimensoes
=
[];
foreach
(
$dimensoes_permitidas
as
$dimensao
)
{
array_push
(
$dimensoes
,
$dimensao
->
dimensao
);
}
if
(
in_array
(
Dimensao
::
ENSINO
,
$dimensoes
))
{
$ensino_grouped_ids
=
[
...
...
@@ -505,16 +553,14 @@ class PadController extends Controller
$avaliacoes_gestao
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_gestao_ids
)
->
orderBy
(
'status'
)
->
paginate
(
5
);
}
return
view
(
'pad.avaliacao.taferas_professor'
,
compact
(
'pad'
,
'index_menu'
,
'professor'
,
'avaliacoes_ensino'
,
'avaliacoes_pesquisa'
,
'avaliacoes_extensao'
,
'avaliacoes_gestao'
,
'niveis'
,
'modalidades'
));
return
[
'ensino'
=>
$avaliacoes_ensino
,
'pesquisa'
=>
$avaliacoes_pesquisa
,
'extensao'
=>
$avaliacoes_extensao
,
'gestao'
=>
$avaliacoes_gestao
];
}
private
function
add_tipo_atividade
(
$query
,
$type
)
{
foreach
(
$query
as
&
$atividade
)
{
$atividade
[
'tipo_atividade'
]
=
$type
;
}
return
$query
;
}
}
app/Models/User.php
View file @
547b14c9
...
...
@@ -258,4 +258,12 @@ class User extends Authenticatable
{
return
$this
->
name
;
}
/**
* @return Illuminate\Database\Eloquent\Collection
* @return Collection<UserPad>
*/
public
function
userPads
()
{
return
$this
->
hasMany
(
UserPad
::
class
);
}
}
composer.lock
deleted
100644 → 0
View file @
d608aa83
This diff is collapsed.
Click to expand it.
resources/views/pad/avaliacao/professores.blade.php
View file @
547b14c9
...
...
@@ -23,6 +23,8 @@
<
thead
class
=
"thead-dark"
>
<
tr
>
<
th
scope
=
"col"
>
Professor
</
th
>
<
th
scope
=
"col"
>
Status
</
th
>
<
th
scope
=
"col"
>
Opções
</
th
>
</
tr
>
</
thead
>
...
...
@@ -31,6 +33,11 @@
@
foreach
(
$professores
as
$professor
)
<
tr
>
<
td
>
{{
$professor
->
name
}}
</
td
>
@
if
(
$professor
->
status
===
'Pendente'
)
<
td
style
=
"color:red;"
>
{{
$professor
->
status
}}
</
td
>
@
else
<
td
style
=
"color:green;"
>
{{
$professor
->
status
}}
</
td
>
@
endif
<
td
>
@
include
(
'components.buttons.btn-avaliar'
,
[
...
...
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