Refactor CharacteristicApproverMasterResource form structure and enhance table columns for improved usability and search functionality
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 11s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 14s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 19s
Laravel Pint / pint (pull_request) Successful in 5m27s
Laravel Larastan / larastan (pull_request) Failing after 5m36s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 11s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 14s
Gemini PR Review / Gemini PR Review (pull_request) Failing after 19s
Laravel Pint / pint (pull_request) Successful in 5m27s
Laravel Larastan / larastan (pull_request) Failing after 5m36s
This commit is contained in:
@@ -7,6 +7,7 @@ use App\Models\CharacteristicApproverMaster;
|
|||||||
use App\Models\Machine;
|
use App\Models\Machine;
|
||||||
use Filament\Facades\Filament;
|
use Filament\Facades\Filament;
|
||||||
use Filament\Forms;
|
use Filament\Forms;
|
||||||
|
use Filament\Forms\Components\Section;
|
||||||
use Filament\Forms\Form;
|
use Filament\Forms\Form;
|
||||||
use Filament\Resources\Resource;
|
use Filament\Resources\Resource;
|
||||||
use Filament\Tables;
|
use Filament\Tables;
|
||||||
@@ -26,53 +27,125 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
{
|
{
|
||||||
return $form
|
return $form
|
||||||
->schema([
|
->schema([
|
||||||
Forms\Components\Select::make('plant_id')
|
Section::make('')
|
||||||
->label('Plant')
|
->schema([
|
||||||
->reactive()
|
Forms\Components\Select::make('plant_id')
|
||||||
->relationship('plant', 'name')
|
->label('Plant')
|
||||||
->required(),
|
->columnSpan(2)
|
||||||
Forms\Components\Select::make('machine_id')
|
->reactive()
|
||||||
->label('Work Center')
|
->relationship('plant', 'name')
|
||||||
// ->relationship('machine', 'name')
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
->reactive()
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
->searchable()
|
})
|
||||||
->options(function (callable $get) {
|
->required(),
|
||||||
$plantId = $get('plant_id');
|
Forms\Components\Select::make('machine_id')
|
||||||
if (empty($plantId)) {
|
->label('Work Center')
|
||||||
return [];
|
->columnSpan(2)
|
||||||
}
|
// ->relationship('machine', 'name')
|
||||||
|
->reactive()
|
||||||
|
->searchable()
|
||||||
|
->options(function (callable $get) {
|
||||||
|
$plantId = $get('plant_id');
|
||||||
|
if (empty($plantId)) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
|
return Machine::where('plant_id', $plantId)->pluck('work_center', 'id');
|
||||||
})
|
})
|
||||||
->required(),
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
Forms\Components\TextInput::make('characteristic_field')
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
->label('Characteristic Field'),
|
})
|
||||||
Forms\Components\TextInput::make('machine_name')
|
->required(),
|
||||||
->label('Machine Name'),
|
Forms\Components\TextInput::make('characteristic_field')
|
||||||
Forms\Components\TextInput::make('name1')
|
->label('Characteristic Field')
|
||||||
->label('Name-1'),
|
->columnSpan(2)
|
||||||
Forms\Components\TextInput::make('mail1')
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
->label('Mail-1'),
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
Forms\Components\TextInput::make('duration1')
|
}),
|
||||||
->label('Duration-1 (Hour.Minute)'),
|
Forms\Components\TextInput::make('machine_name')
|
||||||
Forms\Components\TextInput::make('name2')
|
->label('Machine')
|
||||||
->label('Name-2'),
|
->columnSpan(2)
|
||||||
Forms\Components\TextInput::make('mail2')
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
->label('Mail-2'),
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
Forms\Components\TextInput::make('duration2')
|
}),
|
||||||
->label('Duration-2 (Hour.Minute)'),
|
Section::make('Approver - 1')
|
||||||
Forms\Components\TextInput::make('name3')
|
// ->description('Prevent abuse by limiting the number of requests per period')
|
||||||
->label('Name-3'),
|
->columnSpan(['default' => 2, 'sm' => 4])
|
||||||
Forms\Components\TextInput::make('mail3')
|
->schema([
|
||||||
->label('Mail-3'),
|
Forms\Components\TextInput::make('name1')
|
||||||
Forms\Components\TextInput::make('duration3')
|
->label('Name')
|
||||||
->label('Duration-3 (Hour.Minute)'),
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
Forms\Components\Hidden::make('created_by')
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
->label('Created By')
|
}),
|
||||||
->default(Filament::auth()->user()?->name),
|
Forms\Components\TextInput::make('mail1')
|
||||||
Forms\Components\Hidden::make('updated_by')
|
->label('Mail')
|
||||||
->label('Updated By')
|
->columnSpan(['default' => 1, 'sm' => 2])
|
||||||
->default(Filament::auth()->user()?->name),
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
Forms\Components\TextInput::make('duration1')
|
||||||
|
->label('Duration (HH.MM)')
|
||||||
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
->collapsed()// collapsible()
|
||||||
|
->columns(['default' => 1, 'sm' => 4]),
|
||||||
|
Section::make('Approver - 2')
|
||||||
|
->columnSpan(['default' => 2, 'sm' => 4])
|
||||||
|
->schema([
|
||||||
|
Forms\Components\TextInput::make('name2')
|
||||||
|
->label('Name')
|
||||||
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
Forms\Components\TextInput::make('mail2')
|
||||||
|
->label('Mail')
|
||||||
|
->columnSpan(['default' => 1, 'sm' => 2])
|
||||||
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
Forms\Components\TextInput::make('duration2')
|
||||||
|
->label('Duration (HH.MM)')
|
||||||
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
->collapsed()// collapsible()
|
||||||
|
->columns(['default' => 1, 'sm' => 4]),
|
||||||
|
Section::make('Approver - 3')
|
||||||
|
->columnSpan(['default' => 2, 'sm' => 4])
|
||||||
|
->schema([
|
||||||
|
Forms\Components\TextInput::make('name3')
|
||||||
|
->label('Name')
|
||||||
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
Forms\Components\TextInput::make('mail3')
|
||||||
|
->label('Mail')
|
||||||
|
->columnSpan(['default' => 1, 'sm' => 2])
|
||||||
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
Forms\Components\TextInput::make('duration3')
|
||||||
|
->label('Duration (HH.MM)')
|
||||||
|
->afterStateUpdated(function ($state, callable $set) {
|
||||||
|
$set('updated_by', Filament::auth()->user()?->name);
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
->collapsed()// collapsible()
|
||||||
|
->columns(['default' => 1, 'sm' => 4]),
|
||||||
|
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(),
|
||||||
|
])
|
||||||
|
->columns(['default' => 1, 'sm' => 4]),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,26 +165,34 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
Tables\Columns\TextColumn::make('plant.name')
|
Tables\Columns\TextColumn::make('plant.name')
|
||||||
->label('Plant')
|
->label('Plant')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('machine.work_center')
|
Tables\Columns\TextColumn::make('machine.work_center')
|
||||||
->label('Work Center')
|
->label('Work Center')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('characteristic_field')
|
Tables\Columns\TextColumn::make('characteristic_field')
|
||||||
->label('Characteristic Field')
|
->label('Characteristic Field')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
|
->formatStateUsing(fn (string $state): string => strtoupper(__($state)))
|
||||||
|
->extraAttributes(['class' => 'uppercase'])
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('machine_name')
|
Tables\Columns\TextColumn::make('machine_name')
|
||||||
->label('Machine Name')
|
->label('Machine Name')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('name1')
|
Tables\Columns\TextColumn::make('name1')
|
||||||
->label('Approver Name 1')
|
->label('Approver Name 1')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('mail1')
|
Tables\Columns\TextColumn::make('mail1')
|
||||||
->label('Mail 1')
|
->label('Mail 1')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('duration1')
|
Tables\Columns\TextColumn::make('duration1')
|
||||||
->label('Duration 1 (Hour.Minute)')
|
->label('Duration 1 (Hour.Minute)')
|
||||||
@@ -120,10 +201,12 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
Tables\Columns\TextColumn::make('name2')
|
Tables\Columns\TextColumn::make('name2')
|
||||||
->label('Approver Name 2')
|
->label('Approver Name 2')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('mail2')
|
Tables\Columns\TextColumn::make('mail2')
|
||||||
->label('Mail 2')
|
->label('Mail 2')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('duration2')
|
Tables\Columns\TextColumn::make('duration2')
|
||||||
->label('Duration 2 (Hour.Minute)')
|
->label('Duration 2 (Hour.Minute)')
|
||||||
@@ -132,10 +215,12 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
Tables\Columns\TextColumn::make('name3')
|
Tables\Columns\TextColumn::make('name3')
|
||||||
->label('Approver Name 3')
|
->label('Approver Name 3')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('mail3')
|
Tables\Columns\TextColumn::make('mail3')
|
||||||
->label('Mail 3')
|
->label('Mail 3')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable(),
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('duration3')
|
Tables\Columns\TextColumn::make('duration3')
|
||||||
->label('Duration 3 (Hour.Minute)')
|
->label('Duration 3 (Hour.Minute)')
|
||||||
@@ -145,16 +230,31 @@ class CharacteristicApproverMasterResource extends Resource
|
|||||||
->label('Created At')
|
->label('Created At')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
->dateTime()
|
->dateTime()
|
||||||
->sortable()
|
->searchable()
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
->sortable(),
|
||||||
|
Tables\Columns\TextColumn::make('created_by')
|
||||||
|
->label('Created By')
|
||||||
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
|
->sortable(),
|
||||||
Tables\Columns\TextColumn::make('updated_at')
|
Tables\Columns\TextColumn::make('updated_at')
|
||||||
->label('Updated At')
|
->label('Updated At')
|
||||||
->alignCenter()
|
->alignCenter()
|
||||||
->dateTime()
|
->dateTime()
|
||||||
|
->searchable()
|
||||||
|
->sortable()
|
||||||
|
->toggleable(isToggledHiddenByDefault: true),
|
||||||
|
Tables\Columns\TextColumn::make('updated_by')
|
||||||
|
->label('Updated By')
|
||||||
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable()
|
->sortable()
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
->toggleable(isToggledHiddenByDefault: true),
|
||||||
Tables\Columns\TextColumn::make('deleted_at')
|
Tables\Columns\TextColumn::make('deleted_at')
|
||||||
|
->label('Deleted At')
|
||||||
->dateTime()
|
->dateTime()
|
||||||
|
->alignCenter()
|
||||||
|
->searchable()
|
||||||
->sortable()
|
->sortable()
|
||||||
->toggleable(isToggledHiddenByDefault: true),
|
->toggleable(isToggledHiddenByDefault: true),
|
||||||
])
|
])
|
||||||
|
|||||||
Reference in New Issue
Block a user