From fba8101da3fc0c19bf9205509264081559362302 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Fri, 1 May 2026 14:14:49 +0530 Subject: [PATCH 1/2] Updated field lable, length and default value in report --- app/Filament/Resources/UserResource.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/Filament/Resources/UserResource.php b/app/Filament/Resources/UserResource.php index c7e189e..308a290 100644 --- a/app/Filament/Resources/UserResource.php +++ b/app/Filament/Resources/UserResource.php @@ -33,8 +33,10 @@ class UserResource extends Resource return $form ->schema([ Forms\Components\Select::make('plant_id') + ->label('Plant Name') ->relationship('plant', 'name') ->nullable() + ->searchable() ->reactive() ->options(function (callable $get) { $userHas = Filament::auth()->user()->plant_id; @@ -45,8 +47,10 @@ class UserResource extends Resource return optional(User::latest()->first())->plant_id; }), Forms\Components\TextInput::make('name') + ->label('Name') ->required() ->autofocus() + ->minLength(3) // ->reactive() ->live(debounce: 600) ->afterStateUpdated(function ($state, callable $set, callable $get) { @@ -54,6 +58,7 @@ class UserResource extends Resource }) ->maxLength(255), Forms\Components\TextInput::make('email') + ->label('Email') // ->email() ->unique(ignoreRecord: true) ->required() @@ -66,9 +71,12 @@ class UserResource extends Resource // ->prefix(fn ($get) => $get('name') ?? null) // ->suffix('@cripumps.com') ->maxLength(255), - Forms\Components\DateTimePicker::make('email_verified_at'), + Forms\Components\DateTimePicker::make('email_verified_at') + ->label('Email Verified At'), Forms\Components\TextInput::make('password') + ->label('Password') ->password() + ->minLength(3) ->revealable() ->required() // ->dehydrateStateUsing(fn (string $state): string => Hash::make($state)) @@ -77,6 +85,7 @@ class UserResource extends Resource // ->multiple() // ->relationship('roles', 'name'), Forms\Components\Select::make('roles') + ->label('Roles') ->relationship('roles', 'name') // ->relationship(name: 'roles', titleAttribute: 'name') // ->saveRelationshipsUsing(function (Model $record, $state) { @@ -110,7 +119,8 @@ class UserResource extends Resource return ($currentPage - 1) * $perPage + $rowLoop->iteration; }), Tables\Columns\TextColumn::make('plant.name') - ->label('Plant') + ->label('Plant Name') + ->default('All') ->alignCenter() ->sortable() ->searchable(), @@ -144,8 +154,7 @@ class UserResource extends Resource ->label('Updated At') ->dateTime() ->alignCenter() - ->sortable() - ->toggleable(isToggledHiddenByDefault: true), + ->sortable(), Tables\Columns\TextColumn::make('deleted_at') ->label('Deleted At') ->dateTime() -- 2.49.1 From 7e1fea11c6d2727d376b1d08d6fb410413534bd1 Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Sat, 2 May 2026 18:57:13 +0530 Subject: [PATCH 2/2] Updated validation logics for resource, importer, exporter, create files and Added columns in model file --- .../Exports/ProductionOrderExporter.php | 10 +- .../Imports/ProductionOrderImporter.php | 280 +++++++++++++----- .../Resources/ProductionOrderResource.php | 18 +- .../Pages/CreateProductionOrder.php | 46 ++- app/Models/ProductionOrder.php | 5 + 5 files changed, 269 insertions(+), 90 deletions(-) diff --git a/app/Filament/Exports/ProductionOrderExporter.php b/app/Filament/Exports/ProductionOrderExporter.php index b210978..126dd38 100644 --- a/app/Filament/Exports/ProductionOrderExporter.php +++ b/app/Filament/Exports/ProductionOrderExporter.php @@ -29,9 +29,9 @@ class ProductionOrderExporter extends Exporter ExportColumn::make('quantity') ->label('QUANTITY'), ExportColumn::make('start_date') - ->label('START DATETIME'), + ->label('START DATE'), ExportColumn::make('end_date') - ->label('END DATETIME'), + ->label('END DATE'), ExportColumn::make('production_order') ->label('PRODUCTION ORDER'), ExportColumn::make('from_serial_number') @@ -43,9 +43,11 @@ class ProductionOrderExporter extends Exporter ExportColumn::make('created_by') ->label('CREATED BY'), ExportColumn::make('updated_at') - ->label('UPDATED AT'), + ->label('UPDATED AT') + ->enabledByDefault(false), ExportColumn::make('updated_by') - ->label('UPDATED BY'), + ->label('UPDATED BY') + ->enabledByDefault(false), ExportColumn::make('deleted_at') ->label('DELETED AT') ->enabledByDefault(false), diff --git a/app/Filament/Imports/ProductionOrderImporter.php b/app/Filament/Imports/ProductionOrderImporter.php index c09d8d6..926ee09 100644 --- a/app/Filament/Imports/ProductionOrderImporter.php +++ b/app/Filament/Imports/ProductionOrderImporter.php @@ -2,6 +2,7 @@ namespace App\Filament\Imports; +use App\Models\Item; use App\Models\Plant; use App\Models\ProductionOrder; use Carbon\Carbon; @@ -9,6 +10,7 @@ use Filament\Actions\Imports\Exceptions\RowImportFailedException; use Filament\Actions\Imports\ImportColumn; use Filament\Actions\Imports\Importer; use Filament\Actions\Imports\Models\Import; +use Filament\Facades\Filament; use Str; class ProductionOrderImporter extends Importer @@ -33,45 +35,47 @@ class ProductionOrderImporter extends Importer ->relationship(resolveUsing: 'code') ->rules(['required']), ImportColumn::make('quantity') + ->requiredMapping() ->label('QUANTITY') ->exampleHeader('QUANTITY') - ->example('3') + ->example('1') ->rules(['required']), ImportColumn::make('start_date') - ->label('START DATETIME') - ->exampleHeader('START DATETIME') - ->example('2026-04-30 10:00:00') + ->requiredMapping() + ->label('START DATE') + ->exampleHeader('START DATE') + ->example('30-01-2026') // 00:00:00 ->rules(['required']), ImportColumn::make('end_date') - ->label('END DATETIME') - ->exampleHeader('END DATETIME') - ->example('2026-05-30 10:00:00') + ->requiredMapping() + ->label('END DATE') + ->exampleHeader('END DATE') + ->example('30-01-2026') // 00:00:00 ->rules(['required']), ImportColumn::make('production_order') ->label('PRODUCTION ORDER') - ->exampleHeader('PRODUCTION ORDER') - ->example('260116180001') - ->rules(['required']), - ImportColumn::make('from_serial_number') - ->label('FROM SERIAL NUMBER') - ->exampleHeader('FROM SERIAL NUMBER') - ->example('1000211260400001') - ->rules(['required']), - ImportColumn::make('to_serial_number') - ->label('TO SERIAL NUMBER') - ->exampleHeader('TO SERIAL NUMBER') - ->example('1000211260400003') - ->rules(['required']), - ImportColumn::make('created_by') - ->label('CREATED BY') - ->exampleHeader('CREATED BY') - ->example('USER00001') - ->rules(['required']), - ImportColumn::make('updated_by') - ->label('UPDATED BY') - ->exampleHeader('UPDATED BY') - ->example('USER00001') - ->rules(['required']), + ->exampleHeader('PRODUCTION ORDER'), + // ->example('260116180001') + // ImportColumn::make('from_serial_number') + // ->label('FROM SERIAL NUMBER') + // // ->exampleHeader('FROM SERIAL NUMBER') + // // ->example('1000211260400001') + // ->rules(['required']), + // ImportColumn::make('to_serial_number') + // ->label('TO SERIAL NUMBER') + // // ->exampleHeader('TO SERIAL NUMBER') + // // ->example('1000211260400003') + // ->rules(['required']), + // ImportColumn::make('created_by') + // ->label('CREATED BY') + // // ->exampleHeader('CREATED BY') + // // ->example('USER00001') + // ->rules(['required']), + // ImportColumn::make('updated_by') + // ->label('UPDATED BY') + // // ->exampleHeader('UPDATED BY') + // // ->example('USER00001') + // ->rules(['required']), ]; } @@ -88,82 +92,206 @@ class ProductionOrderImporter extends Importer $startAt = trim($this->data['start_date']) ?? ''; $endAt = trim($this->data['end_date']) ?? ''; $prodOrd = trim($this->data['production_order']) ?? ''; - $fromSerNo = trim($this->data['from_serial_number']) ?? ''; - $toSerNo = trim($this->data['to_serial_number']) ?? ''; - $createdBy = trim($this->data['created_by']) ?? ''; - $updatedBy = trim($this->data['updated_by']) ?? ''; + $createdBy = Filament::auth()->user()?->name ?? ''; + $updatedBy = $createdBy; - if ($qnty) { - if ($plantCod == null || $plantCod == '') { - $warnMsg[] = "Plant code can't be empty!"; - } elseif (! is_numeric($plantCod)) { - $warnMsg[] = 'Plant code should contain only numeric values!'; - } elseif (Str::length($plantCod) < 4 || Str::length($plantCod) > 7) { - $warnMsg[] = 'Plant code must be between 4 and 7 digits only!'; - } elseif (! preg_match('/^[1-9]\d{3,6}$/', $plantCod)) { - $warnMsg[] = 'Invalid plant code found!'; + $qValid = false; + $oValid = false; + $dValid = false; + + if ($plantCod == null || $plantCod == '' || ! $plantCod) { + $warnMsg[] = "Plant code can't be empty!"; + } elseif (! is_numeric($plantCod)) { + $warnMsg[] = "Plant code '{$plantCod}' should contain only numeric values!"; + } elseif (Str::length($plantCod) < 4 || Str::length($plantCod) > 7) { + $warnMsg[] = "Plant code '{$plantCod}' must be between 4 and 7 digits only!"; + } elseif (! preg_match('/^[1-9]\d{3,6}$/', $plantCod)) { + $warnMsg[] = "Invalid plant code '{$plantCod}' found!"; + } else { + $plant = Plant::where('code', $plantCod)->first(); + if (! $plant) { + $warnMsg[] = 'Plant not found!'; + } else { + $plantId = $plant->id; + } + } + + if ($itemCod == null || $itemCod == '') { + $warnMsg[] = "Item code can't be empty!"; + } elseif (! ctype_alnum($itemCod)) { + $warnMsg[] = "Item code '{$itemCod}' should contain only alpha-numeric values!"; + } elseif (Str::length($itemCod) < 6) { + $warnMsg[] = "Item code '{$itemCod}' should contain minimum 6 digits!"; + } else { + $item = Item::where('code', $itemCod)->first(); + if (! $item) { + $warnMsg[] = 'Item code not found!'; + } else { + if ($plantId) { + $item = Item::where('code', $itemCod)->where('plant_id', $plantId)->first(); + if (! $item) { + $warnMsg[] = 'Item code not found for the given plant!'; + } else { + $itemId = $item->id; + } + } + } + } + + if ($qnty == null || $qnty == '' || $qnty == '0') { + $warnMsg[] = "Quantity can't be empty or zero!"; + } elseif (! is_numeric($qnty)) { + $warnMsg[] = "Quantity '{$qnty}' should contain only numeric values!"; + } else { + $qValid = true; + } + + if ($prodOrd == null || $prodOrd == '' || ! $prodOrd) { + $oValid = true; + } elseif (! is_numeric($prodOrd)) { + $warnMsg[] = "Production order '{$prodOrd}' should contain only numeric values!"; + } elseif (Str::length($prodOrd) < 7 || Str::length($prodOrd) > 12) { + $warnMsg[] = "Production order '{$prodOrd}' must be between 7 and 12 digits only!"; + } else { + $oValid = true; + } + + if (! $startAt) { + $warnMsg[] = "Start date can't be empty!"; + } + if (! $endAt) { + $warnMsg[] = "End date can't be empty!"; + } + if ($startAt && $endAt) { + $formats = ['d-m-Y', 'd-m-Y H:i', 'd-m-Y H:i:s']; + + $cDateTime = null; + $uDateTime = null; + + foreach ($formats as $format) { + try { + $cDateTime = Carbon::createFromFormat($format, $startAt); + if ($format === 'd-m-Y' || $format === 'd-m-Y H:i' || $format === 'd-m-Y H:i:s') { + $cDateTime = $cDateTime->startOfDay(); + } + break; + } catch (\Exception $e) { + // $warnMsg[] = "Date format mismatch with format: $format"; + } } - $dupProd = ProductionOrder::where('production_order', $prodOrd)->first(); // where('plant_id', $plantId)-> - if ($dupProd) { - $warnMsg[] = "Production Order '{$prodOrd}' already exists in database!"; + foreach ($formats as $format) { + try { + $uDateTime = Carbon::createFromFormat($format, $endAt); + if ($format === 'd-m-Y' || $format === 'd-m-Y H:i' || $format === 'd-m-Y H:i:s') { + $uDateTime = $uDateTime->endOfDay(); + } + break; + } catch (\Exception $e) { + // $warnMsg[] = "Date format mismatch with format: $format"; + } } - if (! empty($warnMsg)) { - throw new RowImportFailedException(implode(', ', $warnMsg)); + if (! isset($cDateTime)) { + $warnMsg[] = "Invalid 'Start Date' format. Expected DD-MM-YYYY"; // DD-MM-YYYY HH:MM:SS } + if (! isset($uDateTime)) { + $warnMsg[] = "Invalid 'End Date' format. Expected DD-MM-YYYY"; + } + + if (isset($cDateTime) && isset($uDateTime)) { + if ($cDateTime->greaterThan($uDateTime)) { + $warnMsg[] = "'Start Date' is greater than 'End Date'."; + } else { + $dValid = true; + } + } + } + + if ($plantId && $itemId && $qValid && $oValid && $dValid) { $now = Carbon::now(); - $plantId = $plantCod ?? null; - $quantity = $qnty ?? null; - $plantCode = Plant::find($plantId)->code; - $year = $now->format('y'); // Year (last 2 digits) $month = $now->format('m'); - $monthText = strtoupper($now->format('M')); // APR - $monthNumber = ''; + if ($prodOrd) { + $dupProd = ProductionOrder::where('plant_id', $plantId)->where('production_order', $prodOrd)->first(); + if ($dupProd) { + $warnMsg[] = "Production Order '{$prodOrd}' already exists in database for the given plant!"; + } else { + $dupProd = ProductionOrder::where('production_order', $prodOrd)->first(); + if ($dupProd) { + $warnMsg[] = "Production Order '{$prodOrd}' already exists in database!"; + } + } - foreach (str_split($monthText) as $char) { - $curSeq = ord($char) - 64; - $monthNumber .= str_pad($curSeq, 2, '0', STR_PAD_LEFT); - } - - $prefix = $year.$monthNumber; - - $last = ProductionOrder::where('production_order', 'like', "{$prefix}%")->orderByDesc('production_order')->first(); // ProductionOrder::where('production_order', 'like', $prefix.'%')->orderBy('production_order', 'desc')->first(); - - if ($last) { - $lastSeq = substr($last->production_order, -4); - $nextSeq = str_pad(((int) $lastSeq + 1), 4, '0', STR_PAD_LEFT); + if (! empty($warnMsg)) { + throw new RowImportFailedException(implode(', ', $warnMsg)); + } } else { - $nextSeq = '0001'; + $monthText = strtoupper($now->format('M')); // APR + $monthNumber = ''; + + foreach (str_split($monthText) as $char) { + $curSeq = ord($char) - 64; + $monthNumber .= str_pad($curSeq, 2, '0', STR_PAD_LEFT); + } + + $prefix = $year.$monthNumber; + + $last = ProductionOrder::where('production_order', 'like', "{$prefix}%")->orderByDesc('production_order')->first(); // ProductionOrder::where('production_order', 'like', $prefix.'%')->orderBy('production_order', 'desc')->first(); + + if ($last) { + $lastSeq = substr($last->production_order, -4); + $nextSeq = str_pad(((int) $lastSeq + 1), 4, '0', STR_PAD_LEFT); + } else { + $nextSeq = '0001'; + } + + $prodOrd = $prefix.$nextSeq; } - $productionOrder = $prefix.$nextSeq; - - $prefixSerial = $plantCode.$year.$month; + $prefixSerial = $plantCod.$year.$month; $last = ProductionOrder::where('to_serial_number', 'like', "{$prefixSerial}%")->orderByDesc('to_serial_number')->first(); if ($last) { $lastSeq = (int) substr($last->to_serial_number, -6); - $startSeq = $lastSeq + 1; + $startSeq = str_pad(($lastSeq + 1), 6, '0', STR_PAD_LEFT); + $endSeq = str_pad(($lastSeq + $qnty), 6, '0', STR_PAD_LEFT); } else { - $startSeq = 1; + $startSeq = '000001'; + $endSeq = str_pad($qnty, 6, '0', STR_PAD_LEFT); } - $endSeq = $startSeq + $quantity - 1; + // $endSeq = $startSeq + $qnty - 1; + $fromSerial = $prefixSerial.$startSeq; // str_pad($startSeq, 6, '0', STR_PAD_LEFT) + $toSerial = $prefixSerial.$endSeq; // str_pad($endSeq, 6, '0', STR_PAD_LEFT) - $fromSerial = $prefixSerial.str_pad($startSeq, 6, '0', STR_PAD_LEFT); - $toSerial = $prefixSerial.str_pad($endSeq, 6, '0', STR_PAD_LEFT); + ProductionOrder::create([ + 'plant_id' => $plantId ?? null, + 'item_id' => $itemId ?? null, + 'quantity' => $qnty ?? null, + 'start_date' => $cDateTime->format('Y-m-d H:i:s'), + 'end_date' => $uDateTime->format('Y-m-d H:i:s'), + 'production_order' => $prodOrd ?? null, + 'from_serial_number' => $fromSerial ?? null, + 'to_serial_number' => $toSerial ?? null, + 'created_by' => $createdBy ?? null, + 'updated_by' => $updatedBy ?? null, + ]); + } else { + if (! empty($warnMsg)) { + throw new RowImportFailedException(implode(', ', $warnMsg)); + } } // return ProductionOrder::firstOrNew([ // // Update existing records, matching them by `$this->data['column_name']` // 'email' => $this->data['email'], // ]); - return new ProductionOrder; + return null; + // return new ProductionOrder; } public static function getCompletedNotificationBody(Import $import): string diff --git a/app/Filament/Resources/ProductionOrderResource.php b/app/Filament/Resources/ProductionOrderResource.php index 84014c0..fa1d1ef 100644 --- a/app/Filament/Resources/ProductionOrderResource.php +++ b/app/Filament/Resources/ProductionOrderResource.php @@ -203,6 +203,7 @@ class ProductionOrderResource extends Resource ->columns([ Tables\Columns\TextColumn::make('No.') ->label('No.') + ->alignCenter() ->getStateUsing(function ($record, $livewire, $column, $rowLoop) { $paginator = $livewire->getTableRecords(); $perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10; @@ -255,16 +256,29 @@ class ProductionOrderResource extends Resource Tables\Columns\TextColumn::make('created_at') ->label('Created At') ->dateTime() - ->sortable() - ->toggleable(isToggledHiddenByDefault: true), + ->alignCenter() + ->sortable(), + Tables\Columns\TextColumn::make('created_by') + ->label('Created By') + ->searchable() + ->alignCenter() + ->sortable(), Tables\Columns\TextColumn::make('updated_at') ->label('Updated At') ->dateTime() + ->alignCenter() + ->sortable() + ->toggleable(isToggledHiddenByDefault: true), + Tables\Columns\TextColumn::make('updated_by') + ->label('Updated By') + ->searchable() + ->alignCenter() ->sortable() ->toggleable(isToggledHiddenByDefault: true), Tables\Columns\TextColumn::make('deleted_at') ->label('Deleted At') ->dateTime() + ->alignCenter() ->sortable() ->toggleable(isToggledHiddenByDefault: true), ]) diff --git a/app/Filament/Resources/ProductionOrderResource/Pages/CreateProductionOrder.php b/app/Filament/Resources/ProductionOrderResource/Pages/CreateProductionOrder.php index 5c3ce77..fa6fc40 100644 --- a/app/Filament/Resources/ProductionOrderResource/Pages/CreateProductionOrder.php +++ b/app/Filament/Resources/ProductionOrderResource/Pages/CreateProductionOrder.php @@ -30,7 +30,9 @@ class CreateProductionOrder extends CreateRecord $tSerNo = trim($this->form->getState()['to_serial_number'] ?? '') ?? null; - $operatorName = Filament::auth()->user()?->name; + $createdBy = trim($this->form->getState()['created_by'] ?? '') ?? Filament::auth()->user()?->name; + + $updatedBy = trim($this->form->getState()['updated_by'] ?? '') ?? Filament::auth()->user()?->name; if (empty($plantId)) { Notification::make() @@ -88,9 +90,16 @@ class CreateProductionOrder extends CreateRecord ->send(); return; - } elseif (empty($operatorName)) { + } elseif (empty($createdBy)) { Notification::make() - ->title('Operator Name cannot be empty!') + ->title('Created By cannot be empty!') + ->danger() + ->send(); + + return; + } elseif (empty($updatedBy)) { + Notification::make() + ->title('Updated By cannot be empty!') ->danger() ->send(); @@ -116,7 +125,8 @@ class CreateProductionOrder extends CreateRecord 'production_order' => $pOrder ?? null, 'from_serial_number' => $fSerNo ?? null, 'to_serial_number' => $tSerNo ?? null, - 'created_by' => $operatorName ?? null, + 'created_by' => $createdBy ?? null, + 'updated_by' => $updatedBy ?? null, ]); if ($insert) { @@ -135,6 +145,8 @@ class CreateProductionOrder extends CreateRecord 'from_serial_number' => $fSerNo, 'to_serial_number' => $tSerNo, 'show_extra_fields' => true, + 'created_by' => $createdBy ?? null, + 'updated_by' => $updatedBy ?? null, ]); return; @@ -153,6 +165,8 @@ class CreateProductionOrder extends CreateRecord 'production_order' => null, 'from_serial_number' => null, 'to_serial_number' => null, + 'created_by' => $createdBy ?? null, + 'updated_by' => $updatedBy ?? null, ]); return; @@ -161,15 +175,31 @@ class CreateProductionOrder extends CreateRecord public function printProductionOrder() { - $pOrder = $this->form->getState()['production_order']; + $pOrder = trim($this->form->getState()['production_order'] ?? '') ?? null; - $pOrder = trim($pOrder) ?? null; + $plantId = trim($this->form->getState()['plant_id'] ?? '') ?? null; - $pOrderExists = ProductionOrder::where('production_order', $pOrder)->first(); + if (empty($plantId)) { + Notification::make() + ->title('Plant name cannot be empty!') + ->danger() + ->send(); + + return; + } elseif (empty($pOrder)) { + Notification::make() + ->title('Production order cannot be empty!') + ->danger() + ->send(); + + return; + } + + $pOrderExists = ProductionOrder::where('plant_id', $plantId)->where('production_order', $pOrder)->first(); if (! $pOrderExists) { Notification::make() - ->title("Production Order '{$pOrder}' does not exist to get print") + ->title("Production Order '{$pOrder}' does not exist to get print!") ->danger() ->send(); diff --git a/app/Models/ProductionOrder.php b/app/Models/ProductionOrder.php index 8a8518b..ea367a3 100644 --- a/app/Models/ProductionOrder.php +++ b/app/Models/ProductionOrder.php @@ -8,6 +8,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; class ProductionOrder extends Model { use SoftDeletes; + protected $fillable = [ 'plant_id', 'item_id', @@ -17,6 +18,10 @@ class ProductionOrder extends Model 'production_order', 'from_serial_number', 'to_serial_number', + 'created_at', + 'created_by', + 'updated_at', + 'updated_by', ]; public function plant() -- 2.49.1