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
dcf0ea16
Commit
dcf0ea16
authored
Apr 26, 2023
by
Yuri Resende
Browse files
Adicionando tabs e paginação nas atividades
parent
4ca3449f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
app/Http/Controllers/PadController.php
View file @
dcf0ea16
...
@@ -393,7 +393,7 @@ class PadController extends Controller
...
@@ -393,7 +393,7 @@ class PadController extends Controller
$avaliacoes_ensino_ids
=
array_merge
(
$avaliacoes_ensino_ids
,
$avaliacao_ids
);
$avaliacoes_ensino_ids
=
array_merge
(
$avaliacoes_ensino_ids
,
$avaliacao_ids
);
}
}
$avaliacoes_ensino
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_ensino_ids
)
->
get
(
);
$avaliacoes_ensino
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_ensino_ids
)
->
orderBy
(
'status'
)
->
paginate
(
5
);
//
//
}
}
...
@@ -426,7 +426,7 @@ class PadController extends Controller
...
@@ -426,7 +426,7 @@ class PadController extends Controller
$avaliacoes_pesquisa_ids
=
array_merge
(
$avaliacoes_pesquisa_ids
,
$avaliacao_ids
);
$avaliacoes_pesquisa_ids
=
array_merge
(
$avaliacoes_pesquisa_ids
,
$avaliacao_ids
);
}
}
$avaliacoes_pesquisa
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_pesquisa_ids
)
->
get
(
);
$avaliacoes_pesquisa
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_pesquisa_ids
)
->
orderBy
(
'status'
)
->
paginate
(
5
);
}
}
if
(
in_array
(
Dimensao
::
EXTENSAO
,
$dimensoes
))
{
if
(
in_array
(
Dimensao
::
EXTENSAO
,
$dimensoes
))
{
...
@@ -454,7 +454,7 @@ class PadController extends Controller
...
@@ -454,7 +454,7 @@ class PadController extends Controller
$avaliacoes_extensao_ids
=
array_merge
(
$avaliacoes_extensao_ids
,
$avaliacao_ids
);
$avaliacoes_extensao_ids
=
array_merge
(
$avaliacoes_extensao_ids
,
$avaliacao_ids
);
}
}
$avaliacoes_extensao
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_extensao_ids
)
->
get
(
);
$avaliacoes_extensao
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_extensao_ids
)
->
orderBy
(
'status'
)
->
paginate
(
5
);
}
}
if
(
in_array
(
Dimensao
::
GESTAO
,
$dimensoes
))
{
if
(
in_array
(
Dimensao
::
GESTAO
,
$dimensoes
))
{
...
@@ -502,7 +502,7 @@ class PadController extends Controller
...
@@ -502,7 +502,7 @@ class PadController extends Controller
$avaliacoes_gestao_ids
=
array_merge
(
$avaliacoes_gestao_ids
,
$avaliacao_ids
);
$avaliacoes_gestao_ids
=
array_merge
(
$avaliacoes_gestao_ids
,
$avaliacao_ids
);
}
}
$avaliacoes_gestao
=
Avaliacao
::
whereIn
(
'id'
,
$avaliacoes_gestao_ids
)
->
get
(
);
$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
view
(
'pad.avaliacao.taferas_professor'
,
compact
(
'pad'
,
'index_menu'
,
'professor'
,
'avaliacoes_ensino'
,
'avaliacoes_pesquisa'
,
'avaliacoes_extensao'
,
'avaliacoes_gestao'
,
'niveis'
,
'modalidades'
));
...
...
app/Providers/AppServiceProvider.php
View file @
dcf0ea16
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
namespace
App\Providers
;
namespace
App\Providers
;
use
Illuminate\Pagination\Paginator
;
use
Illuminate\Support\ServiceProvider
;
use
Illuminate\Support\ServiceProvider
;
class
AppServiceProvider
extends
ServiceProvider
class
AppServiceProvider
extends
ServiceProvider
...
@@ -23,6 +24,7 @@ class AppServiceProvider extends ServiceProvider
...
@@ -23,6 +24,7 @@ class AppServiceProvider extends ServiceProvider
*/
*/
public
function
boot
()
public
function
boot
()
{
{
//
Paginator
::
useBootstrap
();
}
}
}
}
resources/views/pad/avaliacao/taferas_professor.blade.php
View file @
dcf0ea16
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