From 24f7c1f73a668035744e838d64d6eb6abb3f8fa3 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 17 Aug 2023 16:53:01 +0200 Subject: [PATCH] Removed status from projects --- app/Enums/Projects/ProjectStatusEnum.php | 31 ------------------ .../Bo/Projects/StoreProjectRequest.php | 6 ---- app/Models/Project.php | 12 ------- ...4511_remove_status_from_projects_table.php | 32 +++++++++++++++++++ .../bo/pages/projects/form-inputs.blade.php | 19 ----------- .../views/bo/pages/projects/index.blade.php | 2 -- .../views/bo/pages/projects/show.blade.php | 4 --- 7 files changed, 32 insertions(+), 74 deletions(-) delete mode 100644 app/Enums/Projects/ProjectStatusEnum.php create mode 100644 database/migrations/2023_08_17_164511_remove_status_from_projects_table.php diff --git a/app/Enums/Projects/ProjectStatusEnum.php b/app/Enums/Projects/ProjectStatusEnum.php deleted file mode 100644 index 3818864..0000000 --- a/app/Enums/Projects/ProjectStatusEnum.php +++ /dev/null @@ -1,31 +0,0 @@ -name => "Nouveau", - self::specification->name => "Spécifications", - self::validated->name => "Validé", - self::development->name => "En développement", - self::recipe->name => "En recettage", - self::production->name => "En production", - self::finished->name => "Terminé", - ]; -} diff --git a/app/Http/Requests/Bo/Projects/StoreProjectRequest.php b/app/Http/Requests/Bo/Projects/StoreProjectRequest.php index de1f729..918ff18 100644 --- a/app/Http/Requests/Bo/Projects/StoreProjectRequest.php +++ b/app/Http/Requests/Bo/Projects/StoreProjectRequest.php @@ -2,10 +2,8 @@ namespace App\Http\Requests\Bo\Projects; -use App\Enums\Projects\ProjectStatusEnum; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Gate; -use Illuminate\Validation\Rule; class StoreProjectRequest extends FormRequest { @@ -28,10 +26,6 @@ class StoreProjectRequest extends FormRequest { return [ 'name' => 'required|string|min:3|max:255|unique:projects,name', - 'status' => [ - 'required', - Rule::in(collect(ProjectStatusEnum::cases())->pluck('value')->all()), - ], 'site_id' => 'required|exists:sites,id', ]; } diff --git a/app/Models/Project.php b/app/Models/Project.php index 3b6c703..4461b3c 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -2,13 +2,11 @@ namespace App\Models; -use App\Enums\Projects\ProjectStatusEnum; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** * @property string $name - * @property ProjectStatusEnum $status * @property Site $site_id */ class Project extends Model @@ -22,19 +20,9 @@ class Project extends Model */ protected $fillable = [ 'name', - 'status', 'site_id' ]; - /** - * The attributes that should be cast to native types. - * - * @var array - */ - protected $casts = [ - 'status' => ProjectStatusEnum::class - ]; - // * RELATIONSHIPS. /** diff --git a/database/migrations/2023_08_17_164511_remove_status_from_projects_table.php b/database/migrations/2023_08_17_164511_remove_status_from_projects_table.php new file mode 100644 index 0000000..ee77e6e --- /dev/null +++ b/database/migrations/2023_08_17_164511_remove_status_from_projects_table.php @@ -0,0 +1,32 @@ +dropColumn('status'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down(): void + { + Schema::table('projects', function (Blueprint $table) { + $table->unsignedSmallInteger('status')->default(0)->comment('Enum ProjectStatus')->after('name'); + }); + } +}; diff --git a/resources/views/bo/pages/projects/form-inputs.blade.php b/resources/views/bo/pages/projects/form-inputs.blade.php index fe3b46f..0a8027a 100644 --- a/resources/views/bo/pages/projects/form-inputs.blade.php +++ b/resources/views/bo/pages/projects/form-inputs.blade.php @@ -32,25 +32,6 @@ - {{-- STATUS --}} -
-
- {{ Str::ucfirst(__('validation.attributes.status')) }} -
-
- @include('bo.partials.inputs.tinyint-enum', [ - 'id' => 'projectStatus', - 'label' => __('crud.minicrud.associated', ['entity' => 'Role']), - 'name' => 'status', - 'model' => $projectModel ?? null, - 'required' => true, - 'associatedModels' => \App\Enums\Projects\ProjectStatusEnum::toArray(), - 'helper' => __('crud.minicrud.select', ['entity' => 'statut']), - ]) -
-
-
-
{{-- SITE_ID --}}
diff --git a/resources/views/bo/pages/projects/index.blade.php b/resources/views/bo/pages/projects/index.blade.php index b4bb936..d306b77 100644 --- a/resources/views/bo/pages/projects/index.blade.php +++ b/resources/views/bo/pages/projects/index.blade.php @@ -21,7 +21,6 @@ @php $cols = [ 'name' => Str::ucfirst(__('validation.attributes.name')), - 'status' => Str::ucfirst(__('validation.attributes.status')), 'site_id' => Str::ucfirst(__('models.classes.sites')), ]; @endphp @@ -34,7 +33,6 @@ @foreach ($projectModels as $projectModel) {{ $projectModel->name }} - {{ $projectModel->status->label() }} {{ $projectModel->site->name }}
{{ Str::ucfirst(__('validation.attributes.name')) }} {{ $projectModel->name }} - - {{ Str::ucfirst(__('validation.attributes.status')) }} - {{ $projectModel->status->label() }} - {{ Str::ucfirst(__('validation.attributes.sites')) }} {{ $projectModel->site->name }}