feat: Remove useless dutyhours and home

This commit is contained in:
Vincent BRIDIER 2025-04-11 18:41:09 +02:00
parent e06558d8c6
commit 4de74c8f5f
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
17 changed files with 33 additions and 640 deletions

View file

@ -1,29 +0,0 @@
<?php
namespace App\Http\Controllers\Bo;
use App\Http\Controllers\Controller;
use App\Models\Dutyhour;
use Illuminate\Contracts\View\View;
class DashboardController extends Controller
{
/**
* Show Home page
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index(): View
{
/**
* Get only duty hours for today or later.
*
* @var \Illuminate\Database\Eloquent\Builder $dutyhour
*/
$dutyhourModels = Dutyhour::where('date', '>', now()->modify('-1 day'))
->orderBy('date', 'asc')
->limit(10)
->get();
return view('home', compact('dutyhourModels'));
}
}

View file

@ -1,157 +0,0 @@
<?php
namespace App\Http\Controllers\Bo;
use App\Http\Controllers\Controller;
use App\Http\Requests\Bo\Dutyhours\StoreDutyhourRequest;
use App\Http\Requests\Bo\Dutyhours\UpdateDutyhourRequest;
use App\Models\Dutyhour;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
class DutyhourController extends Controller
{
/**
* Display a listing of the resource.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\View
*/
public function index(Request $request): \Illuminate\Contracts\View\View
{
/** @var \Illuminate\Database\Eloquent\Builder $dutyhourModels */
$dutyhourModels = Dutyhour::query();
/** @var string $search Search field */
$search = $request->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'))]
));
});
}
}

View file

@ -1,47 +0,0 @@
<?php
namespace App\Http\Requests\Bo\Dutyhours;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate;
class StoreDutyhourRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return boolean
*/
public function authorize()
{
return Gate::allows('isAdmin');
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'date' => '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'),
];
}
}

View file

@ -1,7 +0,0 @@
<?php
namespace App\Http\Requests\Bo\Dutyhours;
class UpdateDutyhourRequest extends StoreDutyhourRequest
{
}

View file

@ -1,43 +0,0 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
/**
* @property date $date
* @property string $person
* @property string $place
*/
class Dutyhour extends Model
{
use HasFactory;
/**
* Indicates if the model should be timestamped.
*
* @var boolean
*/
public $timestamps = true;
/**
* The attributes that are fillable.
*
* @var array
*/
protected $fillable = [
'date',
'person',
'place'
];
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $casts = [
'date' => 'date'
];
}

View file

@ -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);

View file

@ -0,0 +1,30 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::dropIfExists('dutyhours');
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::create('dutyhours', function (Blueprint $table) {
$table->id();
$table->date('date')->unique();
$table->string('person');
$table->string('place');
$table->timestamps();
});
}
};

View file

@ -14,7 +14,6 @@ return [
'packages' => 'Packages',
'invoices' => 'Invoices',
'companies' => 'Companies',
'dutyhours' => 'Duty Hours',
'informations' => 'Informations',
'ticket_types' => 'Ticket types'
]

View file

@ -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'
]

View file

@ -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')
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pb-3">
<div class="d-flex flex-row align-items-center">
<a href="{{ route('bo.dutyhours.index') }}"
class="btn btn-primary text-decoration-none m-0 me-2"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.list_all', ['model' => __('models.classes.dutyhours')]) }}">
<i class="fa-solid fa-arrow-left"></i>
</a>
@include('breadcrumbs.breadcrumb-body', ['brParam' => $dutyhourModel])
</div>
<div class="mb-2 mb-md-0">
<button id="formSubmitClone"
type="submit"
class="btn btn-primary"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}">
{{ __('crud.actions.save') }}
</button>
</div>
</div>
<form action="{{ route('bo.dutyhours.store') }}" method="POST" enctype="multipart/form-data">
@csrf
@include('bo.pages.dutyhours.form-inputs')
<div class="row mt-3">
<div class="col text-center">
<button id="formSubmit"
type="submit"
class="btn btn-primary"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}">
{{ __('crud.actions.save') }}
</button>
</div>
</div>
</form>
@endsection

View file

@ -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')
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pb-3">
<div class="d-flex flex-row align-items-start">
<a href="{{ route('bo.dutyhours.index') }}"
class="btn btn-primary text-decoration-none m-0 me-2"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.list_all', ['model' => __('models.classes.dutyhours')]) }}">
<i class="fa-solid fa-arrow-left"></i>
</a>
@include('breadcrumbs.breadcrumb-body', ['brParam' => $dutyhourModel])
</div>
<div class="mb-2 mb-md-0">
<form action="{{ route('bo.dutyhours.destroy', $dutyhourModel->id) }}"
method="POST"
class="confirmDeleteTS">
@csrf
@method('DELETE')
<div class="btn-group" role="group">
<button id="formSubmitClone"
type="submit"
class="btn btn-primary"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}">
{{ __('crud.actions.save') }}
</button>
<button type="submit"
class="btn btn-danger"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.delete_model', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}">
<i class="fa-solid fa-trash"></i>
</button>
</div>
</form>
</div>
</div>
<form action="{{ route('bo.dutyhours.update', $dutyhourModel->id) }}" method="POST" enctype="multipart/form-data">
@csrf
@method('PUT')
@include('bo.pages.dutyhours.form-inputs')
<div class="row">
<div class="col text-center">
<button id="formSubmit"
type="submit"
class="btn btn-primary"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}">
{{ __('crud.actions.save') }}
</button>
</div>
</div>
</form>
@endsection

View file

@ -1,98 +0,0 @@
<div class="row">
{{-- DATE --}}
<div class="col-12 col-md-6 mb-3">
<fieldset class="border h-100 bg-white p-3">
<legend>{{ Str::ucfirst(__('validation.attributes.date')) }}</legend>
<div class="row">
<div class="col-12">
@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.'),
])
</div>
</div>
</fieldset>
</div>
{{-- PERSON --}}
<div class="col-12 col-md-6 mb-3">
<fieldset class="border h-100 bg-white p-3">
<legend>{{ Str::ucfirst(__('validation.attributes.person')) }}</legend>
<div class="row">
<div class="col-12">
@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')),
]),
])
</div>
</div>
</fieldset>
</div>
{{-- PLACE --}}
<div class="col-12 col-md-6 mb-3">
<fieldset class="border h-100 bg-white p-3">
<legend>{{ Str::ucfirst(__('validation.attributes.place')) }}</legend>
<div class="row">
<div class="col-12">
@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')),
]),
])
</div>
</div>
</fieldset>
</div>
</div>
@push('scripts')
<script nonce="{{ $nonce }}">
document.addEventListener("DOMContentLoaded", () => {
// Submit button clone.
const submit = document.getElementById('formSubmit')
submitClone = document.getElementById('formSubmitClone');
submitClone.addEventListener('click', (event) => {
event.preventDefault();
submit.click('');
})
});
</script>
@endpush

View file

@ -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')
<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center">
@include('breadcrumbs.breadcrumb-body')
<a href="{{ route('bo.dutyhours.create') }}"
class="btn btn-primary float-right"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.helpers.create_model', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}">
<i class="fa-solid fa-plus"></i>
</a>
</div>
@include('bo.modules.search-bar')
<table class="table table-hover">
@if (count($dutyhourModels) > 0)
<thead>
@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')),
],
])
</thead>
<tbody>
@foreach ($dutyhourModels as $dutyhourModel)
<tr class="list-item border-bottom">
<td class="text-center align-middle">{{ $dutyhourModel->date->format('Y-m-d') }}</td>
<td class="text-center align-middle">{{ $dutyhourModel->person }}</td>
<td class="text-center align-middle">{{ $dutyhourModel->place }}</td>
<td class="text-end align-middle">
<form action="{{ route('bo.dutyhours.destroy', $dutyhourModel->id) }}"
method="POST"
class="btn-group confirmDeleteTS"
novalidate>
<a class="btn btn-sm btn-primary"
href="{{ route('bo.dutyhours.edit', ['dutyhour' => $dutyhourModel->id]) }}"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.actions.update') }}">
<i class="fa-solid fa-pencil"></i>
</a>
@csrf
@method('DELETE')
<button type="submit"
class="btn btn-sm btn-danger"
data-bs-toggle="tooltip"
data-bs-placement="top"
title="{{ __('crud.actions.delete') }}">
<i class="fa-solid fa-trash"></i>
</button>
</form>
</td>
</tr>
@endforeach
</tbody>
@else
<tr>
<td class="text-center fw-bold border-0">{{ __('crud.other.no_model_found', ['model' => Str::singular(__('models.classes.dutyhours'))]) }}</td>
</tr>
@endif
</table>
{!! $dutyhourModels->links() !!}
@endsection

View file

@ -1,58 +0,0 @@
@extends('layout.app')
@section('title', __('Accueil'))
@section('description', __('Page d\'accueil du site :site', ['site' => config('app.name')]))
@section('content')
<div class="container">
<div class="row mt-4">
<div class="col mb-5">
<a href="{{ route('bo.ticket.create') }}" class="btn btn-primary">
{{ __('Créer un ticket') }}
</a>
<a href="{{ route('bo.sites.index') }}" class="btn btn-primary ms-3">
{{ __('Voir mes sites') }}
</a>
</div>
</div>
<div class="row">
<div class="col">
<h2 class="col h2 mb-3">
<span class="fw-bold">{{ __('models.classes.dutyhours') . __(' à venir') }}</span>
</h2>
</div>
</div>
<div class="row">
<div class="col">
<div class="table-responsive">
<table class="table fix-action m-0">
<thead>
<tr>
<th>{{ __('Date') }}</th>
<th>{{ __('Personne présente') }}</th>
<th>{{ __('Lieu de la permanence') }}</th>
</tr>
</thead>
<tbody>
@if($dutyhourModels->count())
@foreach ($dutyhourModels as $dutyhourModel)
<tr>
<td class="align-middle">{{ $dutyhourModel->date->formatLocalized('%d/%m/%Y') }}</td>
<td class="align-middle">{{ $dutyhourModel->person }}</td>
<td class="align-middle">{{ $dutyhourModel->place }}</td>
</tr>
@endforeach
@else
<tr>
<td colspan="5" class="text-center">
<span class="h3">{{ __('Aucune :model prévue prochainement', ['model' => Str::singular(__('models.classes.dutyhours')) ])}}</span>
</td>
</tr>
@endif
</tbody>
</table>
</div>
</div>
</div>
</div>
@endsection

View file

@ -40,9 +40,6 @@
<a class="dropdown-item @if(Route::is('bo.packages.*'))active @endif" href="{{ route('bo.packages.index') }}">{{ __('models.classes.packages') }}</a>
@endcan
@can('isAdmin')
<a class="dropdown-item @if(Route::is('bo.dutyhours.*'))active @endif" href="{{ route('bo.dutyhours.index') }}">{{ __('models.classes.dutyhours') }}</a>
@endcan
@can('isAdmin')
<a class="dropdown-item @if(Route::is('bo.informations.*'))active @endif" href="{{ route('bo.informations.index') }}">{{ __('models.classes.informations') }}</a>
@endcan
@can('isAdmin')

View file

@ -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'));

View file

@ -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']);