poc/pds
1
0
Fork 1
Code Issues Pull Requests 8 Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat: Add validation rules for Machine and Work Center names; enhance ProcessOrder table sorting; refactor StickerMasterResource for improved readability and functionality' (#14) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 10s
Details

Browse Source 
Reviewed-on: #14
This commit was merged in pull request #14.
This commit is contained in:
jothi
2025-11-27 04:50:10 +00:00
parent ee101f80ea c16c967757
commit 80e522b7e6
4 changed files with 682 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

169
app/Filament/Resources/ItemResource.php
View File

@@ -12,24 +12,24 @@ use App\Models\StickerMaster;
use Filament\Actions\Exports\Enums\ExportFormat;
use Filament\Facades\Filament;
use Filament\Forms;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Notifications\Notification;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction;
use Filament\Tables\Filters\Filter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Notifications\Notification;
use Illuminate\Validation\Rule;
use Maatwebsite\Excel\Facades\Excel;
use Storage;
use Str;
class ItemResource extends Resource
{
@@ -55,6 +55,7 @@ class ItemResource extends Resource
->reactive()
->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();
})
->default(function () {
@@ -67,10 +68,9 @@ class ItemResource extends Resource
// Ensure `linestop_id` is not cleared
if (! $plantId) {
$set('iPlantError', 'Please select a plant first.');
return;
}
else
{
} else {
$set('iPlantError', null);
}
})
@@ -97,17 +97,17 @@ class ItemResource extends Resource
// Ensure `linestop_id` is not cleared
if (! $code) {
$set('iCodeError', 'Scan the valid code.');
return;
}
else
{
} else {
if (strlen($code) < 6) {
$set('iCodeError', 'Item code must be at least 6 digits.');
return;
}
else if (!preg_match('/^[a-zA-Z0-9]{6,}$/', $code)) {
} elseif (! preg_match('/^[a-zA-Z0-9]{6,}$/', $code)) {
$set('code', null);
$set('iCodeError', 'Item code must contain only alpha-numeric characters.');
return;
}
$set('iCodeError', null);
@@ -136,13 +136,13 @@ class ItemResource extends Resource
// Ensure `linestop_id` is not cleared
if (! $hourQuan) {
$set('iHourQuanError', 'Scan the valid hourly quantity.');
return;
}
else
{
} else {
if (! preg_match('/^[0-9]{1,}$/', $hourQuan)) {
$set('hourly_quantity', null);
$set('iHourQuanError', 'Quantity must be integer value.');
return;
}
$set('iHourQuanError', null);
@@ -187,6 +187,7 @@ class ItemResource extends Resource
$paginator = $livewire->getTableRecords();
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
return ($currentPage - 1) * $perPage + $rowLoop->iteration;
}),
Tables\Columns\TextColumn::make('plant.name')
@@ -236,9 +237,143 @@ class ItemResource extends Resource
->sortable()
->toggleable(isToggledHiddenByDefault: true),
])
// ->filters([
// Tables\Filters\TrashedFilter::make(),
// ])
->filters([
Tables\Filters\TrashedFilter::make(),
Filter::make('advanced_filters')
->label('Advanced Filters')
->form([
Select::make('Plant')
->label('Select Plant')
->nullable()
->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();
})
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get): void {
$set('item_id', null);
$set('operator_id', null);
}),
Select::make('code')
->label('Search by Item Code')
->nullable()
// ->options(function (callable $get) {
// $plantId = $get('Plant');
// return $plantId
// ? Item::where('plant_id', $plantId)->pluck('code', 'id')
// : Item::pluck('code', 'id');
// })
->options(function (callable $get) {
$plantId = $get('Plant');
return $plantId
? Item::where('plant_id', $plantId)->pluck('code', 'id')
: [];
})
->searchable()
->reactive(),
TextInput::make('description')
->label('Search by Description')
->placeholder(placeholder: 'Enter Description'),
TextInput::make('category')
->label('Search by Category')
->placeholder(placeholder: 'Enter Category'),
TextInput::make('uom')
->label('Search by UOM')
->placeholder(placeholder: 'Enter UOM'),
DateTimePicker::make(name: 'created_from')
->label('Created From')
->placeholder(placeholder: 'Select From DateTime')
->reactive()
->native(false),
DateTimePicker::make('created_to')
->label('Created To')
->placeholder(placeholder: 'Select To DateTime')
->reactive()
->native(false),
])
->query(function ($query, array $data) {
// Hide all records initially if no filters are applied
if (
empty($data['Plant']) &&
empty($data['item_id']) &&
empty($data['description']) &&
empty($data['uom']) &&
empty($data['category']) &&
empty($data['created_from']) &&
empty($data['created_to'])
) {
return $query->whereRaw('1 = 0');
}
if (! empty($data['Plant'])) { // $plant = $data['Plant'] ?? null
$query->where('plant_id', $data['Plant']);
}
if (! empty($data['item_id'])) {
$query->where('item_id', $data['item_id']);
}
if (! empty($data['description'])) {
$query->where('description', '%'.$data['description'].'%');
}
if (! empty($data['uom'])) {
$query->where('uom', 'like', '%'.$data['uom'].'%');
}
if (! empty($data['category'])) {
$query->where('category', '%'.$data['category'].'%');
}
if (! empty($data['created_from'])) {
$query->where('created_at', '>=', $data['created_from']);
}
if (! empty($data['created_to'])) {
$query->where('created_at', '<=', $data['created_to']);
}
})
->indicateUsing(function (array $data) {
$indicators = [];
if (! empty($data['Plant'])) {
$indicators[] = 'Plant: '.Plant::where('id', $data['Plant'])->value('name');
}
if (! empty($data['item_id'])) {
$indicators[] = 'Item Code: '.$data['item_id'];
}
if (! empty($data['description'])) {
$indicators[] = 'Description: '.$data['description'];
}
if (! empty($data['uom'])) {
$indicators[] = 'UOM: '.$data['uom'];
}
if (! empty($data['category'])) {
$indicators[] = 'Category: '.$data['category'];
}
if (! empty($data['created_from'])) {
$indicators[] = 'From: '.$data['created_from'];
}
if (! empty($data['created_to'])) {
$indicators[] = 'To: '.$data['created_to'];
}
return $indicators;
}),
])
->filtersFormMaxHeight('280px')
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),
@@ -251,7 +386,6 @@ class ItemResource extends Resource
]),
])
->headerActions([
// Tables\Actions\Action::make('Import Items')
// ->label('Import Items')
// ->form([
@@ -402,7 +536,6 @@ class ItemResource extends Resource
// return;
// }
// $uniqueCodes = array_unique($materialCodes);
// $matchedItems = StickerMaster::with('item')

2
app/Filament/Resources/MachineResource.php
View File

@@ -159,6 +159,7 @@ class MachineResource extends Resource
->hintColor('danger'),
Forms\Components\TextInput::make('name')
->label('Name')
->minLength(5)
->placeholder('Scan the valid Machine Name')
->required()
->rule(function (callable $get) {
@@ -169,6 +170,7 @@ class MachineResource extends Resource
}),
Forms\Components\TextInput::make('work_center')
->label('Work Center')
->minLength(6)
->placeholder('Scan the valid Work Center')
->required()
->rule(function (callable $get) {

3
app/Filament/Resources/ProcessOrderResource.php
View File

@@ -370,8 +370,7 @@ class ProcessOrderResource extends Resource
->label('Created At')
->alignCenter()
->dateTime()
->sortable()
->toggleable(isToggledHiddenByDefault: true),
->sortable(),
Tables\Columns\TextColumn::make('created_by')
->label('Created By')
->alignCenter()

124
app/Filament/Resources/StickerMasterResource.php
View File

@@ -13,25 +13,23 @@ use App\Models\StickerMaster;
// use Closure;
use Filament\Facades\Filament;
use Filament\Forms;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Forms\Get;
use Filament\Forms\Set;
use Filament\Notifications\Notification;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction;
use Filament\Tables\Filters\Filter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Forms\Get;
use Filament\Forms\Set;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Actions\ImportAction;
use Illuminate\Support\Facades\Storage;
use Filament\Forms\Components\FileUpload;
use Filament\Notifications\Notification;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\Radio;
use Filament\Forms\Components\TextInput;
use Filament\Tables\Filters\Filter;
use App\Models\InvoiceValidation;
// use Illuminate\Validation\Rule;
@@ -55,14 +53,14 @@ class StickerMasterResource extends Resource
->nullable()
->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();
})
->default(function () {
return optional(StickerMaster::latest()->first())->plant_id;
})
->disabled(fn (Get $get) => ! empty($get('id'))) // disable in edit if user try to change
->afterStateUpdated(fn (callable $set) =>
$set('item_id', null) & //when plant changed remove all the data which is in text input box
->afterStateUpdated(fn (callable $set) => $set('item_id', null) & // when plant changed remove all the data which is in text input box
$set('item_description', null) &
$set('item_error', null) &
$set('panel_box_code', null) &
@@ -123,24 +121,28 @@ class StickerMasterResource extends Resource
$set('item_id', null);
$set('item_error', null);
$set('item_description', null);
return;
}
if (blank($itemId)) {
$set('item_error', null);
$set('item_description', null);
return;
}
$availableItems = \App\Models\Item::where('plant_id', $plantId)->exists();
if (! $availableItems) {
$set('item_error', null);
return;
}
// Ensure `item_id` is not cleared
if (! $plantId || ! $itemId) {
$set('item_description', null);
return;
}
@@ -158,8 +160,7 @@ class StickerMasterResource extends Resource
$duplicateSticker = StickerMaster::where('plant_id', $plantId)
->where('item_id', $itemId)
->exists();
if(!$get('id'))
{
if (! $get('id')) {
$set('item_error', $duplicateSticker ? 'Item Code already exists for the selected plant.' : null);
}
})
@@ -242,18 +243,14 @@ class StickerMasterResource extends Resource
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($state)
{
if ($state) {
$set('panel_box_code', null);
$set('load_rate', 0);
}
if ($state !== "2")
{
if ($state !== '2') {
$set('bundle_quantity', null);
}
else
{
} else {
$set('bundle_quantity', 2);
}
// $plantId = $get('plant_id');
@@ -263,17 +260,14 @@ class StickerMasterResource extends Resource
Forms\Components\TextInput::make('bundle_quantity')
->label('Bundle Quantity')
->integer()
->readOnly(fn (callable $get) => $get('material_type') !== "2")
->readOnly(fn (callable $get) => $get('material_type') !== '2')
->nullable()
->minValue(2)
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get) {
if($get('material_type') !== "2")
{
if ($get('material_type') !== '2') {
$set('bundle_quantity', null);
}
else if ($get('bundle_quantity') < 2)
{
} elseif ($get('bundle_quantity') < 2) {
$set('bundle_quantity', 2);
}
}),
@@ -284,8 +278,7 @@ class StickerMasterResource extends Resource
// return $get('serial_number_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('serial_number_motor'))
{
if ($get('serial_number_motor')) {
$set('serial_number_pumpset', false);
}
})
@@ -297,8 +290,7 @@ class StickerMasterResource extends Resource
// return $get('serial_number_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('serial_number_pump'))
{
if ($get('serial_number_pump')) {
$set('serial_number_pumpset', false);
}
})
@@ -310,8 +302,7 @@ class StickerMasterResource extends Resource
// return $get('serial_number_motor') || $get('serial_number_pump');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('serial_number_pumpset'))
{
if ($get('serial_number_pumpset')) {
$set('serial_number_motor', false);
$set('serial_number_pump', false);
}
@@ -324,8 +315,7 @@ class StickerMasterResource extends Resource
// return $get('pack_slip_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('pack_slip_motor'))
{
if ($get('pack_slip_motor')) {
$set('pack_slip_pumpset', false);
}
})
@@ -337,8 +327,7 @@ class StickerMasterResource extends Resource
// return $get('pack_slip_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('pack_slip_pump'))
{
if ($get('pack_slip_pump')) {
$set('pack_slip_pumpset', false);
}
})
@@ -350,8 +339,7 @@ class StickerMasterResource extends Resource
// return $get('pack_slip_motor') || $get('pack_slip_pump');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('pack_slip_pumpset'))
{
if ($get('pack_slip_pumpset')) {
$set('pack_slip_motor', false);
$set('pack_slip_pump', false);
}
@@ -364,8 +352,7 @@ class StickerMasterResource extends Resource
// return $get('name_plate_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('name_plate_motor'))
{
if ($get('name_plate_motor')) {
$set('name_plate_pumpset', false);
}
})
@@ -377,8 +364,7 @@ class StickerMasterResource extends Resource
// return $get('name_plate_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('name_plate_pump'))
{
if ($get('name_plate_pump')) {
$set('name_plate_pumpset', false);
}
})
@@ -390,8 +376,7 @@ class StickerMasterResource extends Resource
// return $get('name_plate_motor') || $get('name_plate_pump');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('name_plate_pumpset'))
{
if ($get('name_plate_pumpset')) {
$set('name_plate_motor', false);
$set('name_plate_pump', false);
}
@@ -404,8 +389,7 @@ class StickerMasterResource extends Resource
// return $get('tube_sticker_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('tube_sticker_motor'))
{
if ($get('tube_sticker_motor')) {
$set('tube_sticker_pumpset', false);
}
})
@@ -417,8 +401,7 @@ class StickerMasterResource extends Resource
// return $get('tube_sticker_pumpset');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('tube_sticker_pump'))
{
if ($get('tube_sticker_pump')) {
$set('tube_sticker_pumpset', false);
}
})
@@ -431,8 +414,7 @@ class StickerMasterResource extends Resource
// return $get('tube_sticker_motor') || $get('tube_sticker_pump');
// })
->afterStateUpdated(function ($state, callable $set, callable $get) {
if ($get('tube_sticker_pumpset'))
{
if ($get('tube_sticker_pumpset')) {
$set('tube_sticker_motor', false);
$set('tube_sticker_pump', false);
}
@@ -452,7 +434,6 @@ class StickerMasterResource extends Resource
public static function table(Table $table): Table
{
return $table
->columns([
// Tables\Columns\TextColumn::make('id')
// ->label('ID')
@@ -464,6 +445,7 @@ class StickerMasterResource extends Resource
$paginator = $livewire->getTableRecords();
$perPage = method_exists($paginator, 'perPage') ? $paginator->perPage() : 10;
$currentPage = method_exists($paginator, 'currentPage') ? $paginator->currentPage() : 1;
return ($currentPage - 1) * $perPage + $rowLoop->iteration;
}),
Tables\Columns\TextColumn::make('plant.name')
@@ -579,6 +561,7 @@ class StickerMasterResource extends Resource
if (is_null($state) || $state === '') {
return '';
}
return match ($state) {
1 => 'Individual',
2 => 'Bundle',
@@ -617,6 +600,7 @@ class StickerMasterResource extends Resource
->nullable()
->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();
})
->reactive()
@@ -635,9 +619,10 @@ class StickerMasterResource extends Resource
// })
->options(function (callable $get) {
$plantId = $get('Plant');
return $plantId
? Item::where('plant_id', $plantId)->pluck('code', 'id')
: [];
: Item::pluck('code', 'id');
})
->searchable()
->reactive(),
@@ -667,9 +652,9 @@ class StickerMasterResource extends Resource
->query(function ($query, array $data) {
// Hide all records initially if no filters are applied
if (
empty($data['material_type']) &&
empty($data['Plant']) &&
empty($data['item_id']) &&
empty($data['material_type']) &&
empty($data['panel_box_code']) &&
empty($data['created_from']) &&
empty($data['created_to'])
@@ -710,7 +695,18 @@ class StickerMasterResource extends Resource
}
if (! empty($data['item_id'])) {
$indicators[] = 'Item Code: ' . $data['item_id'];
$indicators[] = 'Item Code: '.Item::where('id', $data['item_id'])->value('code');
}
if (! empty($data['material_type'])) {
if ($data['material_type'] == 1) {
$indicators[] = 'Material Type: Individual';
} elseif ($data['material_type'] == 2) {
$indicators[] = 'Material Type: Bundle';
} elseif ($data['material_type'] == 3) {
$indicators[] = 'Material Type: Quantity';
}
// $indicators[] = 'Material Type: '.$data['material_type'];
}
if (! empty($data['panel_box_code'])) {
@@ -726,7 +722,7 @@ class StickerMasterResource extends Resource
}
return $indicators;
})
}),
])
->filtersFormMaxHeight('280px')
->actions([
@@ -747,6 +743,7 @@ class StickerMasterResource extends Resource
Select::make('plant_id')
->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();
})
->label('Select Plant')
@@ -856,7 +853,7 @@ class StickerMasterResource extends Resource
if (! $sticker) {
Notification::make()
->title('Unknown Sticker Master')
->body("Sticker Master data not found.")
->body('Sticker Master data not found.')
->danger()
->seconds(2)
->send();
@@ -887,21 +884,20 @@ class StickerMasterResource extends Resource
// $newFileName,
// 'local'
// );
try
{
try {
$path = $uploadedFile->storeAs(
$directory,
$newFileName,
'local'
);
}
catch (\Exception $e) {
} catch (\Exception $e) {
Notification::make()
->title('Upload Failed')
->body("Failed to upload image: " . $e->getMessage())
->body('Failed to upload image: '.$e->getMessage())
->danger()
->seconds(3)
->send();
return;
}
@@ -909,7 +905,7 @@ class StickerMasterResource extends Resource
Notification::make()
->title('Success')
->body("Uploaded part validation image successfully")
->body('Uploaded part validation image successfully')
->success()
->seconds(2)
->send();