diff --git a/app/Http/Controllers/Dimensao/EnsinoController.php b/app/Http/Controllers/Dimensao/EnsinoController.php index baf80fcff87e12451762f35f3070e8f93c883904..2a913fb5d5e1e5e9c6d4f74d2f43189e67e17e27 100644 --- a/app/Http/Controllers/Dimensao/EnsinoController.php +++ b/app/Http/Controllers/Dimensao/EnsinoController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Dimensao; use App\Http\Controllers\Controller; use App\Models\Curso; +use App\Models\Tabelas\Ensino\EnsinoAula; use App\Queries\CursoQuery; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -23,10 +24,15 @@ class EnsinoController extends Controller $user = Auth::user(); $cursos = (new CursoQuery())->getQuery()->get(); + $niveis = EnsinoAula::listNivel(); + $modalidades = EnsinoAula::listModalidade(); + return view('pad.dimensao.ensino', [ - 'index_menu' => self::MENU_PAD, + 'pad_id' => 1, 'cursos' => $cursos, - 'pad_id' => 1 + 'niveis' => $niveis, + 'modalidades' => $modalidades, + 'index_menu' => self::MENU_PAD, ]); } } diff --git a/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php b/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php index f5bea7c0a0813e58f758bd96b782c47b59397686..a6e2e3562d4fae33e905cd22ef74f52366bf6bf5 100644 --- a/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php +++ b/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php @@ -7,7 +7,6 @@ use Illuminate\Http\Request; class EnsinoAulaController extends Controller { - /** * Show the form for creating a new resource. * @@ -16,4 +15,8 @@ class EnsinoAulaController extends Controller public function create(Request $request) { } + + public function store(){ + + } } diff --git a/app/Models/Tabelas/Ensino/EnsinoAula.php b/app/Models/Tabelas/Ensino/EnsinoAula.php index 4c3382cceb96fef769a5ea739b8f64dc85333559..65b6307c5599da20a30eaae44342e273464920d3 100644 --- a/app/Models/Tabelas/Ensino/EnsinoAula.php +++ b/app/Models/Tabelas/Ensino/EnsinoAula.php @@ -42,7 +42,7 @@ class EnsinoAula extends Model /** * @return array|string */ - public function listNivel($value = null) { + public static function listNivel($value = null) { $values = [ self::NIVEL_GRADUACAO => 'Graduação', self::NIVEL_POS_GRADUACAO_LATO_SENSU => 'Pós-graduação Stricto Sensu', @@ -56,7 +56,7 @@ class EnsinoAula extends Model /** * @return array|string */ - public function listModalidade($value = null) { + public static function listModalidade($value = null) { $values = [ self::MODALIDADE_EAD => 'EAD', self::MODALIDADE_PRESENCIAL => 'Presencial', diff --git a/resources/views/layouts/pad-ensino-jquery/ensino-aula.blade.php b/resources/views/layouts/pad-ensino-jquery/ensino-aula.blade.php index c9b5d59a3519773188db20fa98e0e361931ad9f7..e4d42cb20d974e29fd98a948b865d91e340c9595 100644 --- a/resources/views/layouts/pad-ensino-jquery/ensino-aula.blade.php +++ b/resources/views/layouts/pad-ensino-jquery/ensino-aula.blade.php @@ -1,12 +1,41 @@ diff --git a/resources/views/pad/dimensao/ensino.blade.php b/resources/views/pad/dimensao/ensino.blade.php index d676253359eee11db1ec4aa1a532f59c34a79b3b..1f0c0a8e1d784ec432c20c9ca3e3adf64373c8ec 100644 --- a/resources/views/pad/dimensao/ensino.blade.php +++ b/resources/views/pad/dimensao/ensino.blade.php @@ -90,15 +90,16 @@ -
-
+ +
- -
+ +

+
-
- - +
@@ -127,30 +131,27 @@
-
+
- +
-
+
- +
- + +
diff --git a/routes/web.php b/routes/web.php index 9819657fcc6d87d475b135bd7955e299ce9fd2c5..a4558d29714b8df628440b9d1202a670089d9206 100644 --- a/routes/web.php +++ b/routes/web.php @@ -72,7 +72,8 @@ Route::get('/pad/dimensao/ensino', [EnsinoController::class, 'index'])->name('di Route::get('/pad/dimensao/pesquisa', [PesquisaController::class, 'index'])->name('dimensao_pesquisa'); Route::get('/pad/dimensao/extensao', [ExtensaoController::class, 'index'])->name('dimensao_extensao'); -Route::get('/pad/dimensao/ensino/aula/create', [EnsinoAulaController::class, 'create'])->name('ensino_aula_create'); +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 */