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