From 5e6aeadc8725877edea9dbd363940d492c61f59c Mon Sep 17 00:00:00 2001 From: alissonalbuquerque Date: Sun, 10 Mar 2024 17:08:10 -0300 Subject: [PATCH] =?UTF-8?q?add=20refatora=C3=A7=C3=A3o=20de=20apelidos=20d?= =?UTF-8?q?e=20rotas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/DashboardController.php | 3 --- app/Http/Controllers/TaskTimeController.php | 10 +++++----- resources/views/pad/teacher/view.blade.php | 10 +++++----- resources/views/task-time/create.blade.php | 6 +++--- resources/views/task-time/index.blade.php | 8 ++++---- resources/views/task-time/update.blade.php | 8 ++++---- routes/Task.php | 4 ++-- routes/{TaskTime.php => task_time.php} | 16 ++++++++-------- routes/web.php | 2 +- 9 files changed, 32 insertions(+), 35 deletions(-) rename routes/{TaskTime.php => task_time.php} (69%) diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 8da3af9..5c0653d 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -49,8 +49,5 @@ class DashboardController extends Controller return view('dashboard', ['userPads' => $userPads, 'menu' => Menu::HOME]); } - - dd('não entrou em nenhuh if'); - //return redirect()->route('login'); } } diff --git a/app/Http/Controllers/TaskTimeController.php b/app/Http/Controllers/TaskTimeController.php index b01dea1..9faca4a 100644 --- a/app/Http/Controllers/TaskTimeController.php +++ b/app/Http/Controllers/TaskTimeController.php @@ -32,7 +32,7 @@ class TaskTimeController extends Controller if($model->save()) { return redirect() - ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id]) + ->route('task_time_index', ['user_pad_id' => $model->user_pad_id]) ->with('success', 'Cadastro realizado com sucesso!'); } } @@ -54,12 +54,12 @@ class TaskTimeController extends Controller if($model->save()) { return redirect() - ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id]) + ->route('task_time_index', ['user_pad_id' => $model->user_pad_id]) ->with('success', 'Atualizado com sucesso!'); } return redirect() - ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id]) + ->route('task_time_index', ['user_pad_id' => $model->user_pad_id]) ->with('fail', 'Erro ao Atualizar!'); } @@ -70,12 +70,12 @@ class TaskTimeController extends Controller if($model->delete()) { return redirect() - ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id]) + ->route('task_time_index', ['user_pad_id' => $model->user_pad_id]) ->with('success', 'Deletado com sucesso!'); } return redirect() - ->route('TaskTimeIndex', ['user_pad_id' => $model->user_pad_id]) + ->route('task_time_index', ['user_pad_id' => $model->user_pad_id]) ->with('fail', 'Erro ao Deletar!'); } diff --git a/resources/views/pad/teacher/view.blade.php b/resources/views/pad/teacher/view.blade.php index 3c97e23..d9fc1e4 100644 --- a/resources/views/pad/teacher/view.blade.php +++ b/resources/views/pad/teacher/view.blade.php @@ -71,13 +71,13 @@ -
-
+ {{--
--}} + {{--

Horário

- -
-
+ +
--}} + {{--
--}}
diff --git a/resources/views/task-time/create.blade.php b/resources/views/task-time/create.blade.php index 2a7d96e..cdaabd0 100644 --- a/resources/views/task-time/create.blade.php +++ b/resources/views/task-time/create.blade.php @@ -2,7 +2,7 @@ use App\Models\TaskTime; @endphp -
+ @csrf @method('POST') @@ -94,7 +94,7 @@ @include('pad.components.scripts.ajaxValidation', [ 'btn_submit_id' => 'btn_submit', 'form_id' => 'task-time-form', - 'route' => route('TaskTimeValidation'), + 'route' => route('task_time_validation'), 'form_type' => 'create', ]) @@ -117,7 +117,7 @@ } }, ajax: { - url: '{{ route("TaskSearch") }}', + url: '{{ route("task_search") }}', data: function(params) { return { q: params.term, diff --git a/resources/views/task-time/index.blade.php b/resources/views/task-time/index.blade.php index 08de9e3..87bc653 100644 --- a/resources/views/task-time/index.blade.php +++ b/resources/views/task-time/index.blade.php @@ -119,25 +119,25 @@ @include('pad.components.scripts.dimensao.ensino.show_modal', [ 'modal_id' => 'modal', - 'route' => route('TaskTimeCreate', ['user_pad_id' => $user_pad_id]), + 'route' => route('task_time_create', ['user_pad_id' => $user_pad_id]), 'btn_class' => 'task-time-create', ]) @include('pad.components.scripts.dimensao.ensino.show_modal', [ 'modal_id' => 'modal', - 'route' => route('TaskTimeEdit'), + 'route' => route('task_time_edit'), 'btn_class' => 'btn-edit_task', ]) @endsection {{-- @include('components.buttons.btn-edit', [ - 'route' => route('TaskTimeEdit', ['id' => $model->id]) + 'route' => route('task_time_edit', ['id' => $model->id]) ]) @include('components.buttons.btn-delete', [ 'id' => $model->id, - 'route' => route('TaskTimeDelete', ['id' => $model->id]) + 'route' => route('task_time_delete', ['id' => $model->id]) ]) --}} {{-- @foreach($listTaskTime as $key => $taskTimes) diff --git a/resources/views/task-time/update.blade.php b/resources/views/task-time/update.blade.php index f1c19f6..aaf3c47 100644 --- a/resources/views/task-time/update.blade.php +++ b/resources/views/task-time/update.blade.php @@ -6,12 +6,12 @@ */ @endphp - + @method('DELETE') @csrf
-
+ @csrf @method('POST') @@ -115,7 +115,7 @@ @include('pad.components.scripts.ajaxValidation', [ 'btn_submit_id' => 'btn_submit', 'form_id' => 'task-time-update-form', - 'route' => route('TaskTimeValidation'), + 'route' => route('task_time_validation'), 'form_type' => 'update', ]) @@ -138,7 +138,7 @@ } }, ajax: { - url: '{{ route("TaskSearch") }}', + url: '{{ route("task_search") }}', data: function(params) { return { q: params.term, diff --git a/routes/Task.php b/routes/Task.php index dd14d70..80948f3 100644 --- a/routes/Task.php +++ b/routes/Task.php @@ -4,6 +4,6 @@ use App\Http\Controllers\TaskController; use Illuminate\Support\Facades\Route; Route::prefix('/tarefa/geral')->group(function () { - Route::get('/search', [TaskController::class, 'search'])->name('TaskSearch'); - Route::get('/search-by-id', [TaskController::class, 'searchById'])->name('TaskSearchById'); + Route::get('/search', [TaskController::class, 'search'])->name('task_search'); + Route::get('/search-by-id', [TaskController::class, 'searchById'])->name('task_search_by_id'); }); \ No newline at end of file diff --git a/routes/TaskTime.php b/routes/task_time.php similarity index 69% rename from routes/TaskTime.php rename to routes/task_time.php index eb56010..d0ba4a7 100644 --- a/routes/TaskTime.php +++ b/routes/task_time.php @@ -4,12 +4,12 @@ use App\Http\Controllers\TaskTimeController; use Illuminate\Support\Facades\Route; Route::prefix('/tarefa/horario')->group(function () { - Route::get('/index/{user_pad_id}', [TaskTimeController::class, 'index'])->name('TaskTimeIndex'); - Route::get('/create/{user_pad_id}', [TaskTimeController::class, 'create'])->name('TaskTimeCreate'); - Route::post('/save', [TaskTimeController::class, 'save'])->name('TaskTimeSave'); - Route::get('/edit/{id?}', [TaskTimeController::class, 'edit'])->name('TaskTimeEdit'); - Route::post('/update/{id}', [TaskTimeController::class, 'update'])->name('TaskTimeUpdate'); - Route::delete('/delete/{id}', [TaskTimeController::class, 'delete'])->name('TaskTimeDelete'); - Route::get('/search-task', [TaskTimeController::class, 'searchTask'])->name('TaskTimeSearchTask'); - Route::post('/validation', [TaskTimeController::class, 'ajaxValidation'])->name('TaskTimeValidation'); + Route::get('/index/{user_pad_id}', [TaskTimeController::class, 'index'])->name('task_time_index'); + Route::get('/create/{user_pad_id}', [TaskTimeController::class, 'create'])->name('task_time_create'); + Route::post('/save', [TaskTimeController::class, 'save'])->name('task_time_save'); + Route::get('/edit/{id?}', [TaskTimeController::class, 'edit'])->name('task_time_edit'); + Route::post('/update/{id}', [TaskTimeController::class, 'update'])->name('task_time_update'); + Route::delete('/delete/{id}', [TaskTimeController::class, 'delete'])->name('task_time_delete'); + Route::get('/search-task', [TaskTimeController::class, 'searchTask'])->name('task_time_search'); + Route::post('/validation', [TaskTimeController::class, 'ajaxValidation'])->name('task_time_validation'); }); diff --git a/routes/web.php b/routes/web.php index 56a1ad8..488798f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -49,7 +49,7 @@ require __DIR__ . '/user_type.php'; require __DIR__ . '/Task.php'; -require __DIR__ . '/TaskTime.php'; +require __DIR__ . '/task_time.php'; require __DIR__ . '/dimensao/dimensao.php'; -- GitLab