2 Commits

Author SHA1 Message Date
dhanabalan
aeb3b694e4 Added filter functionality on view report 2025-07-09 11:00:31 +05:30
dhanabalan
a4d2c20451 Removed unwanted space line and updated indentations 2025-07-09 11:00:04 +05:30
2 changed files with 376 additions and 223 deletions

View File

@@ -8,14 +8,19 @@ use App\Filament\Resources\LocatorResource\Pages;
use App\Filament\Resources\LocatorResource\RelationManagers;
use App\Models\Locator;
use App\Models\PalletValidation;
use App\Models\Plant;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Get;
use Filament\Tables\Actions\ImportAction;
use Filament\Facades\Filament;
use Filament\Forms;
use Filament\Forms\Components\Select;
use Filament\Forms\Form;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Tables\Actions\ExportAction;
use Filament\Tables\Filters\Filter;
use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope;
@@ -139,34 +144,183 @@ class LocatorResource extends Resource
return ($currentPage - 1) * $perPage + $rowLoop->iteration;
}),
Tables\Columns\TextColumn::make('plant.name')
->numeric()
->searchable()
->label('Plant')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('locator_number')
->label('Locator Number')
->alignCenter()
->searchable()
->sortable(),
Tables\Columns\TextColumn::make('locator_quantity')
->label('Locator Quantity')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('operator_id')
->label('Operator ID')
->searchable()
->label('Created By')
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('created_at')
->label('Created At')
->dateTime()
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('updated_at')
->label('Updated At')
->dateTime()
->alignCenter()
->sortable(),
Tables\Columns\TextColumn::make('deleted_at')
->label('Deleted At')
->dateTime()
->alignCenter()
->sortable()
->toggleable(isToggledHiddenByDefault: true),
])
->filters([
Tables\Filters\TrashedFilter::make(),
Filter::make('advanced_filters')
->label('Advanced Filters')
->form([
Select::make('Plant')
->label('Select Plant')
->nullable()
->options(function () {
return Plant::pluck('name', 'id');
})
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get): void {
$set('locator_number', null);
$set('locator_quantity', null);
$set('created_from', null);
$set('created_to', null);
$set('created_by', null);
$set('updated_from', null);
$set('updated_to', null);
}),
Select::make('locator_number')
->label('Locator Number')
->options(function (callable $get) {
$plantId = $get('Plant');
if (!$plantId) {
return [];
}
return Locator::where('plant_id', $plantId)->orderBy('locator_number', 'asc')->get()->unique('locator_number')->pluck('locator_number', 'locator_number')->toArray();
// ->whereNotNull('locator_number')
// ->where('locator_number','!=', '')
})
->searchable()
->reactive(),
Select::make('locator_quantity')
->label('Locator Quantity')
->options([
0 => 0,
1 => 1,
2 => 2,
])
->reactive(),
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),
TextInput::make('created_by')
->label('Created By')
->reactive()
->placeholder(placeholder: 'Enter Created By'),
DateTimePicker::make(name: 'updated_from')
->label('Updated From')
->placeholder(placeholder: 'Select From DateTime')
->reactive()
->native(false),
DateTimePicker::make('updated_to')
->label('Updated 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['locator_number']) && $data['locator_quantity'] == null && empty($data['created_from']) && empty($data['created_to']) && empty($data['created_by']) && empty($data['updated_from']) && empty($data['updated_to'])) {
return $query->whereRaw('1 = 0');
}
if (!empty($data['Plant'])) { //$plant = $data['Plant'] ?? null
$query->where('plant_id', $data['Plant']);
}
if (!empty($data['locator_number'])) {
$query->where('locator_number', $data['locator_number']);
}
if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { //isset($data['locator_quantity']) &&
$query->where('locator_quantity', $data['locator_quantity']);//(int)
}
if (!empty($data['created_from'])) {
$query->where('created_at', '>=', $data['created_from']);
}
if (!empty($data['created_to'])) {
$query->where('created_at', '<=', $data['created_to']);
}
if (!empty($data['created_by'])) {
$query->where('operator_id', $data['created_by']);
}
if (!empty($data['updated_from'])) {
$query->where('updated_at', '>=', $data['updated_from']);
}
if (!empty($data['updated_to'])) {
$query->where('updated_at', '<=', $data['updated_to']);
}
})
->indicateUsing(function (array $data) {
$indicators = [];
if (!empty($data['Plant'])) {
$indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
}
if (!empty($data['locator_number'])) {
$indicators[] = 'Locator Number: ' . $data['locator_number'];
}
if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { //isset($data['locator_quantity']) &&
$indicators[] = 'Locator Quantity: ' . $data['locator_quantity'];
}
if (!empty($data['created_from'])) {
$indicators[] = 'From: ' . $data['created_from'];
}
if (!empty($data['created_to'])) {
$indicators[] = 'To: ' . $data['created_to'];
}
if (!empty($data['created_by'])) {
$indicators[] = 'Created By: ' . $data['created_by'];
}
if (!empty($data['updated_from'])) {
$indicators[] = 'Updated From: ' . $data['updated_from'];
}
if (!empty($data['updated_to'])) {
$indicators[] = 'Updated To: ' . $data['updated_to'];
}
return $indicators;
})
])
->filtersFormMaxHeight('280px')
->actions([
Tables\Actions\ViewAction::make(),
Tables\Actions\EditAction::make(),

View File

@@ -254,218 +254,218 @@ class PalletValidationResource extends Resource
->filters([
Tables\Filters\TrashedFilter::make(),
Filter::make('advanced_filters')
->label('Advanced Filters')
->form([
Select::make('Plant')
->label('Select Plant')
->nullable()
->options(function () {
return Plant::pluck('name', 'id');
})
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get): void {
$set('pallet_number', null);
$set('serial_number', null);
$set('pallet_status', null);
$set('locator_number', null);
$set('locator_quantity', null);
$set('created_from', null);
$set('created_to', null);
$set('created_by', null);
$set('scanned_from', null);
$set('scanned_to', null);
$set('scanned_by', null);
}),
Select::make('pallet_number')
->label('Pallet Number')
->options(function (callable $get) {
$plantId = $get('Plant');
if (!$plantId) {
return [];
}
return PalletValidation::where('plant_id', $plantId)
->whereNotNull('pallet_number')
->where('pallet_number','!=', '')
->orderBy('pallet_number', 'asc')
->get()
->unique('pallet_number')
->pluck('pallet_number', 'pallet_number')
->toArray();
})
->searchable()
->reactive(),
TextInput::make('serial_number')
->label('Serial Number')
->placeholder(placeholder: 'Enter Serial Number'),
Select::make('pallet_status')
->label('Pallet Status')
->options([
'Completed' => 'Completed',
]),
Select::make('locator_number')
->label('Locator Number')
->options(function (callable $get) {
$plantId = $get('Plant');
if (!$plantId) {
return [];
}
return PalletValidation::where('plant_id', $plantId)
->whereNotNull('locator_number')
->where('locator_number','!=', '')
->orderBy('locator_number', 'asc')
->get()
->unique('locator_number')
->pluck('locator_number', 'locator_number')
->toArray();
})
->searchable()
->reactive(),
Select::make('locator_quantity')
->label('Locator Quantity')
->options([
0 => 0,
1 => 1,
2 => 2,
])
->reactive(),
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),
TextInput::make('created_by')
->label('Created By')
->placeholder(placeholder: 'Enter Created By'),
DateTimePicker::make(name: 'scanned_from')
->label('Scanned From')
->placeholder(placeholder: 'Select From DateTime')
->reactive()
->native(false),
DateTimePicker::make('scanned_to')
->label('Scanned To')
->placeholder(placeholder: 'Select To DateTime')
->reactive()
->native(false),
TextInput::make('scanned_by')
->label('Scanned By')
->placeholder(placeholder: 'Enter Scanned By'),
])
->query(function ($query, array $data) {
// Hide all records initially if no filters are applied
if (empty($data['Plant']) && empty($data['pallet_number']) && empty($data['serial_number']) && empty($data['pallet_status']) && empty($data['locator_number']) && $data['locator_quantity'] == null && empty($data['created_from']) && empty($data['created_to']) && empty($data['created_by']) && empty($data['scanned_from']) && empty($data['scanned_to']) && empty($data['scanned_by'])) {
return $query->whereRaw('1 = 0');
}
->label('Advanced Filters')
->form([
Select::make('Plant')
->label('Select Plant')
->nullable()
->options(function () {
return Plant::pluck('name', 'id');
})
->reactive()
->afterStateUpdated(function ($state, callable $set, callable $get): void {
$set('pallet_number', null);
$set('serial_number', null);
$set('pallet_status', null);
$set('locator_number', null);
$set('locator_quantity', null);
$set('created_from', null);
$set('created_to', null);
$set('created_by', null);
$set('scanned_from', null);
$set('scanned_to', null);
$set('scanned_by', null);
}),
Select::make('pallet_number')
->label('Pallet Number')
->options(function (callable $get) {
$plantId = $get('Plant');
if (!$plantId) {
return [];
}
return PalletValidation::where('plant_id', $plantId)
->whereNotNull('pallet_number')
->where('pallet_number','!=', '')
->orderBy('pallet_number', 'asc')
->get()
->unique('pallet_number')
->pluck('pallet_number', 'pallet_number')
->toArray();
})
->searchable()
->reactive(),
TextInput::make('serial_number')
->label('Serial Number')
->placeholder(placeholder: 'Enter Serial Number'),
Select::make('pallet_status')
->label('Pallet Status')
->options([
'Completed' => 'Completed',
]),
Select::make('locator_number')
->label('Locator Number')
->options(function (callable $get) {
$plantId = $get('Plant');
if (!$plantId) {
return [];
}
return PalletValidation::where('plant_id', $plantId)
->whereNotNull('locator_number')
->where('locator_number','!=', '')
->orderBy('locator_number', 'asc')
->get()
->unique('locator_number')
->pluck('locator_number', 'locator_number')
->toArray();
})
->searchable()
->reactive(),
Select::make('locator_quantity')
->label('Locator Quantity')
->options([
0 => 0,
1 => 1,
2 => 2,
])
->reactive(),
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),
TextInput::make('created_by')
->label('Created By')
->placeholder(placeholder: 'Enter Created By'),
DateTimePicker::make(name: 'scanned_from')
->label('Scanned From')
->placeholder(placeholder: 'Select From DateTime')
->reactive()
->native(false),
DateTimePicker::make('scanned_to')
->label('Scanned To')
->placeholder(placeholder: 'Select To DateTime')
->reactive()
->native(false),
TextInput::make('scanned_by')
->label('Scanned By')
->placeholder(placeholder: 'Enter Scanned By'),
])
->query(function ($query, array $data) {
// Hide all records initially if no filters are applied
if (empty($data['Plant']) && empty($data['pallet_number']) && empty($data['serial_number']) && empty($data['pallet_status']) && empty($data['locator_number']) && $data['locator_quantity'] == null && empty($data['created_from']) && empty($data['created_to']) && empty($data['created_by']) && empty($data['scanned_from']) && empty($data['scanned_to']) && empty($data['scanned_by'])) {
return $query->whereRaw('1 = 0');
}
if (!empty($data['Plant'])) { //$plant = $data['Plant'] ?? null
$query->where('plant_id', $data['Plant']);
}
if (!empty($data['Plant'])) { //$plant = $data['Plant'] ?? null
$query->where('plant_id', $data['Plant']);
}
if (!empty($data['pallet_number'])) {
$query->where('pallet_number', $data['pallet_number']);
}
if (!empty($data['pallet_number'])) {
$query->where('pallet_number', $data['pallet_number']);
}
if (!empty($data['serial_number'])) {
$query->where('serial_number', $data['serial_number']);
}
if (!empty($data['serial_number'])) {
$query->where('serial_number', $data['serial_number']);
}
if (!empty($data['pallet_status'])) {
$query->where('pallet_status', $data['pallet_status']);
}
if (!empty($data['pallet_status'])) {
$query->where('pallet_status', $data['pallet_status']);
}
if (!empty($data['locator_number'])) {
$query->where('locator_number', $data['locator_number']);
}
if (!empty($data['locator_number'])) {
$query->where('locator_number', $data['locator_number']);
}
// if (!empty($data['locator_quantity'])) {
// $query->where('locator_quantity', $data['locator_quantity']);
// }
// if (!empty($data['locator_quantity'])) {
// $query->where('locator_quantity', $data['locator_quantity']);
// }
if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { //isset($data['locator_quantity']) &&
$query->where('locator_quantity', $data['locator_quantity']);//(int)
}
if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { //isset($data['locator_quantity']) &&
$query->where('locator_quantity', $data['locator_quantity']);//(int)
}
if (!empty($data['created_from'])) {
$query->where('created_at', '>=', $data['created_from']);
}
if (!empty($data['created_from'])) {
$query->where('created_at', '>=', $data['created_from']);
}
if (!empty($data['created_to'])) {
$query->where('created_at', '<=', $data['created_to']);
}
if (!empty($data['created_to'])) {
$query->where('created_at', '<=', $data['created_to']);
}
if (!empty($data['created_by'])) {
$query->where('created_by', $data['created_by']);
}
if (!empty($data['created_by'])) {
$query->where('created_by', $data['created_by']);
}
if (!empty($data['scanned_from'])) {
$query->where('scanned_at', '>=', $data['scanned_from']);
}
if (!empty($data['scanned_from'])) {
$query->where('scanned_at', '>=', $data['scanned_from']);
}
if (!empty($data['scanned_to'])) {
$query->where('scanned_at', '<=', $data['scanned_to']);
}
if (!empty($data['scanned_to'])) {
$query->where('scanned_at', '<=', $data['scanned_to']);
}
if (!empty($data['scanned_by'])) {
$query->where('scanned_by', $data['scanned_by']);
}
})
->indicateUsing(function (array $data) {
$indicators = [];
if (!empty($data['scanned_by'])) {
$query->where('scanned_by', $data['scanned_by']);
}
})
->indicateUsing(function (array $data) {
$indicators = [];
if (!empty($data['Plant'])) {
$indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
}
if (!empty($data['Plant'])) {
$indicators[] = 'Plant: ' . Plant::where('id', $data['Plant'])->value('name');
}
if (!empty($data['pallet_number'])) {
$indicators[] = 'Pallet Number: ' . $data['pallet_number'];
}
if (!empty($data['pallet_number'])) {
$indicators[] = 'Pallet Number: ' . $data['pallet_number'];
}
if (!empty($data['serial_number'])) {
$indicators[] = 'Serial Number: ' . $data['serial_number'];
}
if (!empty($data['serial_number'])) {
$indicators[] = 'Serial Number: ' . $data['serial_number'];
}
if (!empty($data['pallet_status'])) {
$indicators[] = 'Pallet Status: ' . $data['pallet_status'];
}
if (!empty($data['pallet_status'])) {
$indicators[] = 'Pallet Status: ' . $data['pallet_status'];
}
if (!empty($data['locator_number'])) {
$indicators[] = 'Locator Number: ' . $data['locator_number'];
}
if (!empty($data['locator_number'])) {
$indicators[] = 'Locator Number: ' . $data['locator_number'];
}
// if (!empty($data['locator_quantity'])) {
// $indicators[] = 'Locator Quantity: ' . $data['locator_quantity'];
// }
if (isset($data['locator_quantity']) && $data['locator_quantity'] !== '') {
$indicators[] = 'Locator Quantity: ' . $data['locator_quantity'];
}
// if (!empty($data['locator_quantity'])) {
// $indicators[] = 'Locator Quantity: ' . $data['locator_quantity'];
// }
if ($data['locator_quantity'] != null && $data['locator_quantity'] != '') { //isset($data['locator_quantity']) &&
$indicators[] = 'Locator Quantity: ' . $data['locator_quantity'];
}
if (!empty($data['created_from'])) {
$indicators[] = 'From: ' . $data['created_from'];
}
if (!empty($data['created_from'])) {
$indicators[] = 'From: ' . $data['created_from'];
}
if (!empty($data['created_to'])) {
$indicators[] = 'To: ' . $data['created_to'];
}
if (!empty($data['created_to'])) {
$indicators[] = 'To: ' . $data['created_to'];
}
if (!empty($data['created_by'])) {
$indicators[] = 'Created By: ' . $data['created_by'];
}
if (!empty($data['scanned_from'])) {
$indicators[] = 'Scanned From: ' . $data['scanned_from'];
}
if (!empty($data['scanned_to'])) {
$indicators[] = 'Scanned To: ' . $data['scanned_to'];
}
if (!empty($data['scanned_by'])) {
$indicators[] = 'Scanned By: ' . $data['scanned_by'];
}
if (!empty($data['created_by'])) {
$indicators[] = 'Created By: ' . $data['created_by'];
}
if (!empty($data['scanned_from'])) {
$indicators[] = 'Scanned From: ' . $data['scanned_from'];
}
if (!empty($data['scanned_to'])) {
$indicators[] = 'Scanned To: ' . $data['scanned_to'];
}
if (!empty($data['scanned_by'])) {
$indicators[] = 'Scanned By: ' . $data['scanned_by'];
}
return $indicators;
})
return $indicators;
})
])
->filtersFormMaxHeight('280px')
->actions([
@@ -484,38 +484,37 @@ class PalletValidationResource extends Resource
Tables\Actions\Action::make('reprint_pallet')
->label('Re-Print Pallet QR')
->form([
Forms\Components\Section::make()
->schema([
Forms\Components\Select::make('plant')
->label('Select Plant')
->options(Plant::pluck('name', 'id')->toArray())
->required()
->reactive()
->columnSpan(2),
Forms\Components\Section::make()
->schema([
Forms\Components\Select::make('plant')
->label('Select Plant')
->options(Plant::pluck('name', 'id')->toArray())
->required()
->reactive()
->columnSpan(2),
Forms\Components\Select::make('pallet_list')
->label('Select Pallet')
->searchable()
->required()
->reactive()
->columnSpan(1)
->options(function (callable $get) {
$plantId = $get('plant');
Forms\Components\Select::make('pallet_list')
->label('Select Pallet')
->searchable()
->required()
->reactive()
->columnSpan(1)
->options(function (callable $get) {
$plantId = $get('plant');
if (!$plantId) {
return [];
}
if (!$plantId) {
return [];
}
return PalletValidation::query()
->where('plant_id', $plantId)
->whereNotNull('pallet_number')
->where('pallet_number', '!=', '')
->select('pallet_number')
->distinct()
->orderBy('pallet_number')
->pluck('pallet_number', 'pallet_number')
->toArray();
}),
return PalletValidation::query()
->where('plant_id', $plantId)
->whereNotNull('pallet_number')
->where('pallet_number', '!=', '')
->select('pallet_number')
->distinct()
->orderBy('pallet_number')
->pluck('pallet_number', 'pallet_number')
->toArray();
}),
])
->columns(['default' => 1, 'sm' => 3]),
])