From c928f238ef8fc89d5e4786d64a7a9d4740bad223 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Sat, 5 Apr 2025 11:44:45 +0530
Subject: [PATCH] FIX_ALIGNMENT_IN_EXCEL : RV

---
 app/Controllers/LeadsController.php | 23 ++++++++++++-----------
 app/Views/leads_form_handler.php    |  5 +++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index 02134611..c432c921 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -966,7 +966,7 @@ class LeadsController extends BaseController
         // Start with lead_data at the top
         $rowNumber = 1;
 
-        $mergeRange1 = "A{$rowNumber}:C{$rowNumber}";
+        $mergeRange1 = "A{$rowNumber}:B{$rowNumber}";
         $sheet->mergeCells($mergeRange1);
         $sheet->setCellValue("A{$rowNumber}", "Nhance India Insurance Broking Pvt Ltd");
         $sheet->getStyle("A{$rowNumber}")->applyFromArray([
@@ -981,13 +981,13 @@ class LeadsController extends BaseController
         ]);
 
         // Set column width to fit the image properly
-        $sheet->getColumnDimension('D')->setWidth(20); // Adjust as needed
+        $sheet->getColumnDimension('C')->setWidth(20); // Adjust as needed
         $sheet->getRowDimension($rowNumber)->setRowHeight(40); // Adjust as needed
 
         $drawing = new Drawing();
         $path = ROOTPATH . "public/assets/images/Nhance-Logo-Final.png"; // Use FCPATH for server path
         $drawing->setPath($path);
-        $drawing->setCoordinates("D{$rowNumber}"); // Set position in column B
+        $drawing->setCoordinates("C{$rowNumber}"); // Set position in column B
         $drawing->setHeight(35); // Adjust image height
 
         // Center align the image in the cell
@@ -997,8 +997,8 @@ class LeadsController extends BaseController
         $drawing->setWorksheet($sheet);
 
         // Apply center alignment to the cell
-        $sheet->getStyle("D{$rowNumber}")->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
-        $sheet->getStyle("D{$rowNumber}")->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER);
+        $sheet->getStyle("C{$rowNumber}")->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+        $sheet->getStyle("C{$rowNumber}")->getAlignment()->setVertical(\PhpOffice\PhpSpreadsheet\Style\Alignment::VERTICAL_CENTER);
 
 
         $rowNumber = $rowNumber + 1;
@@ -1011,7 +1011,7 @@ class LeadsController extends BaseController
 
             // Merge A:B for key and C:D for value
             $mergeRangeKey = "A{$rowNumber}:B{$rowNumber}";
-            $mergeRangeValue = "C{$rowNumber}:D{$rowNumber}";
+            $mergeRangeValue = "C{$rowNumber}";
             $sheet->mergeCells($mergeRangeKey);
             $sheet->mergeCells($mergeRangeValue);
 
@@ -1044,9 +1044,9 @@ 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.2);
+        $sheet->getColumnDimension('B')->setWidth($maxWidthA * 5);
         $sheet->getColumnDimension('C')->setWidth($maxWidthB * 1.2);
-        $sheet->getColumnDimension('D')->setWidth($maxWidthB * 1.2);
+        // $sheet->getColumnDimension('D')->setWidth($maxWidthB * 1.2);
 
         // $rowNumber += 2;
 
@@ -1105,7 +1105,7 @@ class LeadsController extends BaseController
             }
 
             if ($header['parentHeader'] === 'Particulars') {
-                $sheet->getColumnDimension('B')->setWidth(40);
+                $sheet->getColumnDimension('B')->setWidth(80);
             }
 
             $startColumn = $columnLetter; // Start of the current header range
@@ -1289,7 +1289,7 @@ class LeadsController extends BaseController
         }
 
         $lastRow = count($lead_data) + 1;
-        $leadRange = "A1:D{$lastRow}";
+        $leadRange = "A1:C{$lastRow}";
 
         $sheet->getStyle($leadRange)->applyFromArray([
             'borders' => [
@@ -2736,7 +2736,8 @@ class LeadsController extends BaseController
                     $data
                 ) ?? "";
 
-                $data['lead_edit_data']['multi_file_html'] = view('rfq/multi_files', $data) ?? "";
+                $html = view('rfq/multi_files', $data);
+                $data['lead_edit_data']['multi_file_html'] = trim($html) !== '' ? $html : null;
             }
 
             if ($data['lead_edit_data']['lead_type'] != 1 && $data['lead_edit_data']['lead_form_type'] == 2) {
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 30bb0d02..fdf3de07 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -480,7 +480,7 @@ if (isset($selected_lead_type)) {
 
                 $('.btnDiv').hide();
                 $('#appendArea_' + dataIncrement).empty();
-                $('#multiFileAppendArea_' + dataIncrement).empty();
+               
 
                 if (data.html) {
                     $('#appendArea_' + dataIncrement).append(data.html);
@@ -488,7 +488,8 @@ if (isset($selected_lead_type)) {
                     console.warn('HTML content missing in data.');
                 }
 
-                if (data.multi_file_html) {
+                if (data.multi_file_html && data.multi_file_html != '') {
+                    $('#multiFileAppendArea_' + dataIncrement).empty();
                     console.log(data.multi_file_html);
                     setTimeout(function(){
                         $('#multiFileAppendArea_' + dataIncrement).append(data.multi_file_html);