diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 41b62cef..32beb07c 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -938,7 +938,7 @@ class LeadsController extends BaseController foreach ($original as $key => $value) { // Match only keys that look like 'Proposal X' - if (preg_match('/^Proposal\s+\d+$/', $key)) { + if (preg_match('/^(Proposal\s+\d+|Existing Renewal|Existing Rollover)$/', $key)) { // Get the insurer entry (not 'Quote Asked') foreach ($value as $subKey => $subVal) { if ($subKey !== 'Quote Asked' && isset($subVal['Total'])) { @@ -998,7 +998,7 @@ class LeadsController extends BaseController // Collect proposal keys that match the pattern "Proposal X" foreach ($premiumProposals as $key) { - if (preg_match('/^Proposal\s+\d+$/', $key) && isset($data['proposal_data']['over_all_column_data'][$key])) { + if (preg_match('/^(Proposal\s+\d+|Existing Renewal|Existing Rollover)$/', $key) && isset($data['proposal_data']['over_all_column_data'][$key])) { $filteredProposals[$key] = $data['proposal_data']['over_all_column_data'][$key]; } } @@ -1044,8 +1044,12 @@ class LeadsController extends BaseController } // print_rr($reorderedHeaders); die; + $proposel_count = 1; foreach ($reorderedHeaders as $key => &$value) { - $value['parentHeader'] = 'Proposal ' . ($key + 1); + if(!in_array($value['parentHeader'], ["Existing Renewal", "Existing Rollover"])){ + $value['parentHeader'] = 'Proposal ' . $proposel_count; + $proposel_count++; + } } unset($value); @@ -1085,11 +1089,15 @@ class LeadsController extends BaseController foreach ($reorderedProposalData as $key => &$value) { if ($dubParTh == $value['parentth']) { - $value['parentth'] = 'Proposal ' . ($increament); + if(!in_array($value['parentth'], ["Existing Renewal", "Existing Rollover"])){ + $value['parentth'] = 'Proposal ' . ($increament); + } } else { $dubParTh = $value['parentth']; - $increament = $increament + 1; - $value['parentth'] = 'Proposal ' . ($increament); + if(!in_array($value['parentth'], ["Existing Renewal", "Existing Rollover"])){ + $increament = $increament + 1; + $value['parentth'] = 'Proposal ' . ($increament); + } } } unset($value); @@ -1328,7 +1336,7 @@ class LeadsController extends BaseController $sheet->getStyle("A{$rowNumber}")->applyFromArray([ 'font' => [ 'bold' => true, - 'size' => 20 + 'size' => 23 ], 'alignment' => [ 'horizontal' => \PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER, @@ -1384,8 +1392,8 @@ class LeadsController extends BaseController // // Set column width based on max content length (adjusted for padding) $sheet->getColumnDimension('A')->setWidth($maxWidthA * 1.2); - $sheet->getColumnDimension('B')->setWidth($maxWidthA * 1.5); - $sheet->getColumnDimension('C')->setWidth($maxWidthB * 1.6); + // $sheet->getColumnDimension('B')->setWidth($maxWidthA * 1.5); + $sheet->getColumnDimension('C')->setWidth(35); // $rowNumber += 2; @@ -1440,12 +1448,17 @@ class LeadsController extends BaseController } $columnLetter = 'A'; + $header_actual_count = 0; foreach ($headers as $header) { // Kint::dump($header); if (in_array($header['parentHeader'], ['Item Key', 'Action'])) { continue; } + + if (!in_array($header['parentHeader'], ['Item Key', 'Action', 'Sno', 'Particulars'])) { + $header_actual_count++; + } if ($header['parentHeader'] === 'Sno') { $header['parentHeader'] = 'S.No.'; @@ -1453,7 +1466,7 @@ class LeadsController extends BaseController } if ($header['parentHeader'] === 'Particulars') { - $sheet->getColumnDimension('B')->setWidth(50); + $sheet->getColumnDimension('B')->setWidth(35); } $startColumn = $columnLetter; // Start of the current header range @@ -1512,6 +1525,13 @@ class LeadsController extends BaseController $length++; } } + + if($header_actual_count == 1 && $type == 1){ + $sheet->getColumnDimension('B')->setWidth(80); + }else{ + $sheet->getColumnDimension('B')->setWidth(35); + } + // die(); // Apply border to the header range @@ -1665,8 +1685,8 @@ class LeadsController extends BaseController ]); } - $sheet->getColumnDimension($columnLetter_img)->setWidth(40); - $sheet->getRowDimension(1)->setRowHeight(40); // Adjust as needed + $sheet->getColumnDimension($columnLetter_img)->setWidth(35); + $sheet->getRowDimension(1)->setRowHeight(50); // Adjust as needed $drawing = new Drawing(); $path = ROOTPATH . "public/assets/images/Nhance-Logo-Final.png"; // Use FCPATH for server path @@ -1681,7 +1701,7 @@ class LeadsController extends BaseController $offsetX = $offsetX + 97; // dd($length); if ($length >= 4) { - $offsetX = 50; + $offsetX = 65; } else if ($length == 3) { $offsetX = 65; }