diff --git a/app/Http/Controllers/Dimensao/EnsinoController.php b/app/Http/Controllers/Dimensao/EnsinoController.php index 2a913fb5d5e1e5e9c6d4f74d2f43189e67e17e27..5e37b520a7fdb90e390dd1bcb71e1a207892c8dc 100644 --- a/app/Http/Controllers/Dimensao/EnsinoController.php +++ b/app/Http/Controllers/Dimensao/EnsinoController.php @@ -26,6 +26,7 @@ class EnsinoController extends Controller $cursos = (new CursoQuery())->getQuery()->get(); $niveis = EnsinoAula::listNivel(); $modalidades = EnsinoAula::listModalidade(); + $ensinoAula = EnsinoAula::all(); return view('pad.dimensao.ensino', [ 'pad_id' => 1, @@ -33,6 +34,7 @@ class EnsinoController extends Controller 'niveis' => $niveis, 'modalidades' => $modalidades, 'index_menu' => self::MENU_PAD, + 'ensinoAula' => $ensinoAula, ]); } } diff --git a/resources/views/pad/dimensao/ensino.blade.php b/resources/views/pad/dimensao/ensino.blade.php index 1f0c0a8e1d784ec432c20c9ca3e3adf64373c8ec..082e34c8c4d77751b2089a4ea8738d27fc2a6dc1 100644 --- a/resources/views/pad/dimensao/ensino.blade.php +++ b/resources/views/pad/dimensao/ensino.blade.php @@ -52,79 +52,83 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + @foreach ($ensinoAula as $ensino) + + + {{ $ensino->cod_atividade }} + + + {{ $ensino->componente_curricular }} + + + {{ $ensino->nivel }} + + + {{ $ensino->modalidade }} + + + {{ $ensino->ch_semanal }} + + + {{ $ensino->ch_total }} + + + {{ $ensino->pad_id }} + + + + + + @endforeach -
+
+
- +

- +
-
- @foreach ($niveis as $key => $nivel) @endforeach - +
@@ -136,7 +140,7 @@ @foreach ($modalidades as $key => $modalidade) @endforeach - +
@@ -150,8 +154,8 @@
- - + +
@@ -161,4 +165,4 @@ @include('layouts.pad-ensino-jquery.ensino-aula') -@endsection \ No newline at end of file +@endsection diff --git a/routes/web.php b/routes/web.php index a4558d29714b8df628440b9d1202a670089d9206..4661ab5a32a76166f8893b0a5403f85c11274e4b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -73,8 +73,6 @@ Route::get('/pad/dimensao/pesquisa', [PesquisaController::class, 'index'])->name Route::get('/pad/dimensao/extensao', [ExtensaoController::class, 'index'])->name('dimensao_extensao'); Route::post('/pad/dimensao/ensino/aula/create', [EnsinoAulaController::class, 'create'])->name('ensino_aula_create'); -//Route::post('/pad/dimensao/ensino/aula/store', [EnsinoAulaController::class, 'store'])->name('ensino_aula_store'); - /** json */ Route::get('/disciplina/{curso_id}', [DisciplinaController::class, 'getDisciplinaByCurso'])->name('get_disciplina_by_curso'); \ No newline at end of file