Merge pull request 'Updated clear selection on plant or line name change' (#791) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
Reviewed-on: #791
This commit was merged in pull request #791.
This commit is contained in:
@@ -11,23 +11,22 @@ use App\Models\Plant;
|
|||||||
use App\Models\WorkGroupMaster;
|
use App\Models\WorkGroupMaster;
|
||||||
use Filament\Facades\Filament;
|
use Filament\Facades\Filament;
|
||||||
use Filament\Forms;
|
use Filament\Forms;
|
||||||
|
use Filament\Forms\Components\DateTimePicker;
|
||||||
use Filament\Forms\Components\Section;
|
use Filament\Forms\Components\Section;
|
||||||
|
use Filament\Forms\Components\Select;
|
||||||
|
use Filament\Forms\Components\TextInput;
|
||||||
use Filament\Forms\Form;
|
use Filament\Forms\Form;
|
||||||
use Filament\Forms\Get;
|
use Filament\Forms\Get;
|
||||||
use Filament\Resources\Resource;
|
use Filament\Resources\Resource;
|
||||||
use Filament\Tables;
|
use Filament\Tables;
|
||||||
use Filament\Tables\Actions\ExportAction;
|
use Filament\Tables\Actions\ExportAction;
|
||||||
use Filament\Tables\Actions\ImportAction;
|
use Filament\Tables\Actions\ImportAction;
|
||||||
|
use Filament\Tables\Filters\Filter;
|
||||||
use Filament\Tables\Table;
|
use Filament\Tables\Table;
|
||||||
use Illuminate\Database\Eloquent\Builder;
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
use Illuminate\Database\Eloquent\SoftDeletingScope;
|
||||||
use Illuminate\Validation\Rule;
|
use Illuminate\Validation\Rule;
|
||||||
use Str;
|
use Str;
|
||||||
use Filament\Forms\Components\DateTimePicker;
|
|
||||||
use Filament\Forms\Components\FileUpload;
|
|
||||||
use Filament\Forms\Components\Select;
|
|
||||||
use Filament\Forms\Components\TextInput;
|
|
||||||
use Filament\Tables\Filters\Filter;
|
|
||||||
|
|
||||||
class MachineResource extends Resource
|
class MachineResource extends Resource
|
||||||
{
|
{
|
||||||
@@ -71,6 +70,8 @@ class MachineResource extends Resource
|
|||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
$set('mPlantError', null);
|
$set('mPlantError', null);
|
||||||
|
$set('line_id', null);
|
||||||
|
$set('work_group_master_id', null);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
->extraAttributes(fn ($get) => [
|
->extraAttributes(fn ($get) => [
|
||||||
@@ -112,6 +113,7 @@ class MachineResource extends Resource
|
|||||||
// return;
|
// return;
|
||||||
// }
|
// }
|
||||||
$set('mLineError', null);
|
$set('mLineError', null);
|
||||||
|
$set('work_group_master_id', null);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
->extraAttributes(fn ($get) => [
|
->extraAttributes(fn ($get) => [
|
||||||
@@ -308,8 +310,8 @@ class MachineResource extends Resource
|
|||||||
$query->where('plant_id', $plantId);
|
$query->where('plant_id', $plantId);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
->pluck('name', 'id')
|
->pluck('name', 'id')
|
||||||
->toArray();
|
->toArray();
|
||||||
})
|
})
|
||||||
->searchable()
|
->searchable()
|
||||||
->reactive(),
|
->reactive(),
|
||||||
@@ -320,7 +322,7 @@ class MachineResource extends Resource
|
|||||||
$plantId = $get('Plant');
|
$plantId = $get('Plant');
|
||||||
$workGroupMasterId = $get('work_group_master');
|
$workGroupMasterId = $get('work_group_master');
|
||||||
|
|
||||||
if (!$workGroupMasterId) {
|
if (! $workGroupMasterId) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -402,7 +404,7 @@ class MachineResource extends Resource
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($data['name'])) {
|
if (! empty($data['name'])) {
|
||||||
$indicators[] = 'Description: ' . $data['name'];
|
$indicators[] = 'Description: '.$data['name'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($data['work_group_master'])) {
|
if (! empty($data['work_group_master'])) {
|
||||||
|
|||||||
Reference in New Issue
Block a user