Added 'created_by', 'updated_by' columns StickerMaster screens
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Gemini PR Review / Gemini PR Review (pull_request) Has been cancelled
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Has been cancelled
Laravel Larastan / larastan (pull_request) Has been cancelled
Laravel Pint / pint (pull_request) Has been cancelled

This commit is contained in:
dhanabalan
2026-02-06 11:36:24 +05:30
parent de11ae3b1f
commit 6163211672
5 changed files with 235 additions and 77 deletions

View File

@@ -55,7 +55,7 @@ class StickerMasterResource extends Resource
->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
})
->default(function () {
return optional(StickerMaster::latest()->first())->plant_id;
@@ -87,7 +87,8 @@ class StickerMasterResource extends Resource
$set('tube_sticker_motor', false) &
$set('tube_sticker_pump', false) &
$set('tube_sticker_pumpset', false) &
$set('warranty_card', false)
$set('warranty_card', false) &
$set('updated_by', Filament::auth()->user()?->name)
)
->required(),
@@ -128,6 +129,7 @@ class StickerMasterResource extends Resource
->afterStateUpdated(function ($state, callable $set, callable $get) {
$plantId = $get('plant_id');
$itemId = $get('item_id');
$set('updated_by', Filament::auth()->user()?->name);
// If plant_id is changed or empty, reset everything
if (blank($plantId)) {
@@ -207,36 +209,60 @@ class StickerMasterResource extends Resource
Forms\Components\TextInput::make('part_validation1')
->label('Part Validation 1')
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('part_validation2')
->label('Part Validation 2')
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('part_validation3')
->label('Part Validation 3')
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('part_validation4')
->label('Part Validation 4')
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('part_validation5')
->label('Part Validation 5 (Capacitor QR)')
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('laser_part_validation1')
->label('Laser Part Validation 1')
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('laser_part_validation2')
->label('Laser Part Validation 2')
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('panel_box_code')
->label('Panel Box Code')
->readOnly(fn (callable $get) => $get('material_type'))
->nullable(),
->nullable()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\TextInput::make('load_rate')
->label('Load Rate')
@@ -245,7 +271,10 @@ class StickerMasterResource extends Resource
->disabled(function ($get) {
return $get('material_type');
})
->integer(),
->integer()
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\Select::make('material_type')
->label('Material Type')
@@ -256,7 +285,6 @@ class StickerMasterResource extends Resource
])
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($state) {
$set('panel_box_code', null);
$set('load_rate', 0);
@@ -267,7 +295,7 @@ class StickerMasterResource extends Resource
} else {
$set('bundle_quantity', 2);
}
// $plantId = $get('plant_id');
$set('updated_by', Filament::auth()->user()?->name);
})
->nullable(),
@@ -284,6 +312,7 @@ class StickerMasterResource extends Resource
} elseif ($get('bundle_quantity') < 2) {
$set('bundle_quantity', 2);
}
$set('updated_by', Filament::auth()->user()?->name);
}),
Forms\Components\Checkbox::make('serial_number_motor')
@@ -295,6 +324,7 @@ class StickerMasterResource extends Resource
if ($get('serial_number_motor')) {
$set('serial_number_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state): mixed => $state ? $state : null),
@@ -307,6 +337,7 @@ class StickerMasterResource extends Resource
if ($get('serial_number_pump')) {
$set('serial_number_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -320,6 +351,7 @@ class StickerMasterResource extends Resource
$set('serial_number_motor', false);
$set('serial_number_pump', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -332,6 +364,7 @@ class StickerMasterResource extends Resource
if ($get('pack_slip_motor')) {
$set('pack_slip_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -344,6 +377,7 @@ class StickerMasterResource extends Resource
if ($get('pack_slip_pump')) {
$set('pack_slip_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -357,6 +391,7 @@ class StickerMasterResource extends Resource
$set('pack_slip_motor', false);
$set('pack_slip_pump', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -369,6 +404,7 @@ class StickerMasterResource extends Resource
if ($get('name_plate_motor')) {
$set('name_plate_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -381,6 +417,7 @@ class StickerMasterResource extends Resource
if ($get('name_plate_pump')) {
$set('name_plate_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -394,6 +431,7 @@ class StickerMasterResource extends Resource
$set('name_plate_motor', false);
$set('name_plate_pump', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -406,6 +444,7 @@ class StickerMasterResource extends Resource
if ($get('tube_sticker_motor')) {
$set('tube_sticker_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -418,6 +457,7 @@ class StickerMasterResource extends Resource
if ($get('tube_sticker_pump')) {
$set('tube_sticker_pumpset', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
@@ -432,13 +472,24 @@ class StickerMasterResource extends Resource
$set('tube_sticker_motor', false);
$set('tube_sticker_pump', false);
}
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null), // to pass null value
Forms\Components\Checkbox::make('warranty_card')
->nullable()
->reactive()
->afterStateUpdated(function ($state, callable $set) {
$set('updated_by', Filament::auth()->user()?->name);
})
->dehydrateStateUsing(fn ($state) => $state ? $state : null),
Forms\Components\Hidden::make('created_by')
->label('Created By')
->default(Filament::auth()->user()?->name),
Forms\Components\Hidden::make('updated_by')
->label('Updated By')
->default(Filament::auth()->user()?->name),
Forms\Components\TextInput::make('id')
->hidden()
->readOnly(),
@@ -465,8 +516,7 @@ class StickerMasterResource extends Resource
Tables\Columns\TextColumn::make('plant.name')
->label('Plant')
->alignCenter()
->sortable()
->searchable(),
->sortable(),
Tables\Columns\TextColumn::make('item.code')
->label('Item Code')
->alignCenter()
@@ -593,17 +643,24 @@ class StickerMasterResource extends Resource
default => '-',
};
}),
Tables\Columns\TextColumn::make('created_by')
->label('Created By')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('created_at')
->label('Created At')
->dateTime()
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('updated_by')
->label('Updated By')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('updated_at')
->label('Updated At')
->dateTime()
->alignCenter()
->sortable()
->toggleable(isToggledHiddenByDefault: true),
->sortable(),
Tables\Columns\TextColumn::make('deleted_at')
->label('Deleted At')
->dateTime()
@@ -623,8 +680,9 @@ class StickerMasterResource extends Resource
->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->orderBy('code')->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
})
->searchable()
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get): void {
$set('item_id', null);
@@ -658,16 +716,21 @@ class StickerMasterResource extends Resource
->reactive(),
Select::make('material_type')
->label('Select Material Type')
->nullable()
->options([
1 => 'Individual',
2 => 'Bundle',
3 => 'Quantity',
])
->searchable()
->reactive(),
TextInput::make('panel_box_code')
->label('Search by Panel Box Code')
->placeholder(placeholder: 'Enter Panel Box Code'),
TextInput::make('created_by')
->label('Created By')
->placeholder(placeholder: 'Enter Created By Name'),
DateTimePicker::make(name: 'created_from')
->label('Created From')
->placeholder(placeholder: 'Select From DateTime')
@@ -678,10 +741,13 @@ class StickerMasterResource extends Resource
->placeholder(placeholder: 'Select To DateTime')
->reactive()
->native(false),
TextInput::make('updated_by')
->label('Updated By')
->placeholder(placeholder: 'Enter Updated By Name'),
])
->query(function ($query, array $data) {
// Hide all records initially if no filters are applied
if (empty($data['Plant']) && empty($data['item_id']) && empty($data['material_type']) && empty($data['panel_box_code']) && empty($data['created_from']) && empty($data['created_to'])) {
if (empty($data['Plant']) && empty($data['item_id']) && empty($data['material_type']) && empty($data['panel_box_code']) && empty($data['created_from']) && empty($data['created_to']) && empty($data['created_by']) && empty($data['updated_by'])) {
return $query->whereRaw('1 = 0');
}
@@ -707,6 +773,10 @@ class StickerMasterResource extends Resource
$query->where('panel_box_code', 'like', '%'.$data['panel_box_code'].'%');
}
if (! empty($data['created_by'])) {
$query->where('created_by', 'like', '%'.$data['created_by'].'%');
}
if (! empty($data['created_from'])) {
$query->where('created_at', '>=', $data['created_from']);
}
@@ -715,6 +785,9 @@ class StickerMasterResource extends Resource
$query->where('created_at', '<=', $data['created_to']);
}
if (! empty($data['updated_by'])) {
$query->where('updated_by', 'like', '%'.$data['updated_by'].'%');
}
})
->indicateUsing(function (array $data) {
$indicators = [];
@@ -748,6 +821,10 @@ class StickerMasterResource extends Resource
$indicators[] = 'Panel Box Code: '.$data['panel_box_code'];
}
if (! empty($data['created_by'])) {
$indicators[] = 'Created By: '.$data['created_by'];
}
if (! empty($data['created_from'])) {
$indicators[] = 'From: '.$data['created_from'];
}
@@ -756,6 +833,10 @@ class StickerMasterResource extends Resource
$indicators[] = 'To: '.$data['created_to'];
}
if (! empty($data['updated_by'])) {
$indicators[] = 'Updated By: '.$data['updated_by'];
}
return $indicators;
}),
])
@@ -779,7 +860,7 @@ class StickerMasterResource extends Resource
->options(function (callable $get) {
$userHas = Filament::auth()->user()->plant_id;
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::pluck('name', 'id')->toArray();
return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
})
->label('Select Plant')
->required()