From 4de74c8f5f295239b3bccecfa93d7e8fc907933a Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Fri, 11 Apr 2025 18:41:09 +0200 Subject: [PATCH] feat: Remove useless dutyhours and home --- .../Controllers/Bo/DashboardController.php | 29 ---- .../Controllers/Bo/DutyhourController.php | 157 ------------------ .../Bo/Dutyhours/StoreDutyhourRequest.php | 47 ------ .../Bo/Dutyhours/UpdateDutyhourRequest.php | 7 - app/Models/Dutyhour.php | 43 ----- app/Providers/RouteServiceProvider.php | 2 - ...25_04_11_183728_delete_dutyhours_table.php | 30 ++++ resources/lang/en/models.php | 1 - resources/lang/fr/models.php | 1 - .../views/bo/pages/dutyhours/create.blade.php | 46 ----- .../views/bo/pages/dutyhours/edit.blade.php | 62 ------- .../bo/pages/dutyhours/form-inputs.blade.php | 98 ----------- .../views/bo/pages/dutyhours/index.blade.php | 68 -------- resources/views/home.blade.php | 58 ------- resources/views/layout/nav.blade.php | 3 - routes/breadcrumbs-bo.php | 14 -- routes/web-bo.php | 7 +- 17 files changed, 33 insertions(+), 640 deletions(-) delete mode 100644 app/Http/Controllers/Bo/DashboardController.php delete mode 100644 app/Http/Controllers/Bo/DutyhourController.php delete mode 100644 app/Http/Requests/Bo/Dutyhours/StoreDutyhourRequest.php delete mode 100644 app/Http/Requests/Bo/Dutyhours/UpdateDutyhourRequest.php delete mode 100644 app/Models/Dutyhour.php create mode 100644 database/migrations/2025_04_11_183728_delete_dutyhours_table.php delete mode 100644 resources/views/bo/pages/dutyhours/create.blade.php delete mode 100644 resources/views/bo/pages/dutyhours/edit.blade.php delete mode 100644 resources/views/bo/pages/dutyhours/form-inputs.blade.php delete mode 100644 resources/views/bo/pages/dutyhours/index.blade.php delete mode 100644 resources/views/home.blade.php diff --git a/app/Http/Controllers/Bo/DashboardController.php b/app/Http/Controllers/Bo/DashboardController.php deleted file mode 100644 index 0dcd653..0000000 --- a/app/Http/Controllers/Bo/DashboardController.php +++ /dev/null @@ -1,29 +0,0 @@ -', now()->modify('-1 day')) - ->orderBy('date', 'asc') - ->limit(10) - ->get(); - return view('home', compact('dutyhourModels')); - } -} diff --git a/app/Http/Controllers/Bo/DutyhourController.php b/app/Http/Controllers/Bo/DutyhourController.php deleted file mode 100644 index b936483..0000000 --- a/app/Http/Controllers/Bo/DutyhourController.php +++ /dev/null @@ -1,157 +0,0 @@ -search; - if ($search) { - $this->searchQuery( - $dutyhourModels, - $search, - null, - 'date', - 'person', - 'place' - ); - } - $searchFields = trans('Date, personne, lieu'); - - /** Sort columns with a query */ - $this->sortQuery($dutyhourModels); - - /** Custom pagination */ - $dutyhourModels = $this->customPaginate($dutyhourModels, $request->pagination); - - return view('bo.pages.dutyhours.index', compact('dutyhourModels', 'search', 'searchFields')); - } - - /** - * Show the form for creating a new resource. - * - * @param \App\Models\Dutyhour $dutyhour - * @return \Illuminate\Contracts\View\View - */ - public function create(Dutyhour $dutyhour): \Illuminate\Contracts\View\View - { - return view('bo.pages.dutyhours.create', [ - 'dutyhourModel' => $dutyhour - ]); - } - - /** - * Store a newly created resource in storage. - * - * @param \App\Http\Requests\Bo\Dutyhours\StoreDutyhourRequest $request - * @return \Illuminate\Http\RedirectResponse - */ - public function store(StoreDutyhourRequest $request): \Illuminate\Http\RedirectResponse - { - return DB::transaction(function () use ($request) { - $dutyhour = new Dutyhour(); - $dutyhour->fill($request->validated()); - - if ($dutyhour->saveOrFail()) { - return redirect() - ->route('bo.dutyhours.edit', $dutyhour) - ->with('success', trans( - 'crud.messages.has_been_created', - ['model' => Str::singular(trans('models.classes.dutyhours'))] - )); - } - return redirect() - ->back() - ->with('error', trans( - 'crud.messages.cannot_be_created', - ['model' => Str::singular(trans('models.classes.dutyhours'))] - )); - }); - } - - /** - * Show the form for editing the specified resource. - * - * @param \App\Models\Dutyhour $dutyhour - * @return \Illuminate\Contracts\View\View - */ - public function edit(Dutyhour $dutyhour): \Illuminate\Contracts\View\View - { - return view('bo.pages.dutyhours.edit', [ - 'dutyhourModel' => $dutyhour - ]); - } - - /** - * Update the specified resource in storage. - * - * @param \App\Http\Requests\Bo\Dutyhours\UpdateDutyhourRequest $request - * @param \App\Models\Dutyhour $dutyhour - * @return \Illuminate\Http\RedirectResponse - */ - public function update(UpdateDutyhourRequest $request, Dutyhour $dutyhour): \Illuminate\Http\RedirectResponse - { - return DB::transaction(function () use ($request, $dutyhour) { - $dutyhour->fill($request->validated()); - if ($dutyhour->saveOrFail()) { - return redirect() - ->route('bo.dutyhours.edit', $dutyhour) - ->with('success', trans( - 'crud.messages.has_been_updated', - ['model' => Str::singular(trans('models.classes.dutyhours'))] - )); - } //end if - return redirect() - ->back() - ->with('error', trans( - 'crud.messages.cannot_be_updated', - ['model' => Str::singular(trans('models.classes.dutyhours'))] - )); - }); - } - - /** - * Remove the specified resource from storage. - * - * @param \App\Models\Dutyhour $dutyhour - * @return \Illuminate\Http\RedirectResponse - */ - public function destroy(Dutyhour $dutyhour): \Illuminate\Http\RedirectResponse - { - return DB::transaction(function () use ($dutyhour) { - if ($dutyhour->deleteOrFail()) { - return redirect() - ->route('bo.dutyhours.index') - ->with('success', trans( - 'crud.messages.has_been_deleted', - ['model' => Str::singular(trans('models.classes.dutyhours'))] - )); - } - return redirect() - ->back() - ->with('error', trans( - ':crud.messages.cannot_be_deleted', - ['model' => Str::singular(trans('models.classes.dutyhours'))] - )); - }); - } -} diff --git a/app/Http/Requests/Bo/Dutyhours/StoreDutyhourRequest.php b/app/Http/Requests/Bo/Dutyhours/StoreDutyhourRequest.php deleted file mode 100644 index d7751ab..0000000 --- a/app/Http/Requests/Bo/Dutyhours/StoreDutyhourRequest.php +++ /dev/null @@ -1,47 +0,0 @@ - 'required|date|after_or_equal:today', - 'person' => 'required|string|min:3|max:255', - 'place' => 'required|string|min:3|max:255', - ]; - } - - /** - * Get custom attributes for validator errors. - * - * @return array - */ - public function attributes(): array - { - return [ - 'date' => trans('Date de la permanence'), - 'person' => trans('Personne associée à la permanence'), - 'place' => trans('Lieu de la permanence'), - ]; - } -} diff --git a/app/Http/Requests/Bo/Dutyhours/UpdateDutyhourRequest.php b/app/Http/Requests/Bo/Dutyhours/UpdateDutyhourRequest.php deleted file mode 100644 index b82afda..0000000 --- a/app/Http/Requests/Bo/Dutyhours/UpdateDutyhourRequest.php +++ /dev/null @@ -1,7 +0,0 @@ - 'date' - ]; -} diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index f89694d..56b3a6d 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -6,7 +6,6 @@ use App\Models\Brand; use App\Models\Company; use App\Models\Credit\Account; use App\Models\Credit\CreditLog; -use App\Models\Dutyhour; use App\Models\Information; use App\Models\Invoice; use App\Models\Label; @@ -91,7 +90,6 @@ class RouteServiceProvider extends ServiceProvider Route::model('label', Label::class); Route::model('marker', Marker::class); Route::model('package', Package::class); - Route::model('dutyhour', Dutyhour::class); Route::model('information', Information::class); Route::model('company', Company::class); Route::model('invoice', Invoice::class); diff --git a/database/migrations/2025_04_11_183728_delete_dutyhours_table.php b/database/migrations/2025_04_11_183728_delete_dutyhours_table.php new file mode 100644 index 0000000..77d5818 --- /dev/null +++ b/database/migrations/2025_04_11_183728_delete_dutyhours_table.php @@ -0,0 +1,30 @@ +id(); + $table->date('date')->unique(); + $table->string('person'); + $table->string('place'); + $table->timestamps(); + }); + } +}; diff --git a/resources/lang/en/models.php b/resources/lang/en/models.php index 425de54..d659268 100644 --- a/resources/lang/en/models.php +++ b/resources/lang/en/models.php @@ -14,7 +14,6 @@ return [ 'packages' => 'Packages', 'invoices' => 'Invoices', 'companies' => 'Companies', - 'dutyhours' => 'Duty Hours', 'informations' => 'Informations', 'ticket_types' => 'Ticket types' ] diff --git a/resources/lang/fr/models.php b/resources/lang/fr/models.php index 314efcd..5d7e88b 100644 --- a/resources/lang/fr/models.php +++ b/resources/lang/fr/models.php @@ -13,7 +13,6 @@ return [ 'packages' => 'Forfaits', 'invoices' => 'Devis', 'companies' => 'Sociétés', - 'dutyhours' => 'Permanences', 'informations' => 'Informations', 'ticket_types' => 'Type de ticket|Types de tickets' ] diff --git a/resources/views/bo/pages/dutyhours/create.blade.php b/resources/views/bo/pages/dutyhours/create.blade.php deleted file mode 100644 index 0931033..0000000 --- a/resources/views/bo/pages/dutyhours/create.blade.php +++ /dev/null @@ -1,46 +0,0 @@ -@extends('layout.app', ['brParam' => $dutyhourModel]) - -@section('title', __('Création d\'une :model', ['model' => Str::singular(__('models.classes.dutyhours'))])) -@section('description', __('Création d\'une toute nouvelle :model', ['model' => Str::singular(__('models.classes.dutyhours'))])) -@section('breadcrumb', request()->route()->getName()) - -@section('content') -
-
- - - - @include('breadcrumbs.breadcrumb-body', ['brParam' => $dutyhourModel]) -
-
- -
-
-
- @csrf - @include('bo.pages.dutyhours.form-inputs') -
-
- -
-
-
-@endsection diff --git a/resources/views/bo/pages/dutyhours/edit.blade.php b/resources/views/bo/pages/dutyhours/edit.blade.php deleted file mode 100644 index 665f253..0000000 --- a/resources/views/bo/pages/dutyhours/edit.blade.php +++ /dev/null @@ -1,62 +0,0 @@ -@extends('layout.app', ['brParam' => $dutyhourModel]) - -@section('title', __('Édition d\'une :model', ['model' => Str::singular(__('models.classes.dutyhours'))])) -@section('description', __('Édition d\'une :model déjà existante', ['model' => Str::singular(__('models.classes.dutyhours'))])) -@section('breadcrumb', request()->route()->getName()) - -@section('content') -
-
- - - - @include('breadcrumbs.breadcrumb-body', ['brParam' => $dutyhourModel]) -
-
-
- @csrf - @method('DELETE') -
- - -
-
-
-
-
- @csrf - @method('PUT') - @include('bo.pages.dutyhours.form-inputs') -
-
- -
-
-
-@endsection diff --git a/resources/views/bo/pages/dutyhours/form-inputs.blade.php b/resources/views/bo/pages/dutyhours/form-inputs.blade.php deleted file mode 100644 index 1eff637..0000000 --- a/resources/views/bo/pages/dutyhours/form-inputs.blade.php +++ /dev/null @@ -1,98 +0,0 @@ -
- {{-- DATE --}} -
-
- {{ Str::ucfirst(__('validation.attributes.date')) }} -
-
- @include('bo.partials.inputs.date', [ - 'id' => 'dutyhourDate', - 'label' => __(':field de la :model', [ - 'field' => Str::ucfirst(__('validation.attributes.date')), - 'model' => Str::singular(__('models.classes.dutyhours')), - ]), - 'name' => 'date', - 'defaultValue' => true, - 'required' => true, - 'model' => $dutyhourModel ?? null, - 'helper' => __('La date doit être supérieure ou égale à aujourd\'hui.'), - ]) -
-
-
-
- {{-- PERSON --}} -
-
- {{ Str::ucfirst(__('validation.attributes.person')) }} -
-
- @include('bo.partials.inputs.varchar', [ - 'id' => 'dutyhourPerson', - 'label' => __('Nom de la personne présente lors de la :model', [ - 'model' => Str::singular(__('models.classes.dutyhours')), - ]), - 'hasWordCounter' => true, - 'name' => 'person', - 'required' => true, - 'model' => $dutyhourModel ?? null, - 'helper' => __('validation.between.string', [ - 'attribute' => __('Nom de la personne présente lors de la :model', [ - 'model' => Str::singular(__('models.classes.dutyhours')), - ]), - 'min' => 3, - 'max' => 255, - ]), - 'placeholder' => __(':field de la personne', [ - 'field' => Str::ucfirst(__('validation.attributes.name')), - ]), - ]) -
-
-
-
- {{-- PLACE --}} -
-
- {{ Str::ucfirst(__('validation.attributes.place')) }} -
-
- @include('bo.partials.inputs.varchar', [ - 'id' => 'dutyhourPlace', - 'label' => __('Endroit où se déroule la :model', [ - 'model' => Str::singular(__('models.classes.dutyhours')), - ]), - 'hasWordCounter' => true, - 'name' => 'place', - 'required' => true, - 'model' => $dutyhourModel ?? null, - 'helper' => __('validation.between.string', [ - 'attribute' => __('endroit où se déroule la :model', [ - 'model' => Str::singular(__('models.classes.dutyhours')), - ]), - 'min' => 3, - 'max' => 255, - ]), - 'placeholder' => __('Lieu de la :model', [ - 'model' => Str::singular(__('models.classes.dutyhours')), - ]), - ]) -
-
-
-
-
- -@push('scripts') - -@endpush diff --git a/resources/views/bo/pages/dutyhours/index.blade.php b/resources/views/bo/pages/dutyhours/index.blade.php deleted file mode 100644 index fce6170..0000000 --- a/resources/views/bo/pages/dutyhours/index.blade.php +++ /dev/null @@ -1,68 +0,0 @@ -@extends('layout.app') - -@section('title', __('models.classes.dutyhours')) -@section('description', __('Liste de toutes les :model', ['model' => __('models.classes.dutyhours')])) - -@section('content') -
- @include('breadcrumbs.breadcrumb-body') - - - -
-@include('bo.modules.search-bar') - - @if (count($dutyhourModels) > 0) - - @include('bo.modules.table-col-sorter', [ - 'cols' => [ - 'date' => Str::ucfirst(__('validation.attributes.date')), - 'person' => Str::ucfirst(__('validation.attributes.person')), - 'place' => Str::ucfirst(__('validation.attributes.place')), - ], - ]) - - - @foreach ($dutyhourModels as $dutyhourModel) - - - - - - - @endforeach - - @else - - - - @endif -
{{ $dutyhourModel->date->format('Y-m-d') }}{{ $dutyhourModel->person }}{{ $dutyhourModel->place }} -
- - - - @csrf - @method('DELETE') - -
-
{{ __('crud.other.no_model_found', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}
-{!! $dutyhourModels->links() !!} -@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php deleted file mode 100644 index 76a16d6..0000000 --- a/resources/views/home.blade.php +++ /dev/null @@ -1,58 +0,0 @@ -@extends('layout.app') - -@section('title', __('Accueil')) -@section('description', __('Page d\'accueil du site :site', ['site' => config('app.name')])) - -@section('content') -
-
-
- - {{ __('Créer un ticket') }} - - - {{ __('Voir mes sites') }} - -
-
-
-
-

- {{ __('models.classes.dutyhours') . __(' à venir') }} -

-
-
-
-
-
- - - - - - - - - - @if($dutyhourModels->count()) - @foreach ($dutyhourModels as $dutyhourModel) - - - - - - @endforeach - @else - - - - @endif - -
{{ __('Date') }}{{ __('Personne présente') }}{{ __('Lieu de la permanence') }}
{{ $dutyhourModel->date->formatLocalized('%d/%m/%Y') }}{{ $dutyhourModel->person }}{{ $dutyhourModel->place }}
- {{ __('Aucune :model prévue prochainement', ['model' => Str::singular(__('models.classes.dutyhours')) ])}} -
-
-
-
-
-@endsection diff --git a/resources/views/layout/nav.blade.php b/resources/views/layout/nav.blade.php index ff2ae1b..fd454e4 100644 --- a/resources/views/layout/nav.blade.php +++ b/resources/views/layout/nav.blade.php @@ -40,9 +40,6 @@ {{ __('models.classes.packages') }} @endcan @can('isAdmin') - {{ __('models.classes.dutyhours') }} - @endcan - @can('isAdmin') {{ __('models.classes.informations') }} @endcan @can('isAdmin') diff --git a/routes/breadcrumbs-bo.php b/routes/breadcrumbs-bo.php index d07d24b..adab166 100644 --- a/routes/breadcrumbs-bo.php +++ b/routes/breadcrumbs-bo.php @@ -3,7 +3,6 @@ use App\Enums\Invoices\InvoiceStatusEnum; use App\Models\Brand; use App\Models\Company; -use App\Models\Dutyhour; use App\Models\Information; use App\Models\Invoice; use App\Models\Label; @@ -28,19 +27,6 @@ Breadcrumbs::for('bo.packages.edit', function (Generator $trail, Package $packag $trail->push(__('crud.actions.edit'), route('bo.packages.edit', $package->id)); }); -// * DUTYHOURS -Breadcrumbs::for('bo.dutyhours.index', function (Generator $trail) { - $trail->push(__('models.classes.dutyhours'), route('bo.dutyhours.index')); -}); -Breadcrumbs::for('bo.dutyhours.create', function (Generator $trail) { - $trail->parent('bo.dutyhours.index'); - $trail->push(__('crud.actions.create'), route('bo.dutyhours.create')); -}); -Breadcrumbs::for('bo.dutyhours.edit', function (Generator $trail, Dutyhour $dutyhour) { - $trail->parent('bo.dutyhours.index'); - $trail->push(__('crud.actions.edit'), route('bo.dutyhours.edit', $dutyhour->id)); -}); - // * INFORMATIONS Breadcrumbs::for('bo.informations.index', function (Generator $trail) { $trail->push(__('models.classes.informations'), route('bo.informations.index')); diff --git a/routes/web-bo.php b/routes/web-bo.php index 5dd91c5..faca415 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -5,8 +5,6 @@ use App\Http\Controllers\Bo\CompanyController; use App\Http\Controllers\Bo\Credit\AccountController; use App\Http\Controllers\Bo\Credit\CreditLogController; use App\Http\Controllers\Bo\Credit\EstimationController; -use App\Http\Controllers\Bo\DashboardController; -use App\Http\Controllers\Bo\DutyhourController; use App\Http\Controllers\Bo\InformationController; use App\Http\Controllers\Bo\InvoiceController; use App\Http\Controllers\Bo\LabelController; @@ -43,7 +41,9 @@ Route::middleware('admin-secure') Route::middleware('auth:backend') ->group(function () { // * HOME - Route::get('/', [DashboardController::class, 'index'])->name('dashboard'); + Route::get('/', function(){ + return redirect()->route('bo.ticket.index'); + })->name('dashboard'); Route::middleware(['can:isAdmin']) ->group(function () { @@ -56,7 +56,6 @@ Route::middleware('admin-secure') ->middleware('htmlsanitize:template') ->parameters(['ticket_types' => 'ticket_type']); Route::resource('packages', PackageController::class)->except('show'); - Route::resource('dutyhours', DutyhourController::class)->except('show'); Route::resource('invoices', InvoiceController::class) ->withoutMiddleware('htmlsanitize') ->middleware(['htmlsanitize:comment']);