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
e0d65fb4
Commit
e0d65fb4
authored
Aug 20, 2023
by
alissonalbuquerque
Browse files
add remoção de avaliacoes em ensino outros
parent
5836f5bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/Dimensao/Tabelas/Ensino/EnsinoOutrosController.php
View file @
e0d65fb4
...
...
@@ -91,13 +91,12 @@ class EnsinoOutrosController extends Controller
{
$avaliacao
=
new
Avaliacao
([
'tarefa_id'
=>
$model
->
id
,
'type'
=>
UtilAvaliacao
::
ENSINO_OUTROS
,
'status'
=>
Status
::
PENDENTE
,
// 'status' => Avaliacao::PENDENTE
'type'
=>
Avaliacao
::
TYPE_ENSINO_OUTROS
,
'status'
=>
Status
::
PENDENTE
]);
if
(
!
$avaliacao
->
save
())
{
{
return
redirect
()
->
route
(
'ensino_outros_index'
,
[
'user_pad_id'
=>
$user_pad_id
])
->
with
(
'fail'
,
'Erro ao cadastrar Atividade!'
);
...
...
app/Models/Avaliacao.php
View file @
e0d65fb4
...
...
@@ -70,21 +70,9 @@ class Avaliacao extends Model
CONST
TYPE_GESTAO_MEMBRO_COMISSAO
=
23
;
CONST
TYPE_GESTAO_OUTROS
=
24
;
public
static
function
listStatus
(
$value
=
null
)
{
$values
=
[
self
::
STATUS_APROVADO
=>
'Aprovado'
,
self
::
STATUS_PENDENTE
=>
'Pendente'
,
self
::
STATUS_REPROVADO
=>
'Reprovado'
,
self
::
STATUS_EM_REVISAO
=>
'Em Revisão'
];
return
$value
!==
null
?
$values
[
$value
]
:
$values
;
}
protected
$table
=
'avaliacao'
;
protected
$fillable
=
[
'tarefa_id'
,
'avaliador_id'
,
'type'
,
'status'
,
'descricao'
,
'ch_semanal'
,
'hora_reajuste'
];
protected
$fillable
=
[
'id'
,
'tarefa_id'
,
'avaliador_id'
,
'type'
,
'status'
,
'descricao'
,
'ch_semanal'
,
'ch_total'
,
'created_at'
,
'updated_at'
,
'deleted_at'
,
'hora
s
_reajuste'
];
public
function
tarefa
()
{
...
...
@@ -205,6 +193,18 @@ class Avaliacao extends Model
return
Status
::
listStatus
(
$this
->
status
);
}
public
static
function
listStatus
(
$value
=
null
)
{
$values
=
[
self
::
STATUS_APROVADO
=>
'Aprovado'
,
self
::
STATUS_PENDENTE
=>
'Pendente'
,
self
::
STATUS_REPROVADO
=>
'Reprovado'
,
self
::
STATUS_EM_REVISAO
=>
'Em Revisão'
];
return
$value
!==
null
?
$values
[
$value
]
:
$values
;
}
public
static
function
getTypeByClassPath
(
$classPath
)
{
$typeByClassPath
=
[
...
...
resources/views/pad/dimensao/atividades/reprovadas/cards/ensino/ensino_outro.blade.php
View file @
e0d65fb4
...
...
@@ -15,9 +15,11 @@
<
p
>
<
span
class
=
"fw-bolder"
>
C
.
H
Semanal
:
</
span
>
{{
$model
->
ch_semanal
.
'h'
}}
</
p
>
</
div
>
<
div
class
=
"card-footer"
>
<
h5
class
=
"fw-bolder"
>
Correções
</
h5
>
<
p
>
<
span
class
=
"fw-bolder"
>
Descrição
:
</
span
>
{{
$model
->
avaliacao
->
descricao
}}
</
p
>
<
p
>
<
span
class
=
"fw-bolder"
>
C
.
H
Reajuste
:
</
span
>
{{
$model
->
avaliacao
->
horas_reajuste
.
'h'
}}
</
p
>
@
if
(
$model
->
avaliacao
)
<
h5
class
=
"fw-bolder"
>
Correções
</
h5
>
<
p
>
<
span
class
=
"fw-bolder"
>
Descrição
:
</
span
>
{{
$model
->
avaliacao
->
descricao
}}
</
p
>
<
p
>
<
span
class
=
"fw-bolder"
>
C
.
H
Reajuste
:
</
span
>
{{
$model
->
avaliacao
->
horas_reajuste
}}
</
p
>
@
endif
</
div
>
</
div
>
...
...
resources/views/pad/dimensao/atividades/reprovadas/index.blade.php
View file @
e0d65fb4
...
...
@@ -106,6 +106,7 @@
@
foreach
(
$extensaoOutros
as
$extensaoOutro
)
@
include
(
'pad/dimensao/atividades/reprovadas/cards/extensao/extensao_outro'
,
[
'model'
=>
$extensaoOutro
])
@
endforeach
</
div
>
<
div
class
=
"tab-pane fade"
id
=
"gestao-content"
role
=
"tabpanel"
aria
-
labelledby
=
"gestao-tab"
>
...
...
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