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

Merge pull request 'ranjith-dev' (#973) 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: #973
This commit was merged in pull request #973.
This commit is contained in:
jothi
2026-09-03 11:22:26 +00:00
parent 07dc9f6335 06b679db40
commit 8f062401be
3 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Filament/Imports/CharacteristicApproverMasterImporter.php
View File

@@ -22,79 +22,79 @@ class CharacteristicApproverMasterImporter extends Importer
ImportColumn::make('plant') ImportColumn::make('plant')
->requiredMapping() ->requiredMapping()
->exampleHeader('Plant Code') ->exampleHeader('Plant Code')
->examples(['1000', '1000']) ->examples(['1000', '1000', '1000'])
->label('Plant Code') ->label('Plant Code')
->relationship(resolveUsing: 'code') ->relationship(resolveUsing: 'code')
->rules(['required']), ->rules(['required']),
ImportColumn::make('machine') ImportColumn::make('machine')
->requiredMapping() ->requiredMapping()
->exampleHeader('Work Center') ->exampleHeader('Work Center')
->examples(['RMGLAS02', 'RMGLAS02']) ->examples(['RMGLAS02', 'RMGLAS02', 'RMGLAS02'])
->label('Work Center') ->label('Work Center')
->relationship(resolveUsing: 'work_center') ->relationship(resolveUsing: 'work_center')
->rules(['required']), ->rules(['required']),
ImportColumn::make('approver_type') ImportColumn::make('approver_type')
->requiredMapping() ->requiredMapping()
->exampleHeader('Approver Type') ->exampleHeader('Approver Type')
->examples(['Characteristic', 'Quality']) ->examples(['Characteristic', 'Quality', 'Stop'])
->label('Approver Type'), ->label('Approver Type'),
ImportColumn::make('machine_name') ImportColumn::make('machine_name')
->requiredMapping() ->requiredMapping()
->exampleHeader('Machine Name') ->exampleHeader('Machine Name')
->examples(['15002635', '17002635']) ->examples(['15002635', '16002635', '17002635'])
->label('Machine Name'), ->label('Machine Name'),
ImportColumn::make('characteristic_field') ImportColumn::make('characteristic_field')
->requiredMapping() ->requiredMapping()
->exampleHeader('Master Characteristic Field') ->exampleHeader('Master Characteristic Field')
->examples(['NIL', 'MV SERIES']) ->examples(['NIL', 'MV SERIES', 'MVHS SERIES'])
->label('Master Characteristic Field'), ->label('Master Characteristic Field'),
ImportColumn::make('name1') ImportColumn::make('name1')
->requiredMapping() ->requiredMapping()
->exampleHeader('Approver Name 1') ->exampleHeader('Approver Name 1')
->examples(['Test 1', 'Test 4']) ->examples(['Test 1', 'Test 4', 'Test 7'])
->label('Approver Name 1'), ->label('Approver Name 1'),
ImportColumn::make('mail1') ImportColumn::make('mail1')
->requiredMapping() ->requiredMapping()
->exampleHeader('Mail 1') ->exampleHeader('Mail 1')
->examples(['test1@cripumps.com', 'test4@cripumps.com']) ->examples(['test1@cripumps.com', 'test4@cripumps.com', 'test7@cripumps.com'])
->label('Mail 1'), ->label('Mail 1'),
ImportColumn::make('duration1') ImportColumn::make('duration1')
->numeric() ->numeric()
->requiredMapping() ->requiredMapping()
->exampleHeader('Duration 1') ->exampleHeader('Duration 1')
->examples(['0.05', '0.30']) ->examples(['0.05', '0.30', '0.30'])
->label('Duration 1'), ->label('Duration 1'),
ImportColumn::make('name2') ImportColumn::make('name2')
->requiredMapping() ->requiredMapping()
->exampleHeader('Approver Name 2') ->exampleHeader('Approver Name 2')
->examples(['Test 2', 'Test 5']) ->examples(['Test 2', 'Test 5', 'Test 8'])
->label('Approver Name 2'), ->label('Approver Name 2'),
ImportColumn::make('mail2') ImportColumn::make('mail2')
->requiredMapping() ->requiredMapping()
->exampleHeader('Mail 2') ->exampleHeader('Mail 2')
->examples(['test2@cripumps.com', 'test5@cripumps.com']) ->examples(['test2@cripumps.com', 'test5@cripumps.com', 'test8@cripumps.com'])
->label('Mail 2'), ->label('Mail 2'),
ImportColumn::make('duration2') ImportColumn::make('duration2')
->numeric() ->numeric()
->requiredMapping() ->requiredMapping()
->exampleHeader('Duration 2') ->exampleHeader('Duration 2')
->examples(['0.05', '0.30']) ->examples(['0.05', '0.30', '0.30'])
->label('Duration 2'), ->label('Duration 2'),
ImportColumn::make('name3') ImportColumn::make('name3')
->requiredMapping() ->requiredMapping()
->exampleHeader('Approver Name 3') ->exampleHeader('Approver Name 3')
->examples(['Test 3', 'Test 6']) ->examples(['Test 3', 'Test 6', 'Test 9'])
->label('Approver Name 3'), ->label('Approver Name 3'),
ImportColumn::make('mail3') ImportColumn::make('mail3')
->requiredMapping() ->requiredMapping()
->exampleHeader('Mail 3') ->exampleHeader('Mail 3')
->examples(['test3@cripumps.com', 'test6@cripumps.com']) ->examples(['test3@cripumps.com', 'test6@cripumps.com', 'test9@cripumps.com'])
->label('Mail 3'), ->label('Mail 3'),
ImportColumn::make('duration3') ImportColumn::make('duration3')
->numeric() ->numeric()
->requiredMapping() ->requiredMapping()
->exampleHeader('Duration 3') ->exampleHeader('Duration 3')
->examples(['0.05', '0.30']) ->examples(['0.05', '0.30', '0.30'])
->label('Duration 3'), ->label('Duration 3'),
]; ];
} }
@@ -135,8 +135,8 @@ class CharacteristicApproverMasterImporter extends Importer
if ($workCenter == null || $workCenter == '') { if ($workCenter == null || $workCenter == '') {
$warnMsg[] = "Work center can't be empty!"; $warnMsg[] = "Work center can't be empty!";
} }
if ($apprTyp == '' || $apprTyp == null || ($apprTyp != 'Characteristic' && $apprTyp != 'Quality')) { if ($apprTyp == '' || $apprTyp == null || ($apprTyp != 'Characteristic' && $apprTyp != 'Quality' && $apprTyp != 'Stop')) {
$warnMsg[] = "Approver type must be either 'Characteristic' or 'Quality'!"; $warnMsg[] = "Approver type must be either 'Characteristic', 'Quality', or 'Stop'!";
} }
if ($machineNam == null || $machineNam == '') { if ($machineNam == null || $machineNam == '') {
$warnMsg[] = "Machine name can't be empty!"; $warnMsg[] = "Machine name can't be empty!";

6
app/Filament/Resources/CharacteristicApproverMasterResource.php
View File

@@ -128,6 +128,7 @@ class CharacteristicApproverMasterResource extends Resource
return [ return [
'Characteristic' => 'Characteristic', 'Characteristic' => 'Characteristic',
'Quality' => 'Quality', 'Quality' => 'Quality',
'Stop' => 'Stop',
]; ];
}) })
->default(function () { ->default(function () {
@@ -452,6 +453,7 @@ class CharacteristicApproverMasterResource extends Resource
->options([ ->options([
'Characteristic' => 'Characteristic', 'Characteristic' => 'Characteristic',
'Quality' => 'Quality', 'Quality' => 'Quality',
'Stop' => 'Stop',
]) ])
->placeholder('Select Type') ->placeholder('Select Type')
->afterStateUpdated(function ($state, callable $set) { ->afterStateUpdated(function ($state, callable $set) {
@@ -467,7 +469,7 @@ class CharacteristicApproverMasterResource extends Resource
->placeholder('Enter Characteristic Field'), ->placeholder('Enter Characteristic Field'),
TextInput::make('name1') TextInput::make('name1')
->label('Approver Name 1') ->label('Approver Name 1')
->placeholder('Enter Approver Name 2') ->placeholder('Enter Approver Name 1')
->afterStateUpdated(function ($state, callable $set) { ->afterStateUpdated(function ($state, callable $set) {
$set('name2', null); $set('name2', null);
$set('name3', null); $set('name3', null);
@@ -480,7 +482,7 @@ class CharacteristicApproverMasterResource extends Resource
}), }),
TextInput::make('name3') TextInput::make('name3')
->label('Approver Name 3') ->label('Approver Name 3')
->placeholder('Enter Approver Name 2'), ->placeholder('Enter Approver Name 3'),
DateTimePicker::make(name: 'created_from') DateTimePicker::make(name: 'created_from')
->label('Created From') ->label('Created From')
->placeholder('Select From DateTime') ->placeholder('Select From DateTime')

27
app/Filament/Resources/RequestCharacteristicResource.php
View File

@@ -10,7 +10,6 @@ use App\Models\Item;
use App\Models\Machine; use App\Models\Machine;
use App\Models\Plant; use App\Models\Plant;
use App\Models\RequestCharacteristic; use App\Models\RequestCharacteristic;
use App\Models\StickerMaster;
use Closure; use Closure;
use Filament\Facades\Filament; use Filament\Facades\Filament;
use Filament\Forms; use Filament\Forms;
@@ -30,7 +29,6 @@ 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\Support\Facades\DB;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
@@ -42,6 +40,8 @@ class RequestCharacteristicResource extends Resource
protected static ?string $navigationGroup = 'Laser Marking'; protected static ?string $navigationGroup = 'Laser Marking';
protected static ?int $navigationSort = 3;
public static function form(Form $form): Form public static function form(Form $form): Form
{ {
@@ -133,8 +133,8 @@ class RequestCharacteristicResource extends Resource
}) })
->disabled(fn ($get) => self::isFieldDisabled($get)), ->disabled(fn ($get) => self::isFieldDisabled($get)),
Forms\Components\Hidden::make('show_validation_image') Forms\Components\Hidden::make('show_validation_image')
->reactive() ->reactive()
->default(false), ->default(false),
Forms\Components\Hidden::make('validation1_image_url') Forms\Components\Hidden::make('validation1_image_url')
->reactive(), ->reactive(),
@@ -165,17 +165,19 @@ class RequestCharacteristicResource extends Resource
if ($currentState == true) { if ($currentState == true) {
$set('validation1_image_url', null); $set('validation1_image_url', null);
return; return;
} }
$workFlowId = $get('work_flow_id'); $workFlowId = $get('work_flow_id');
if (!$workFlowId) { if (! $workFlowId) {
Notification::make() Notification::make()
->title('Missing Workflow ID') ->title('Missing Workflow ID')
->body('Please select a Workflow ID.') ->body('Please select a Workflow ID.')
->danger() ->danger()
->send(); ->send();
return; return;
} }
@@ -320,11 +322,13 @@ class RequestCharacteristicResource extends Resource
return [ return [
'Characteristic' => 'Characteristic', 'Characteristic' => 'Characteristic',
'Quality' => 'Quality', 'Quality' => 'Quality',
'Stop' => 'Stop',
]; ];
}) })
->afterStateUpdated(function ($state, callable $set, callable $get) { ->afterStateUpdated(function ($state, callable $set, callable $get) {
$appTyp = $get('approver_type');
$set('characteristic_approver_master_id', null); $set('characteristic_approver_master_id', null);
if ($get('approver_type') != 'Characteristic') { if ($appTyp != 'Characteristic') {
$set('characteristic_name', null); $set('characteristic_name', null);
$set('current_value', null); $set('current_value', null);
$set('update_value', null); $set('update_value', null);
@@ -1245,6 +1249,7 @@ class RequestCharacteristicResource extends Resource
->options([ ->options([
'Characteristic' => 'Characteristic', 'Characteristic' => 'Characteristic',
'Quality' => 'Quality', 'Quality' => 'Quality',
'Stop' => 'Stop',
]) ])
->placeholder('Select Request Type'), ->placeholder('Select Request Type'),
TextInput::make('master_characteristic_field') TextInput::make('master_characteristic_field')
@@ -1308,7 +1313,7 @@ class RequestCharacteristicResource extends Resource
]) ])
->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['machine']) && empty($data['item_id']) && empty($data['aufnr']) && empty($data['model_type']) && empty($data['work_flow_id']) && empty($data['machine_name']) && empty($data['request_type']) && empty($data['master_characteristic_field'])&& empty($data['approver_status1']) && empty($data['approver_status2']) && empty($data['approver_status3']) && empty($data['approver_status']) && empty($data['created_from']) && empty($data['created_to'])) { if (empty($data['Plant']) && empty($data['machine']) && empty($data['item_id']) && empty($data['aufnr']) && empty($data['model_type']) && empty($data['work_flow_id']) && empty($data['machine_name']) && empty($data['request_type']) && empty($data['master_characteristic_field']) && empty($data['approver_status1']) && empty($data['approver_status2']) && empty($data['approver_status3']) && empty($data['approver_status']) && empty($data['created_from']) && empty($data['created_to'])) {
return $query->whereRaw('1 = 0'); return $query->whereRaw('1 = 0');
} }
@@ -1342,19 +1347,19 @@ class RequestCharacteristicResource extends Resource
$query->where('work_flow_id', 'like', '%'.$data['work_flow_id'].'%'); $query->where('work_flow_id', 'like', '%'.$data['work_flow_id'].'%');
} }
if (!empty($data['machine_name'])) { if (! empty($data['machine_name'])) {
$query->whereHas('characteristicApproverMaster', function ($q) use ($data) { $query->whereHas('characteristicApproverMaster', function ($q) use ($data) {
$q->where('characteristic_approver_masters.machine_name', '=', (string) $data['machine_name']); $q->where('characteristic_approver_masters.machine_name', '=', (string) $data['machine_name']);
}); });
} }
if (!empty($data['request_type'])) { if (! empty($data['request_type'])) {
$query->whereHas('characteristicApproverMaster', function ($q) use ($data) { $query->whereHas('characteristicApproverMaster', function ($q) use ($data) {
$q->where('characteristic_approver_masters.approver_type', '=', (string) $data['request_type']); $q->where('characteristic_approver_masters.approver_type', '=', (string) $data['request_type']);
}); });
} }
if (!empty($data['master_characteristic_field'])) { if (! empty($data['master_characteristic_field'])) {
$query->whereHas('characteristicApproverMaster', function ($q) use ($data) { $query->whereHas('characteristicApproverMaster', function ($q) use ($data) {
$q->where('characteristic_approver_masters.characteristic_field', '=', (string) $data['master_characteristic_field']); $q->where('characteristic_approver_masters.characteristic_field', '=', (string) $data['master_characteristic_field']);
}); });
@@ -1372,7 +1377,7 @@ class RequestCharacteristicResource extends Resource
$query->where('approver_status3', 'like', '%'.$data['approver_status3'].'%'); $query->where('approver_status3', 'like', '%'.$data['approver_status3'].'%');
} }
if (!empty($data['approver_status'])) { if (! empty($data['approver_status'])) {
$status = $data['approver_status']; $status = $data['approver_status'];