diff --git a/app/Http/Controllers/Dimensao/EnsinoController.php b/app/Http/Controllers/Dimensao/EnsinoController.php index 5e37b520a7fdb90e390dd1bcb71e1a207892c8dc..20be17d49943769c4dac13dec81dcf2d832ca37e 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 c0ae779ea5d2343991d84616513cd24c9ae8f253..2830502dfe47bb604ff02ac08efabd9161487775 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 65b6307c5599da20a30eaae44342e273464920d3..001c0e3cf84d850a6cc2094c027eb3a9414fee32 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 0523ab327f2b155406b3cc7670d3471b8b0ee203..7a69ac176b12175e61fba2f1594f39773a5c60f6 100644 --- a/resources/views/pad/dimensao/ensino.blade.php +++ b/resources/views/pad/dimensao/ensino.blade.php @@ -52,40 +52,33 @@
- @foreach ($ensinoAula as $ensino) + @foreach ($ensinoAulas as $ensinoAula)