diff --git a/app/Filament/Resources/TestingPanelReadingResource.php b/app/Filament/Resources/TestingPanelReadingResource.php index a164962..3dd4b85 100644 --- a/app/Filament/Resources/TestingPanelReadingResource.php +++ b/app/Filament/Resources/TestingPanelReadingResource.php @@ -584,7 +584,7 @@ class TestingPanelReadingResource extends Resource { return Configuration::where('plant_id', $plantId) ->where('c_name', 'MOTOR_CONNECTION') - ->pluck('c_value', 'id') + ->pluck('c_value', 'c_value') ->toArray(); } else @@ -810,7 +810,8 @@ class TestingPanelReadingResource extends Resource { $mappedData = collect($records)->map(function ($record) { return [ - 'Date' => $record['created_at'] ?? '', + // 'Date' => $record['created_at'] ?? '', + 'Date' =>date('Y-m-d', strtotime($record['created_at'] ?? '')), 'Output' => $record['output'] ?? '', 'Motor SNo' => $record['serial_number'] ?? '', 'Item Code' => $record->motorTestingMaster->item->code ?? '', @@ -864,7 +865,8 @@ class TestingPanelReadingResource extends Resource $mappedData = collect($records)->map(function ($record) { return [ - 'Date' => $record['created_at'] ?? '', + //'Date' => $record['created_at'] ?? '', + 'Date' =>date('Y-m-d', strtotime($record['created_at'] ?? '')), 'Output' => $record['output'] ?? '', 'Motor SNo' => $record['serial_number'] ?? '', 'Item Code' => $record->motorTestingMaster->item->code ?? '', @@ -963,7 +965,8 @@ class TestingPanelReadingResource extends Resource { $mappedData = collect($records)->map(function ($record) { return [ - 'Date' => $record['created_at'] ?? '', + // 'Date' => $record['created_at'] ?? '', + 'Date' =>date('Y-m-d', strtotime($record['created_at'] ?? '')), 'Output' => $record['output'] ?? '', 'Motor SNo' => $record['serial_number'] ?? '', 'Item Code' => $record->motorTestingMaster->item->code ?? '', @@ -1002,7 +1005,8 @@ class TestingPanelReadingResource extends Resource { $mappedData = collect($records)->map(function ($record) { return [ - 'Date' => $record['created_at'] ?? '', + // 'Date' => $record['created_at'] ?? '', + 'Date' =>date('Y-m-d', strtotime($record['created_at'] ?? '')), 'Output' => $record['output'] ?? '', 'Motor SNo' => $record['serial_number'] ?? '', 'Item Code' => $record->motorTestingMaster->item->code ?? '', diff --git a/resources/views/exports/export-isi-pdf.blade.php b/resources/views/exports/export-isi-pdf.blade.php index b7e2547..9634dc7 100644 --- a/resources/views/exports/export-isi-pdf.blade.php +++ b/resources/views/exports/export-isi-pdf.blade.php @@ -89,7 +89,8 @@ - Date + {{-- Date --}} + Date Motor SNo Item Code Motor Type 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 3a805e5..9f8de3c 100644 --- a/resources/views/exports/export-isi-three-phase-pdf.blade.php +++ b/resources/views/exports/export-isi-three-phase-pdf.blade.php @@ -88,7 +88,8 @@ - Date + {{-- Date --}} + Date Motor SNo Item Code Motor Type diff --git a/resources/views/exports/export-three-phase-pdf.blade.php b/resources/views/exports/export-three-phase-pdf.blade.php index 134238e..b81d4ec 100644 --- a/resources/views/exports/export-three-phase-pdf.blade.php +++ b/resources/views/exports/export-three-phase-pdf.blade.php @@ -100,11 +100,14 @@ - Date + {{-- Date --}} + Date Output Motor SNo Item Code - Motor Type + {{-- Motor Type --}} + Motor Type + BEFORE FREE RUN AFTER FREE RUN LOCKED ROTOR TEST diff --git a/resources/views/exports/testingpanel-pdf.blade.php b/resources/views/exports/testingpanel-pdf.blade.php index 9322779..70077b5 100644 --- a/resources/views/exports/testingpanel-pdf.blade.php +++ b/resources/views/exports/testingpanel-pdf.blade.php @@ -21,6 +21,11 @@ .page-number:after { content: "Page " counter(page); } + /* .data-table { + width: auto; + table-layout: auto; + } */ + .header-table { width: 100%; border-collapse: collapse;} .header-table td { vertical-align: middle; border-collapse: collapse; border: 1px solid #222; } .company-title { font-size: 16px; font-weight: bold; text-align: center; } @@ -101,11 +106,13 @@ - Date + {{-- Date --}} + Date Output Motor SNo Item Code - Motor Type + {{-- Motor Type --}} + Motor Type BEFORE FREE RUN