diff --git a/app/Http/Requests/Bo/StoreTicket.php b/app/Http/Requests/Bo/StoreTicket.php index 41a512c..c85fcc4 100644 --- a/app/Http/Requests/Bo/StoreTicket.php +++ b/app/Http/Requests/Bo/StoreTicket.php @@ -96,6 +96,7 @@ class StoreTicket extends FormRequest } } ], + 'date_mep' => 'required|date', 'text' => 'required|string|min:40', 'title' => 'required|string|between:3,255', 'file_tickets' => 'sometimes|array', diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index f7e0862..1fa1732 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -33,6 +33,7 @@ class Ticket extends Model 'type', 'status', 'order', + 'date_mep', 'text', 'title', 'is_internal', @@ -48,6 +49,7 @@ class Ticket extends Model 'is_internal' => 'bool', 'type' => TicketTypeEnum::class, 'status' => TicketStatusEnum::class, + 'date_mep' => 'date', 'last_activity' => 'timestamp', ]; diff --git a/database/migrations/2025_03_13_094420_add_mep_date_on_tickets.php b/database/migrations/2025_03_13_094420_add_mep_date_on_tickets.php new file mode 100644 index 0000000..deb9c5b --- /dev/null +++ b/database/migrations/2025_03_13_094420_add_mep_date_on_tickets.php @@ -0,0 +1,32 @@ +date('date_mep')->nullable()->after('gitlab_issue')->comment('Date MEP souhaitée'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down(): void + { + Schema::table('tickets', function (Blueprint $table) { + $table->dropColumn('date_mep'); + }); + } +}; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 170d2ac..35c2795 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -215,11 +215,13 @@ return [ 'year' => 'year', ], 'custom' => [ - 'type' => 'type', - 'tickets' => 'tickets', - 'assigned_to' => 'assigned to', - 'order' => 'order', - 'priority' => 'priority', - 'default' => 'default', + 'type' => 'type', + 'tickets' => 'tickets', + 'assigned_to' => 'assigned to', + 'order' => 'order', + 'priority' => 'priority', + 'default' => 'default', + 'date_mep' => 'desired MEP date', + 'date_mep_empty' => 'no date entered' ] ]; diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index 39d3513..e50b509 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -251,11 +251,13 @@ return [ 'id' => 'identifiant' ], 'custom' => [ - 'type' => 'type', - 'tickets' => 'étiquettes', - 'assigned_to' => 'assigné à', - 'order' => 'ordre', - 'priority' => 'priorité', - 'default' => 'défaut', + 'type' => 'type', + 'tickets' => 'étiquettes', + 'assigned_to' => 'assigné à', + 'order' => 'ordre', + 'priority' => 'priorité', + 'default' => 'défaut', + 'date_mep' => 'date de MEP souhaitée', + 'date_mep_empty' => 'aucune date renseignée' ] ]; diff --git a/resources/views/bo/pages/tickets/form-inputs.blade.php b/resources/views/bo/pages/tickets/form-inputs.blade.php index cbdeea1..2128af7 100644 --- a/resources/views/bo/pages/tickets/form-inputs.blade.php +++ b/resources/views/bo/pages/tickets/form-inputs.blade.php @@ -93,6 +93,11 @@ @endcan + +