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

Merge pull request 'ranjith-dev' (#630) from ranjith-dev into master
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #630
This commit was merged in pull request #630.
This commit is contained in:
jothi
2026-05-21 14:09:17 +00:00
parent f2118cbd3e dc028c91bb
commit 550ffd8af3
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Filament/Exports/ProductCharacteristicsMasterExporter.php
View File

@@ -38,6 +38,8 @@ class ProductCharacteristicsMasterExporter extends Exporter
->label('CHARACTERISTICS TYPE'),
ExportColumn::make('name')
->label('CHARACTERISTICS NAME'),
ExportColumn::make('category')
->label('CATEGORY'),
ExportColumn::make('inspection_type')
->label('INSPECTION TYPE'),
ExportColumn::make('lower')

7
app/Filament/Imports/ProductCharacteristicsMasterImporter.php
View File

@@ -70,6 +70,11 @@ class ProductCharacteristicsMasterImporter extends Importer
->exampleHeader('CHARACTERISTICS NAME')
->example(['TEST01', 'TEST02'])
->rules(['required']),
ImportColumn::make('category')
->label('CATEGORY')
->requiredMapping()
->exampleHeader('CATEGORY')
->example(['Open Pump', 'Submersible Pump']),
ImportColumn::make('inspection_type')
->label('INSPECTION TYPE')
->requiredMapping()
@@ -110,6 +115,7 @@ class ProductCharacteristicsMasterImporter extends Importer
$workCenter = trim($this->data['machine']) ?? null;
$charTyp = trim($this->data['characteristics_type']) ?? null;
$charNam = trim($this->data['name']) ?? null;
$category = trim($this->data['category']) ?? null;
$inspectTyp = trim($this->data['inspection_type']) ?? null;
$lower = trim($this->data['lower']) ?? null;
$middle = trim($this->data['middle']) ?? null;
@@ -295,6 +301,7 @@ class ProductCharacteristicsMasterImporter extends Importer
'name' => $charNam,
],
[
'category' => $category,
'inspection_type' => $inspectTyp,
'lower' => $lower,
'middle' => $middle,

5
app/Filament/Resources/VehicleEntryResource.php
View File

@@ -119,7 +119,8 @@ class VehicleEntryResource extends Resource
->label('Vehicle Number')
->alignCenter()
->sortable()
->searchable(),
->searchable()
->formatStateUsing(fn ($state) => strtoupper($state)),
Tables\Columns\TextColumn::make('entry_time')
->label('Entry Time')
->alignCenter()
@@ -183,7 +184,7 @@ class VehicleEntryResource extends Resource
// return ($userHas && strlen($userHas) > 0) ? Plant::where('id', $userHas)->pluck('name', 'id')->toArray() : Plant::orderBy('code')->pluck('name', 'id')->toArray();
})
->afterStateUpdated(function ($state, callable $set, callable $get) {
$set('Line', null);
$set('vehicle_number', null);
}),
TextInput::make('vehicle_number')
->label('Vehicle Number')