From ba97c0e4bcf342c296f6f5b8fb464caf349d5cce Mon Sep 17 00:00:00 2001 From: alissonalbuquerque Date: Mon, 27 Jun 2022 15:19:07 -0300 Subject: [PATCH] =?UTF-8?q?add=20altera=C3=A7=C3=B5es=20do=20crud=20do=20p?= =?UTF-8?q?ad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/PADController.php | 163 +++++++++++++----- app/Models/PAD.php | 50 ++---- app/Models/Tabelas/Constants.php | 12 ++ .../2022_06_18_192335_create_pad_table.php | 36 ++++ database/seeders/DatabaseSeeder.php | 3 +- database/seeders/PADSeeder.php | 12 +- database/seeders/UserSeeder.php | 2 +- resources/views/campus/create.blade.php | 6 +- resources/views/campus/index.blade.php | 3 +- resources/views/campus/update.blade.php | 6 +- resources/views/components/alerts.blade.php | 11 +- .../components/buttons/btn-create.blade.php | 4 +- .../components/buttons/btn-delete.blade.php | 43 +++-- .../components/buttons/btn-edit.blade.php | 2 +- .../components/buttons/btn-save.blade.php | 6 +- .../views/components/buttons/delete.blade.php | 27 +++ resources/views/coordenador/index.blade.php | 5 +- resources/views/curso/create.blade.php | 6 +- resources/views/curso/index.blade.php | 5 +- resources/views/diretor/index.blade.php | 6 +- .../user-dashboard/dashboard_admin.blade.php | 2 +- .../user-jquery/jquery_admin.blade.php | 4 +- resources/views/pad/admin/create.blade.php | 80 +++++++++ resources/views/pad/admin/edit.blade.php | 81 +++++++++ resources/views/pad/admin/index.blade.php | 89 ++++++++++ resources/views/unidade/create.blade.php | 6 +- resources/views/unidade/index.blade.php | 4 +- resources/views/unidade/update.blade.php | 6 +- routes/web.php | 15 +- 29 files changed, 544 insertions(+), 151 deletions(-) create mode 100644 database/migrations/2022_06_18_192335_create_pad_table.php create mode 100644 resources/views/components/buttons/delete.blade.php create mode 100644 resources/views/pad/admin/create.blade.php create mode 100644 resources/views/pad/admin/edit.blade.php create mode 100644 resources/views/pad/admin/index.blade.php diff --git a/app/Http/Controllers/PADController.php b/app/Http/Controllers/PADController.php index fb08b4c..375db1b 100644 --- a/app/Http/Controllers/PADController.php +++ b/app/Http/Controllers/PADController.php @@ -5,13 +5,15 @@ namespace App\Http\Controllers; use App\Http\Controllers\Controller; use Illuminate\Http\Request; use App\Models\PAD; +use App\Models\Tabelas\Constants; +use Database\Seeders\PadSeeder; use Exception; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Validator; use Illuminate\Validation\Rule; -class PADController extends Controller +class PadController extends Controller { /** * Show last PAD. @@ -20,8 +22,12 @@ class PADController extends Controller */ public function index() { - $PADs = PAD::where('user_id', '=', Auth::user()->id); - return view('pad.index', ["PADs" => $PADs, 'index_menu' => 1 ]); + if(Auth::user()->isTypeAdmin()) { + $pads = Pad::all(); + return view('pad.admin.index', ['pads' => $pads]); + } + + dd('refatorar'); } /** @@ -30,13 +36,11 @@ class PADController extends Controller * @return \Illuminate\Http\Response */ public function create() - { - return view('pad.create', ['index_menu' => 1 ]); - } - - public function anexo() - { - return view('pad.anexo', ['index_menu' => 1 ]); + { + $status = [ + Constants::STATUS_ATIVO => Constants::listStatus(Constants::STATUS_ATIVO) + ]; + return view('pad.admin.create', ['status' => $status]); } /** @@ -46,47 +50,87 @@ class PADController extends Controller * @return \Illuminate\Http\Response */ public function store(Request $request) + { + $validated = $request->validate([ + 'nome' => ['required', 'string', 'min:5', 'max:255'], + 'status' => ['required', 'integer'], + 'data_inicio' => ['required', 'date', 'before_or_equal:data_fim'], + 'data_fim' => ['required', 'date', 'after_or_equal:data_inicio'], + ], + [ + 'required' => 'O campo de :attribute é obrigatório', + 'nome.min' => 'O campo de :attribute deve ter no mínimo 5 letras', + 'nome.max' => 'O campo de :attribute deve ter no máximo 255 letras', + 'data_inicio.before_or_equal' => 'A :attribute deve ser uma data anterior ou igual a data de fim', + 'data_fim.after_or_equal' => 'A :attribute deve ser uma data posterior ou igual a data de início', + ]); + + if($validated) { + $model = new Pad($request->all()); + + if($model->save()) { + return redirect()->route('pad_index')->with('success', 'PAD cadastrado com sucesso!'); + } else { + return redirect()->route('pad_index')->with('success', 'Erro ao cadastrar o PAD!'); + } + } + } + + public function anexo() { - $rules = [ - 'first_name' => 'required|string|min:3|max:255', - 'city_name' => 'required|string|min:3|max:255', - 'email' => 'required|string|email|max:255' - ]; - $validator = Validator::make($request->all(),$rules); - if ($validator->fails()) { - return redirect('insert') - ->withInput() - ->withErrors($validator); - } - else{ - $data = $request->input(); - try{ - $student = new StudInsert; - $student->first_name = $data['first_name']; - $student->last_name = $data['last_name']; - $student->city_name = $data['city_name']; - $student->email = $data['email']; - $student->save(); - return redirect('insert')->with('status',"Insert successfully"); - } - catch(Exception $e){ - return redirect('insert')->with('failed',"operation failed"); - } - } - - return redirect('/dashboard'); + return view('pad.anexo', ['index_menu' => 1 ]); } + // /** + // * Store a newly created resource in storage. + // * + // * @param \Illuminate\Http\Request $request + // * @return \Illuminate\Http\Response + // */ + // public function store(Request $request) + // { + // $rules = [ + // 'first_name' => 'required|string|min:3|max:255', + // 'city_name' => 'required|string|min:3|max:255', + // 'email' => 'required|string|email|max:255' + // ]; + // $validator = Validator::make($request->all(),$rules); + // if ($validator->fails()) { + // return redirect('insert') + // ->withInput() + // ->withErrors($validator); + // } + // else{ + // $data = $request->input(); + // try{ + // $student = new StudInsert; + // $student->first_name = $data['first_name']; + // $student->last_name = $data['last_name']; + // $student->city_name = $data['city_name']; + // $student->email = $data['email']; + // $student->save(); + // return redirect('insert')->with('status',"Insert successfully"); + // } + // catch(Exception $e){ + // return redirect('insert')->with('failed',"operation failed"); + // } + // } + + // return redirect('/dashboard'); + // } + /** * Show the form for editing the specified resource. * - * @param int $id + * @param integer $id * @return \Illuminate\Http\Response */ public function edit($id) { - $model = PAD::find($id); - return view('pad.update', ['pad' => $model]); + $pad = PAD::find($id); + $status = Constants::listStatus(); + + return view('pad.admin.edit', ['pad' => $pad, 'status' => $status]); } /** @@ -98,11 +142,40 @@ class PADController extends Controller */ public function update(Request $request, $id) { - $model = PAD::find($id); - $model->name = $request->name; - $model->save(); + $validated = $request->validate([ + 'nome' => ['required', 'string', 'min:5', 'max:255'], + 'status' => ['required', 'integer'], + 'data_inicio' => ['required', 'date', 'before_or_equal:data_fim'], + 'data_fim' => ['required', 'date', 'after_or_equal:data_inicio'], + ], + [ + 'required' => 'O campo de :attribute é obrigatório', + 'nome.min' => 'O campo de :attribute deve ter no mínimo 5 letras', + 'nome.max' => 'O campo de :attribute deve ter no máximo 255 letras', + 'data_inicio.before_or_equal' => 'A :attribute deve ser uma data anterior ou igual a data de fim', + 'data_fim.after_or_equal' => 'A :attribute deve ser uma data posterior ou igual a data de início', + ]); - return redirect('/pad/index'); + if($validated) { + $model = new Pad($request->all()); + + if($model->save()) { + return redirect()->route('pad_index')->with('success', 'PAD atualizado com sucesso!'); + } else { + return redirect()->route('pad_index')->with('success', 'Erro ao atualizar o PAD!'); + } + } + } + + + public function delete($id) { + $model = Pad::find($id); + + if($model->delete()) { + return redirect()->route('pad_index')->with('success', 'PAD removido com sucesso!'); + } else { + return redirect()->route('pad_index')->with('fail', 'Não foi possível remover o PAD!'); + } } /** diff --git a/app/Models/PAD.php b/app/Models/PAD.php index 3f3920e..9ec3a7f 100644 --- a/app/Models/PAD.php +++ b/app/Models/PAD.php @@ -2,44 +2,32 @@ namespace App\Models; +use App\Models\Tabelas\Constants; +use Carbon\Carbon; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; +use PHPUnit\TextUI\XmlConfiguration\Constant; -class PAD extends Model +class Pad extends Model { use HasFactory; - /** - * References table PADs - * - * @var string - */ - protected $table = 'PADs'; - - /** - * The attributes that are mass assignable. - * - * @var array - */ - protected $fillable = ['ano', 'semestre', 'carga_horaria', 'categoria', 'afastamento_total', 'afastamento_parcial', 'exerce_funcao_admin', 'exerce_funcao_sindical', 'licenca_de_acor_legais', 'outras_observacoes', 'professor_id', 'curso_id']; - - /** - * Get User with user.id = user.campus_id - * - * @return User - */ - public function professor() - { - return $this->belongsTo(User::class); + protected $table = 'pad'; + + protected $fillable = ['id', 'nome', 'data_inicio', 'data_fim', 'status']; + + protected $dates = ['deleted_at']; + + public function getStatusAsText() { + return Constants::listStatus($this->status); + } + + public function getDateInicio() { + return Carbon::parse($this->data_inicio)->format('d/m/Y'); } - /** - * Get Curso with curso.id = curso.curso_id - * - * @return Curso - */ - public function curso() - { - return $this->belongsTo(Curso::class); + public function getDateFim() { + return Carbon::parse($this->data_fim)->format('d/m/Y'); } } diff --git a/app/Models/Tabelas/Constants.php b/app/Models/Tabelas/Constants.php index 3a88f71..54002d3 100644 --- a/app/Models/Tabelas/Constants.php +++ b/app/Models/Tabelas/Constants.php @@ -24,6 +24,10 @@ class Constants { const NATUREZA_VIVENCIA = 4; const NATUREZA_OUTROS = 5; + const STATUS_ATIVO = 1; + const STATUS_INATIVO = 2; + const STATUS_ARQUIVADO = 3; + /** * @return array|string @@ -91,7 +95,15 @@ class Constants { return $value !== null? $values[$value] : $values; } + public static function listStatus($value = null) { + $values = [ + self::STATUS_ATIVO => 'Ativo', + self::STATUS_INATIVO => 'Inativo', + self::STATUS_ARQUIVADO => 'Arquivado', + ]; + return $value !== null? $values[$value] : $values; + } } \ No newline at end of file diff --git a/database/migrations/2022_06_18_192335_create_pad_table.php b/database/migrations/2022_06_18_192335_create_pad_table.php new file mode 100644 index 0000000..b24dd98 --- /dev/null +++ b/database/migrations/2022_06_18_192335_create_pad_table.php @@ -0,0 +1,36 @@ +id(); + $table->string('nome'); + $table->date('data_inicio'); + $table->date('data_fim'); + $table->boolean('status'); + $table->softDeletes(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('pad'); + } +} diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index bd75be5..112289c 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -2,7 +2,6 @@ namespace Database\Seeders; -use App\Models\Unidade; use Illuminate\Database\Seeder; class DatabaseSeeder extends Seeder @@ -22,7 +21,7 @@ class DatabaseSeeder extends Seeder CursoSeeder::class, UserSeeder::class, PlanejamentoSeeder::class, - PADSeeder::class, + PadSeeder::class, DisciplinaSeeder::class, ]); } diff --git a/database/seeders/PADSeeder.php b/database/seeders/PADSeeder.php index 92d35d8..df0ff2d 100644 --- a/database/seeders/PADSeeder.php +++ b/database/seeders/PADSeeder.php @@ -6,7 +6,7 @@ use App\Models\PAD; use App\Models\User; use Illuminate\Database\Seeder; -class PADSeeder extends Seeder +class PadSeeder extends Seeder { /** * Run the database seeds. @@ -14,14 +14,6 @@ class PADSeeder extends Seeder * @return void */ public function run() - { - $users = User::where('type', '=', User::TYPE_TEACHER)->get(); - foreach($users as $user) { - PAD::create([ - 'user_id' => $user->id, - 'licenca_de_acor_legais' => "" - ]); - } - + { } } diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index 09905ff..90d75b8 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -41,7 +41,7 @@ class UserSeeder extends Seeder 'name' => "Admin", 'email' => "admin@upe.br", 'email_verified_at' => null, - 'password' => Hash::make('12345678'), + 'password' => Hash::make('@admin'), 'document' => "100000000", 'status' => User::STATUS_ACTIVE, 'campus_id' => NULL, diff --git a/resources/views/campus/create.blade.php b/resources/views/campus/create.blade.php index 09b7869..4ba3082 100644 --- a/resources/views/campus/create.blade.php +++ b/resources/views/campus/create.blade.php @@ -47,7 +47,11 @@ @include('components.buttons.btn-cancel', [ 'route' => route('campus_index'), ]) - @include('components.buttons.btn-save') + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + 'btn_class' => 'btn btn-outline-success' + 'i_class' => '' + ]) diff --git a/resources/views/campus/index.blade.php b/resources/views/campus/index.blade.php index e4b4963..928ee05 100644 --- a/resources/views/campus/index.blade.php +++ b/resources/views/campus/index.blade.php @@ -18,7 +18,7 @@ @include('components.buttons.btn-create', [ 'route' => route('campus_create'), 'css' => '', - 'text' => 'Novo Campus', + 'content' => 'Novo Campus', 'id' => '', ]) @@ -40,6 +40,7 @@ {{ $camp->unidade }} @include('components.buttons.btn-edit', [ + 'btn_class' => 'btn btn-warning', 'route' => route('campus_edit', ['id' => $camp->id]), ]) @include('components.buttons.btn-soft-delete', [ diff --git a/resources/views/campus/update.blade.php b/resources/views/campus/update.blade.php index f8a15d1..5e55aea 100644 --- a/resources/views/campus/update.blade.php +++ b/resources/views/campus/update.blade.php @@ -46,7 +46,11 @@ @include('components.buttons.btn-cancel', [ 'route' => route('campus_index'), ]) - @include('components.buttons.btn-save') + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + 'btn_class' => 'btn btn-outline-success' + 'i_class' => '' + ]) diff --git a/resources/views/components/alerts.blade.php b/resources/views/components/alerts.blade.php index 15dba56..98ff793 100644 --- a/resources/views/components/alerts.blade.php +++ b/resources/views/components/alerts.blade.php @@ -1,8 +1,7 @@ @if( Session::has('success') ) @endif @@ -10,17 +9,13 @@ @if( Session::has('fail') ) @endif @if( Session::has('error') ) @endif diff --git a/resources/views/components/buttons/btn-create.blade.php b/resources/views/components/buttons/btn-create.blade.php index b9d0b47..f473460 100644 --- a/resources/views/components/buttons/btn-create.blade.php +++ b/resources/views/components/buttons/btn-create.blade.php @@ -1,4 +1,4 @@ - + - {{$text}} + {{$content}} diff --git a/resources/views/components/buttons/btn-delete.blade.php b/resources/views/components/buttons/btn-delete.blade.php index f198731..f8e601b 100644 --- a/resources/views/components/buttons/btn-delete.blade.php +++ b/resources/views/components/buttons/btn-delete.blade.php @@ -1,30 +1,27 @@ - - diff --git a/resources/views/curso/index.blade.php b/resources/views/curso/index.blade.php index ce5354c..ebeef55 100644 --- a/resources/views/curso/index.blade.php +++ b/resources/views/curso/index.blade.php @@ -17,8 +17,8 @@

TODOS OS CURSO

@include('components.buttons.btn-create', [ 'route' => route('curso_create'), - 'css' => '', - 'text' => 'Novo Curso', + 'class' => '', + 'content' => 'Novo Curso', 'id' => '', ]) @@ -40,6 +40,7 @@ {{ $curso->campus }} @include('components.buttons.btn-edit', [ + 'btn_class' => 'btn btn-warning', 'route' => route('curso_edit', ['id' => $curso->id]), ]) @include('components.buttons.btn-soft-delete', [ diff --git a/resources/views/diretor/index.blade.php b/resources/views/diretor/index.blade.php index f540fed..0e40ea4 100644 --- a/resources/views/diretor/index.blade.php +++ b/resources/views/diretor/index.blade.php @@ -17,8 +17,8 @@

TODOS OS Diretores

@include('components.buttons.btn-create', [ 'route' => route('diretor_create'), - 'css' => '', - 'text' => 'Novo Diretor', + 'class' => '', + 'content' => 'Novo Diretor', 'id' => '', ]) @@ -39,10 +39,12 @@ {{ $diretor->document }} @include('components.buttons.btn-edit', [ + 'btn_class' => 'btn btn-warning', 'route' => route('diretor_edit', ['id' => $diretor->id]), ]) @include('components.buttons.btn-delete', [ 'route' => route('diretor_delete', ['id' => $diretor->id]), + 'btn_class' => 'btn btn-danger', 'modal_id' => $diretor->id, ]) diff --git a/resources/views/layouts/user-dashboard/dashboard_admin.blade.php b/resources/views/layouts/user-dashboard/dashboard_admin.blade.php index a244471..b554c8a 100644 --- a/resources/views/layouts/user-dashboard/dashboard_admin.blade.php +++ b/resources/views/layouts/user-dashboard/dashboard_admin.blade.php @@ -89,7 +89,7 @@

Gestão de Unidades

- @include('components.buttons.btn-create', ['route' => route('unidade_create'), 'id' => 'btn-create-unidade', 'css' => 'btn btn-primary', 'text' => 'Cadastrar Nova Unidade']) + @include('components.buttons.btn-create', ['route' => route('unidade_create'), 'id' => 'btn-create-unidade', 'class' => 'btn btn-primary', 'content' => 'Cadastrar Nova Unidade']) @section('form-unidade-create') @show diff --git a/resources/views/layouts/user-jquery/jquery_admin.blade.php b/resources/views/layouts/user-jquery/jquery_admin.blade.php index 3abb2b3..1abbb40 100644 --- a/resources/views/layouts/user-jquery/jquery_admin.blade.php +++ b/resources/views/layouts/user-jquery/jquery_admin.blade.php @@ -25,8 +25,8 @@ $( document ).ready(() => { ${index+1} ${unidade.name} - @include('components.buttons.btn-edit', ['route' => '']) - @include('components.buttons.btn-delete', ['route' => '']) + @include('components.buttons.btn-edit', ['btn_class' => 'btn btn-warning', 'route' => '']) + @include('components.buttons.btn-delete', ['id' => '', 'btn_class' => '', 'route' => '']) `) diff --git a/resources/views/pad/admin/create.blade.php b/resources/views/pad/admin/create.blade.php new file mode 100644 index 0000000..5fb8722 --- /dev/null +++ b/resources/views/pad/admin/create.blade.php @@ -0,0 +1,80 @@ +@extends('layouts.main') + +@section('title', 'Novo') +@section('header') + @include('layouts.header', [ + 'user' => Auth::user(), + ]) +@endsection +@section('nav') + @include('layouts.navigation', []) +@endsection +@section('body') +
+ +
+

Pad - Criar

+
+ +
+ @csrf +
+
+ + + @error('nome') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('status') +
+ {{$message}} +
+ @enderror +
+
+ +
+
+ + + @error('data_inicio') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('data_fim') +
+ {{$message}} +
+ @enderror +
+ +
+ +
+ @include('components.buttons.btn-save', [ + 'btn_class' => 'btn btn-outline-success', + 'i_class' => '', + 'content' => 'Cadastrar', + ]) +
+
+ +
+@endsection diff --git a/resources/views/pad/admin/edit.blade.php b/resources/views/pad/admin/edit.blade.php new file mode 100644 index 0000000..9a1fea9 --- /dev/null +++ b/resources/views/pad/admin/edit.blade.php @@ -0,0 +1,81 @@ +@extends('layouts.main') + +@section('title', 'Novo') +@section('header') + @include('layouts.header', [ + 'user' => Auth::user(), + ]) +@endsection +@section('nav') + @include('layouts.navigation', []) +@endsection +@section('body') +
+ +
+

Pad - Atualizar

+
+ +
+ @csrf + @method('PUT') +
+
+ + + @error('nome') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('status') +
+ {{$message}} +
+ @enderror +
+
+ +
+
+ + + @error('data_inicio') +
+ {{$message}} +
+ @enderror +
+ +
+ + + @error('data_fim') +
+ {{$message}} +
+ @enderror +
+ +
+ +
+ @include('components.buttons.btn-save', [ + 'btn_class' => 'btn btn-outline-success', + 'i_class' => '', + 'content' => 'Atualizar', + ]) +
+
+ +
+@endsection diff --git a/resources/views/pad/admin/index.blade.php b/resources/views/pad/admin/index.blade.php new file mode 100644 index 0000000..aa9ffc0 --- /dev/null +++ b/resources/views/pad/admin/index.blade.php @@ -0,0 +1,89 @@ +@extends('layouts.main') + +@section('title', 'Início') + +@section('header') + @include('layouts.header', [ + 'user' => Auth::user(), + ]) +@endsection + +@section('nav') + @include('layouts.navigation', []) +@endsection + +@section('body') + +
+ +

PAD - Listagem

+ +
+ + @include('components.alerts') + +
+ @include('components.buttons.btn-create', [ + 'id' => 'pad_create', + 'class' => 'btn-outline-success', + 'route' => route('pad_create'), + 'content' => 'Cadastrar', + ]) +
+ +
+ + + + + + + + + + + + + + @php + $index_row = 1; + @endphp + + @foreach($pads as $pad) + + + + + + + + + @endforeach + +
#NomeData de inícioData de fimStatusOpções
{{ $index_row++ }}{{ $pad->nome }}{{ $pad->getDateInicio() }}{{ $pad->getDateFim() }}{{ $pad->getStatusAsText() }} + @include('components.buttons.btn-edit', [ + 'btn_class' => 'btn btn-outline-primary', + 'route' => route('pad_edit', ['id' => $pad->id]) + ]) + + @include('components.buttons.btn-delete', [ + 'id' => $pad->id, + 'btn_class' => 'btn btn-outline-danger', + 'route' => route('pad_delete', ['id' => $pad->id]) + ]) +
+ +
+ +
+ +
+@endsection + +@section('script') + + + +@endsection \ No newline at end of file diff --git a/resources/views/unidade/create.blade.php b/resources/views/unidade/create.blade.php index 2d3f806..e1a863f 100644 --- a/resources/views/unidade/create.blade.php +++ b/resources/views/unidade/create.blade.php @@ -33,7 +33,11 @@ @include('components.buttons.btn-cancel', [ 'route' => route('unidade_index'), ]) - @include('components.buttons.btn-save') + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + 'btn_class' => 'btn btn-outline-success' + 'i_class' => '' + ]) diff --git a/resources/views/unidade/index.blade.php b/resources/views/unidade/index.blade.php index f57a34b..a2e71b5 100644 --- a/resources/views/unidade/index.blade.php +++ b/resources/views/unidade/index.blade.php @@ -17,8 +17,8 @@

TODAS AS UNIDADES

@include('components.buttons.btn-create', [ 'route' => route('unidade_create'), - 'css' => '', - 'text' => 'Nova Unidade', + 'class' => '', + 'content' => 'Nova Unidade', 'id' => '', ]) diff --git a/resources/views/unidade/update.blade.php b/resources/views/unidade/update.blade.php index f2dd78d..7dd3136 100644 --- a/resources/views/unidade/update.blade.php +++ b/resources/views/unidade/update.blade.php @@ -32,7 +32,11 @@ @include('components.buttons.btn-cancel', [ 'route' => route('unidade_index'), ]) - @include('components.buttons.btn-save') + @include('components.buttons.btn-save', [ + 'content' => 'Cadastrar' + 'btn_class' => 'btn btn-outline-success' + 'i_class' => '' + ]) diff --git a/routes/web.php b/routes/web.php index f2b5d65..6b29265 100644 --- a/routes/web.php +++ b/routes/web.php @@ -9,7 +9,7 @@ use App\Http\Controllers\Dimensao\ExtensaoController; use App\Http\Controllers\Dimensao\GestaoController; use App\Http\Controllers\DisciplinaController; use App\Http\Controllers\UnidadeController; -use App\Http\Controllers\PADController; +use App\Http\Controllers\PadController; use App\Http\Controllers\Dimensao\Tabelas\Ensino\EnsinoAulaController; use App\Http\Controllers\UserController; use App\Http\Controllers\CoordenadorController; @@ -73,13 +73,12 @@ Route::prefix('/ensino')->group(function () { }); Route::prefix('/pad')->group(function () { - Route::get('/index', [PADController::class, 'index'])->name('pad_index'); - Route::get('/create', [PADController::class, 'create'])->name('pad_create'); - Route::post('/store', [PADController::class, 'store'])->name('pad_store'); - Route::get('/edit/{id}', [PADController::class, 'edit'])->name('pad_edit'); - Route::post('/update/{id}', [PADController::class, 'update'])->name('pad_update'); - Route::delete('/delete/{id}', [PADController::class, 'destroy'])->name('pad_delete'); - Route::get('/anexo', [PADController::class, 'anexo'])->name('pad_anexo'); + Route::get('/index', [PadController::class, 'index'])->name('pad_index'); + Route::get('/create', [PadController::class, 'create'])->name('pad_create'); + Route::post('/store', [PadController::class, 'store'])->name('pad_store'); + Route::get('/edit/{id}', [PadController::class, 'edit'])->name('pad_edit'); + Route::put('/update/{id}', [PadController::class, 'update'])->name('pad_update'); + Route::delete('/delete/{id}', [PadController::class, 'delete'])->name('pad_delete'); }); Route::prefix('/coordenador')->group(function () { -- GitLab