From cac691c82d857c41165aa36b509ce87cf540103c Mon Sep 17 00:00:00 2001 From: dhanabalan Date: Sat, 7 Jun 2025 16:36:58 +0530 Subject: [PATCH] Issue solved in filter in connection type --- .../Resources/TestingPanelReadingResource.php | 25 +++++++++++-------- .../views/exports/export-isi-pdf.blade.php | 9 ++++--- .../export-isi-three-phase-pdf.blade.php | 9 ++++--- .../exports/export-three-phase-pdf.blade.php | 5 ++-- .../views/exports/testingpanel-pdf.blade.php | 7 +++--- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/app/Filament/Resources/TestingPanelReadingResource.php b/app/Filament/Resources/TestingPanelReadingResource.php index 77998f767..ff6be0e36 100644 --- a/app/Filament/Resources/TestingPanelReadingResource.php +++ b/app/Filament/Resources/TestingPanelReadingResource.php @@ -488,16 +488,19 @@ class TestingPanelReadingResource extends Resource ->searchable() ->options(function (callable $get) { $plantId = $get('Plant'); - - return Item::where('plant_id', $plantId)->whereHas('motorTestingMasters')->pluck('code', 'id')->toArray(); - - // $query = Item::query(); - - // if ($plantId) { - // $query->where('plant_id', $plantId); - // } - - // return $query->pluck('code', 'id')->toArray(); + if ($plantId) { + return Item::where('plant_id', $plantId) + ->whereHas('motorTestingMasters') + ->pluck('code', 'id') + ->toArray(); + } + else + { + return Item::whereHas('motorTestingMasters') + ->pluck('code', 'id') + ->toArray(); + } + //return []; }) ->reactive(), Select::make('machine_name') @@ -587,12 +590,14 @@ class TestingPanelReadingResource extends Resource { return Configuration::where('plant_id', $plantId) ->where('c_name', 'MOTOR_CONNECTION') + ->orderBy('created_at') ->pluck('c_value', 'c_value') ->toArray(); } else { return Configuration::where('c_name', 'MOTOR_CONNECTION') + ->orderBy('created_at') ->pluck('c_value', 'c_value') ->toArray(); } diff --git a/resources/views/exports/export-isi-pdf.blade.php b/resources/views/exports/export-isi-pdf.blade.php index 233f228b4..02dc67785 100644 --- a/resources/views/exports/export-isi-pdf.blade.php +++ b/resources/views/exports/export-isi-pdf.blade.php @@ -50,7 +50,7 @@ - @php + {{-- @php $showIsiLogo = $records->every(fn ($record) => $record['isi_model']); @endphp + --}} + @php @@ -78,7 +79,7 @@ $phase = $firstRecord['phase'] ?? '-'; } @endphp - diff --git a/resources/views/exports/export-isi-three-phase-pdf.blade.php b/resources/views/exports/export-isi-three-phase-pdf.blade.php index 1938077da..6d66d4380 100644 --- a/resources/views/exports/export-isi-three-phase-pdf.blade.php +++ b/resources/views/exports/export-isi-three-phase-pdf.blade.php @@ -50,7 +50,7 @@
- Logo + {{-- Logo --}}
C.R.I. Pumps Private Limited
@@ -58,14 +58,15 @@
{{ $plant?->address ?? '' }}
MOTOR FREE RUN TEST REGISTER
@if ($showIsiLogo) ISI Logo @endif -
+ MOTOR KW / HP : {{ $kw }} / {{ $hp }} and PHASE : {{ $phase }}
- @php + {{-- @php $showIsiLogo = $records->every(fn ($record) => $record['isi_model']); @endphp + --}} + @php @@ -78,7 +79,7 @@ $phase = $firstRecord['phase'] ?? '-'; } @endphp - diff --git a/resources/views/exports/export-three-phase-pdf.blade.php b/resources/views/exports/export-three-phase-pdf.blade.php index f8dfedbbd..f2644ca9d 100644 --- a/resources/views/exports/export-three-phase-pdf.blade.php +++ b/resources/views/exports/export-three-phase-pdf.blade.php @@ -55,7 +55,7 @@ {{-- --}} - @php + {{-- @php $showIsiLogo = $records->every(fn ($record) => $record['isi_model']); @endphp @@ -65,7 +65,8 @@ @else - @endif + @endif --}} + {{-- @php diff --git a/resources/views/exports/testingpanel-pdf.blade.php b/resources/views/exports/testingpanel-pdf.blade.php index 138960e01..4c7641d8f 100644 --- a/resources/views/exports/testingpanel-pdf.blade.php +++ b/resources/views/exports/testingpanel-pdf.blade.php @@ -60,7 +60,7 @@ {{-- --}} - @php + {{-- @php $showIsiLogo = $records->every(fn ($record) => $record['isi_model']); @endphp @@ -70,7 +70,8 @@ @else - @endif + @endif --}} + {{-- @php @@ -96,7 +97,7 @@ $phase = $firstRecord['phase'] ?? '-'; } @endphp -
- Logo + {{-- Logo --}}
C.R.I. Pumps Private Limited
@@ -58,14 +58,15 @@
{{ $plant?->address ?? '' }}
MOTOR FREE RUN TEST REGISTER
@if ($showIsiLogo) ISI Logo @endif -
+ MOTOR KW / HP : {{ $kw }} / {{ $hp }} and PHASE : {{ $phase }}
ISI Logo
ISI Logo
+ MOTOR KW / HP : {{ $kw }} / {{ $hp }} and PHASE : {{ $phase }}