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

Merge pull request 'ranjith-dev' (#715) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
Details

Browse Source 
Reviewed-on: #715
This commit was merged in pull request #715.
This commit is contained in:
jothi
2026-06-06 13:39:27 +00:00
parent 8697f72e15 9b10ff0069
commit b94fed9f51
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Filament/Imports/MotorTestingMasterImporter.php
View File

@@ -274,7 +274,7 @@ class MotorTestingMasterImporter extends Importer
$warnMsg[] = 'Invalid plant code found'; $warnMsg[] = 'Invalid plant code found';
} elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) { } elseif (Str::length($iCode) < 6 || ! ctype_alnum($iCode)) {
$warnMsg[] = 'Invalid item code found'; $warnMsg[] = 'Invalid item code found';
} elseif (Str::length($sCode) < 6 || ! ctype_alnum($sCode)) { } elseif (Str::length($sCode) > 0 && (Str::length($sCode) < 6 || ! ctype_alnum($sCode))) {
$warnMsg[] = 'Invalid sub-assembly code found'; $warnMsg[] = 'Invalid sub-assembly code found';
} else { } else {
$plant = Plant::where('code', $plantCod)->first(); $plant = Plant::where('code', $plantCod)->first();

35
app/Filament/Resources/VisitorEntryResource.php
View File

@@ -120,6 +120,7 @@ class VisitorEntryResource extends Resource
EmployeeMaster::distinct() EmployeeMaster::distinct()
->pluck('department', 'department') ->pluck('department', 'department')
) )
->searchable()
->required() ->required()
->reactive() ->reactive()
->afterStateUpdated(function (callable $set) { ->afterStateUpdated(function (callable $set) {
@@ -156,6 +157,11 @@ class VisitorEntryResource extends Resource
->searchable() ->searchable()
->options(function (callable $get) { ->options(function (callable $get) {
$department = $get('department'); $department = $get('department');
if (!$department) {
return [];
}
// Always load ALL employees, filter by department if set // Always load ALL employees, filter by department if set
if ($department) { if ($department) {
return EmployeeMaster::where('department', $department) return EmployeeMaster::where('department', $department)
@@ -319,7 +325,7 @@ class VisitorEntryResource extends Resource
->reactive() ->reactive()
->placeholder('Enter Register ID') ->placeholder('Enter Register ID')
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Rework', null); $set('type', null);
}), }),
Select::make('type') Select::make('type')
->label('Type') ->label('Type')
@@ -356,7 +362,24 @@ class VisitorEntryResource extends Resource
->reactive() ->reactive()
->placeholder('Enter Visitor Company') ->placeholder('Enter Visitor Company')
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Rework', null); $set('employee_master_id', null);
}),
Select::make('employee_department')
->label('Employee Department')
->options(function () {
return EmployeeMaster::query()
->whereNotNull('department')
->distinct()
->orderBy('department')
->pluck('department', 'department')
->toArray();
})
->searchable()
->preload()
->reactive()
->placeholder('Select Department')
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('employee_master_id', null);
}), }),
Select::make('employee_master_id') Select::make('employee_master_id')
->label('Employee Name') ->label('Employee Name')
@@ -407,6 +430,10 @@ class VisitorEntryResource extends Resource
$query->where('company', 'like', '%'.$data['company'].'%'); $query->where('company', 'like', '%'.$data['company'].'%');
} }
if (! empty($data['employee_department'])) {
$query->where('department', $data['employee_department']);
}
if (! empty($data['employee_master_id'])) { if (! empty($data['employee_master_id'])) {
$query->where('employee_master_id', $data['employee_master_id']); $query->where('employee_master_id', $data['employee_master_id']);
} }
@@ -443,6 +470,10 @@ class VisitorEntryResource extends Resource
$indicators[] = 'Company: '.$data['company']; $indicators[] = 'Company: '.$data['company'];
} }
if (! empty($data['employee_department'])) {
$indicators[] = 'Employee Department: '.$data['employee_department'];
}
if (! empty($data['employee_master_id'])) { if (! empty($data['employee_master_id'])) {
$indicators[] = 'Employee Name: '.EmployeeMaster::where('id', $data['employee_master_id'])->value('name'); $indicators[] = 'Employee Name: '.EmployeeMaster::where('id', $data['employee_master_id'])->value('name');
} }