From 62990eb1934e0e8ff6cfeabcc96660ebdce45bf9 Mon Sep 17 00:00:00 2001
From: alissonalbuquerque <alissonalbuquerque.dev@gmail.com>
Date: Fri, 25 Mar 2022 10:27:53 -0300
Subject: [PATCH] add tratamento de listagem e delete de pad

---
 .../Controllers/Dimensao/EnsinoController.php |  6 +-
 .../Tabelas/Ensino/EnsinoAulaController.php   |  6 +-
 app/Models/Tabelas/Ensino/EnsinoAula.php      | 22 +++++++
 resources/views/pad/dimensao/ensino.blade.php | 59 ++++++++-----------
 routes/web.php                                |  1 +
 5 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/app/Http/Controllers/Dimensao/EnsinoController.php b/app/Http/Controllers/Dimensao/EnsinoController.php
index 5e37b52..20be17d 100644
--- a/app/Http/Controllers/Dimensao/EnsinoController.php
+++ b/app/Http/Controllers/Dimensao/EnsinoController.php
@@ -22,19 +22,19 @@ class EnsinoController extends Controller
      */
     public function index() {
         $user = Auth::user();
-    
+
         $cursos = (new CursoQuery())->getQuery()->get();
         $niveis = EnsinoAula::listNivel();
         $modalidades = EnsinoAula::listModalidade();
-        $ensinoAula = EnsinoAula::all();
+        $ensinoAulas = EnsinoAula::all();
 
         return view('pad.dimensao.ensino', [
             'pad_id' => 1,
             'cursos' => $cursos,
             'niveis' => $niveis,
+            'ensinoAulas' => $ensinoAulas,
             'modalidades' => $modalidades,
             'index_menu' => self::MENU_PAD,
-            'ensinoAula' => $ensinoAula,
         ]);
     }
 }
diff --git a/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php b/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php
index c0ae779..2830502 100644
--- a/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php
+++ b/app/Http/Controllers/Tabelas/Ensino/EnsinoAulaController.php
@@ -21,7 +21,9 @@ class EnsinoAulaController extends Controller
         return redirect()->route('dimensao_ensino');
     }
 
-    public function store(){
-
+    public function delete($id){
+        $model = EnsinoAula::find($id);
+        $model->delete();
+        return redirect()->route('dimensao_ensino');
     }
 }
diff --git a/app/Models/Tabelas/Ensino/EnsinoAula.php b/app/Models/Tabelas/Ensino/EnsinoAula.php
index 65b6307..001c0e3 100644
--- a/app/Models/Tabelas/Ensino/EnsinoAula.php
+++ b/app/Models/Tabelas/Ensino/EnsinoAula.php
@@ -2,6 +2,8 @@
 
 namespace App\Models\Tabelas\Ensino;
 
+use App\Models\Curso;
+use App\Models\Disciplina;
 use App\Queries\PlanejamentoQuery;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -101,6 +103,26 @@ class EnsinoAula extends Model
         return $this->belongsTo(Curso::class);
     }
 
+    // /**
+    //  * Get Disciplina with diciplina.id = ensino_aulas.displina_id
+    //  * 
+    //  * @return Disciplina
+    //  */
+    // public function disciplina()
+    // {
+    //     return $this->belongsTo(Disciplina::class);
+    // }
+
+    /**
+     * Get Disciplina with diciplina.id = ensino_aulas.displina_id
+     * 
+     * @return Disciplina
+     */
+    public function disciplina()
+    {
+        return $this->belongsTo(Disciplina::class, 'componente_curricular');
+    }
+
     /**
      * @return array
      */
diff --git a/resources/views/pad/dimensao/ensino.blade.php b/resources/views/pad/dimensao/ensino.blade.php
index 0523ab3..7a69ac1 100644
--- a/resources/views/pad/dimensao/ensino.blade.php
+++ b/resources/views/pad/dimensao/ensino.blade.php
@@ -52,40 +52,33 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach ($ensinoAula as $ensino)
+                            @foreach ($ensinoAulas as $ensinoAula)
                                 <tr>
-                                    <th class="text-center">
-                                        {{ $ensino->cod_atividade }}
-                                    </th>
-                                    <th class="text-center">
-                                        {{ $ensino->componente_curricular }}
-                                    </th>
-                                    <th class="text-center">
-                                        {{ $ensino->nivel }}
-                                    </th>
-                                    <th class="text-center">
-                                        {{ $ensino->modalidade }}
-                                    </th>
-                                    <th class="text-center">
-                                        {{ $ensino->ch_semanal }}
-                                    </th>
-                                    <th class="text-center">
-                                        {{ $ensino->ch_total }}
-                                    </th>
-                                    <th class="text-center">
-                                        {{ $ensino->pad_id }}
-                                    </th>
-                                    <th class="text-center">
-                                        <button name="del0" class='btn btn-danger glyphicon glyphicon-remove row-remove'>
-                                            <span aria-hidden="true">
-                                                <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
-                                                    fill="currentColor" class="bi bi-trash-fill" viewBox="0 0 16 16">
-                                                    <path
-                                                        d="M2.5 1a1 1 0 0 0-1 1v1a1 1 0 0 0 1 1H3v9a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V4h.5a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H10a1 1 0 0 0-1-1H7a1 1 0 0 0-1 1H2.5zm3 4a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 .5-.5zM8 5a.5.5 0 0 1 .5.5v7a.5.5 0 0 1-1 0v-7A.5.5 0 0 1 8 5zm3 .5v7a.5.5 0 0 1-1 0v-7a.5.5 0 0 1 1 0z" />
-                                                </svg>
-                                            </span>
-                                        </button>
-                                    </th>
+                                    <td class="text-center">
+                                        {{ $ensinoAula->cod_atividade }}
+                                    </td>
+                                    <td class="text-center">
+                                        {{ $ensinoAula->disciplina->name }}
+                                    </td>
+                                    <td class="text-center">
+                                        {{ $ensinoAula->curso->name }}
+                                    </td>
+                                    <td class="text-center">
+                                        {{ $ensinoAula::listNivel($ensinoAula->nivel) }}
+                                    </td>
+                                    <td class="text-center">
+                                        {{ $ensinoAula::listModalidade($ensinoAula->modalidade) }}
+                                    </td>
+                                    <td class="text-center">
+                                        {{ $ensinoAula->ch_semanal }}
+                                    </td>
+                                    <td class="text-center">
+                                        {{ $ensinoAula->ch_total }}
+                                    </td>
+
+                                    <td class="text-center">
+                                        @include('components.buttons.btn-delete', ['route' => route('ensino_aula_delete', ['id' => $ensinoAula->id])]);
+                                    </td>
                                 </tr>
                             @endforeach
                         </tbody>
diff --git a/routes/web.php b/routes/web.php
index 4661ab5..dd4327a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -73,6 +73,7 @@ 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::delete('/pad/dimensao/ensino/aula/delete/{id}', [EnsinoAulaController::class, 'delete'])->name('ensino_aula_delete');
 
 /** json */
 Route::get('/disciplina/{curso_id}', [DisciplinaController::class, 'getDisciplinaByCurso'])->name('get_disciplina_by_curso');
\ No newline at end of file
-- 
GitLab