diff --git a/app/Http/Controllers/CursoController.php b/app/Http/Controllers/CursoController.php index 8174ec2faf0b0a26135dee86c1412bc950f664e4..232b09035fa4f364d5b142e45e2cda1c8fc9e277 100644 --- a/app/Http/Controllers/CursoController.php +++ b/app/Http/Controllers/CursoController.php @@ -17,15 +17,10 @@ class CursoController extends Controller */ public function index() { - $campusWithCursos = []; - $allCampus = Campus::all(); - foreach($allCampus as $campus){ - $campus->cursos = Curso::where('campus_id', '=', $campus->id)->get(); - array_push($campusWithCursos, $campus); - } - + $cursos = Curso::orderBy('campus_id')->orderBy('name')->get(); + return view('curso.index', [ - 'campusWithCursos' => $campusWithCursos, + 'cursos' => $cursos, 'menu' => Menu::CURSOS ]); } @@ -62,18 +57,7 @@ class CursoController extends Controller $model->fill($request->all()); $model->save(); - return redirect()->route('curso_index')->with('success', 'Salvo com sucesso!'); - } - - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - // + return redirect()->route('curso_index')->with('success', 'Curso salvo com sucesso!'); } /** @@ -110,7 +94,7 @@ class CursoController extends Controller $model->fill($request->all()); $model->save(); - return redirect()->route('curso_index')->with('success', 'Atualizado com sucesso!'); + return redirect()->route('curso_index')->with('success', 'Curso atualizado com sucesso!'); } /** @@ -120,11 +104,11 @@ class CursoController extends Controller * @param string $id * @return \Illuminate\Http\Response */ - public function destroy($id) + public function delete($id) { $model = Curso::find($id); $model->delete(); - return redirect()->route('curso_index')->with('success', 'Excluído com sucesso!'); + return redirect()->route('curso_index')->with('success', 'Curso excluído com sucesso!'); } /** diff --git a/app/Models/Curso.php b/app/Models/Curso.php index f7c98fd089754f8473ea7a0ea229cdd1e0cc1554..37ec5789efd28126d127cdc36231127820becd17 100644 --- a/app/Models/Curso.php +++ b/app/Models/Curso.php @@ -41,14 +41,19 @@ class Curso extends Model { $rules = [ - 'name' => ['min:8', 'max:255'], - 'campus_id' => ['required'] + 'name' => ['required', 'min:8', 'max:255'], + 'campus_id' => ['required', 'integer'] ]; $messages = [ - 'min' => "O campo não tem o mínimo de caracteres permitido", - 'max' => "O campo atingiu o máximo de caracteres permitido", - 'required' => "O campo precisa ser preenchido", + //name + 'name.required' => 'O campo "Nome do Campus" é obrigatório.', + 'name.min' => 'O campo "Nome do Campus" deve ter no minímo 8 (oito) caracteres.', + 'name.max' => 'O campo "Nome do Campus" deve ter no máximo 255 (duzentos e cinquenta e cinco) caracteres.', + + //campus_id + 'campus_id.required' => 'O campo "Campus" é obrigatório.', + 'campus_id.integer' => 'O campo "Campus" deve ser um inteiro.', ]; try { diff --git a/resources/views/campus/create.blade.php b/resources/views/campus/create.blade.php index 175202589a53b6e844973b14814878b3eb4e8371..334cb734396b00b09bf782f84b5b781d08ef4e99 100644 --- a/resources/views/campus/create.blade.php +++ b/resources/views/campus/create.blade.php @@ -34,21 +34,21 @@ - [
] - [
] - [ ] - [ ] - [ @error('unidade_id')] - [ {{ $message }} ] - [ @enderror] - [
] - [
] +
+
+ + + @error('unidade_id') + {{ $message }} + @enderror +
+
@include('components.buttons.btn-cancel', [ diff --git a/resources/views/curso/create.blade.php b/resources/views/curso/create.blade.php index 7d35944a8977f1d7f4de7ee7f41b0f9fe56bedd0..b17804afdfdabcde9a6d4d0bdaeed46d42acab69 100644 --- a/resources/views/curso/create.blade.php +++ b/resources/views/curso/create.blade.php @@ -1,6 +1,6 @@ @extends('layouts.main') -@section('title', 'Campus') +@section('title', 'Cursos') @section('header') @include('layouts.header', [ 'user' => Auth::user(), @@ -8,16 +8,15 @@ @endsection @section('nav') @include('layouts.navigation', [ - 'index_menu' => $index_menu, + 'menu' => $menu, ]) @endsection @section('body') -
-

CADASTRO CURSO

-

- Insira os dados correspondentes nos campos exibidos abaixo -

- +
+

Cadastrar Curso

+
+ +
@csrf @method('POST') @@ -68,3 +67,19 @@
@endsection + +@section('scripts') + +@endsection \ No newline at end of file diff --git a/resources/views/curso/index.blade.php b/resources/views/curso/index.blade.php index 0e331c58e3e82563be68e4732e2532811d0cbbd5..4e00e0187f7df06f01b57c0f536c96cf139f97b1 100644 --- a/resources/views/curso/index.blade.php +++ b/resources/views/curso/index.blade.php @@ -41,28 +41,26 @@ - @foreach ($campusWithCursos as $campusWithCurso) - @foreach ($campusWithCurso->cursos as $curso) - - {{ $curso->name }} - {{ $curso->campus }} - -
-
- @include('components.buttons.btn-edit', [ - 'route' => route('curso_edit', ['id' => $curso->id]), - ]) -
-
- @include('components.buttons.btn-delete', [ - 'id' => $curso->id, - 'route' => route('curso_delete', ['id' => $curso->id]), - ]) -
+ @foreach ($cursos as $curso) + + {{ $curso->name }} + {{ $curso->campus }} + +
+
+ @include('components.buttons.btn-edit', [ + 'route' => route('curso_edit', ['id' => $curso->id]), + ])
- - - @endforeach +
+ @include('components.buttons.btn-delete', [ + 'id' => $curso->id, + 'route' => route('curso_delete', ['id' => $curso->id]), + ]) +
+
+ + @endforeach diff --git a/resources/views/curso/update.blade.php b/resources/views/curso/update.blade.php index dbf6d526a841043890c6749f92bdfdb168b34b8a..a60e93e24f90d4a335c0ba79d78492b1da28dab1 100644 --- a/resources/views/curso/update.blade.php +++ b/resources/views/curso/update.blade.php @@ -1,6 +1,6 @@ @extends('layouts.main') -@section('title', 'Campus') +@section('title', 'Cursos') @section('header') @include('layouts.header', [ 'user' => Auth::user(), @@ -8,17 +8,15 @@ @endsection @section('nav') @include('layouts.navigation', [ - 'index_menu' => $index_menu, + 'menu' => $menu, ]) @endsection @section('body') -
-

CADASTRO CURSO

-

- Insira os dados correspondentes nos campos exibidos abaixo -

+
+

Atualizar Curso

+
- +
@csrf @method('POST') @@ -72,3 +70,19 @@
@endsection + +@section('scripts') + +@endsection \ No newline at end of file diff --git a/routes/curso.php b/routes/curso.php index 5d240d4a7ba320b1c9ca654395bdde82a36981b3..23d972bcc6877be24437987a5f477681f3ec2f44 100644 --- a/routes/curso.php +++ b/routes/curso.php @@ -9,6 +9,6 @@ Route::prefix('/curso')->group(function () { Route::post('/store', [CursoController::class, 'store'])->name('curso_store'); Route::get('/edit/{id}', [CursoController::class, 'edit'])->name('curso_edit'); Route::post('/update/{id}', [CursoController::class, 'update'])->name('curso_update'); - Route::delete('/delete/{id}', [CursoController::class, 'destroy'])->name('curso_delete'); + Route::delete('/delete/{id}', [CursoController::class, 'delete'])->name('curso_delete'); Route::get('/search', [CursoController::class, 'actionSearch'])->name('curso_search'); });