diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index e973a33a..938c9099 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -394,7 +394,7 @@ class EmployeeServiceController extends AdminController 'is_mandatory' => true, 'data_type' => 'str', 'format' => null, - 'allowed_values' => ['name', 'dob', 'relationship'] + 'allowed_values' => ['name', 'dob', 'relationship', 'email_corporate'] ], 'value' => [ 'col_idx' => 4, diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index 2c90ed53..174bad00 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -1273,8 +1273,8 @@ class LeadsController extends BaseController 'Total Lives' => $rfq_data['incept_no_of_lives'], 'Period of Insurance ' => !empty($rfq_data['policy_start_date']) && !empty($rfq_data['policy_end_date']) ? date('d-m-Y', strtotime($rfq_data['policy_start_date'])) . ' to ' . date('d-m-Y', strtotime($rfq_data['policy_end_date'])) : "To be decided", - 'Insurer' => $rfq_data['insurer_name'] ?? " - ", - 'TPA' => $rfq_data['tpa_name'] ?? " - ", + // 'Insurer' => $rfq_data['insurer_name'] ?? " - ", + // 'TPA' => $rfq_data['tpa_name'] ?? " - ", // 'Policy Run Days' => $rfq_data['policy_run_days'], ]; } else if (in_array($rfq_data['policy_type_id'], [1, 6, 7])) { @@ -1344,6 +1344,7 @@ class LeadsController extends BaseController $sheetName = 'Worksheet'; if ($type == 2) { $sheetName = 'QCR'; + // $propsal_and_insurer = "Proposal 1-ICICIPRU-ICICI001"; $data = $this->convertJsonForQCR($data, $type); if ($propsal_and_insurer !== null) { list($proposal_key, $insurer_key) = explode('-', $propsal_and_insurer, 2); @@ -1485,9 +1486,16 @@ class LeadsController extends BaseController $columnLetter = 'A'; $header_actual_count = 0; + $headerIndex = 0; foreach ($headers as $header) { // Kint::dump($header); + if($is_placement == true){ + //for placement proposal only + $nxt_ro = $rowNumber + 1; + $sheet->mergeCells("C{$rowNumber}:C{$nxt_ro}"); + } + if (in_array($header['parentHeader'], ['Item Key', 'Action'])) { continue; } @@ -1499,10 +1507,18 @@ class LeadsController extends BaseController if ($header['parentHeader'] === 'Sno') { $header['parentHeader'] = 'S.No.'; $sheet->getColumnDimension('A')->setWidth(10); + + //merge the 2 row cells of the S.No. + $nxt_ro = $rowNumber + 1; + $sheet->mergeCells("{$columnLetter}{$rowNumber}:{$columnLetter}{$nxt_ro}"); } if ($header['parentHeader'] === 'Particulars') { $sheet->getColumnDimension('B')->setWidth(35); + + //merge the 2 row cells of the particulars + $nxt_ro = $rowNumber + 1; + $sheet->mergeCells("{$columnLetter}{$rowNumber}:{$columnLetter}{$nxt_ro}"); } $startColumn = $columnLetter; // Start of the current header range @@ -1512,9 +1528,12 @@ class LeadsController extends BaseController $sheet->setCellValue("{$startColumn}{$rowNumber}", "Terms"); } else { if(in_array($header['parentHeader'], ["Existing Renewal", "Existing Rollover"])){ - $sheet->setCellValue("{$startColumn}{$rowNumber}", "Terms"); - }else{ + $sheet->setCellValue("{$startColumn}{$rowNumber}", "Existing Terms"); + }else if(in_array($header['parentHeader'], ["Particulars", "S.No."])){ $sheet->setCellValue("{$startColumn}{$rowNumber}", $header['parentHeader']); + }else{ + $headerIndex = $headerIndex + 1; + $sheet->setCellValue("{$startColumn}{$rowNumber}", "Proposal Terms " . $headerIndex); } } $sheet->getStyle("{$startColumn}{$rowNumber}")->applyFromArray([ @@ -1585,9 +1604,9 @@ class LeadsController extends BaseController $sheet->getRowDimension($subHeaderRow)->setRowHeight(20); // Subheader row height if ($is_placement == true) { - $rowNumber = $subHeaderRow; + $rowNumber = $subHeaderRow + 1; } else { - $rowNumber = $subHeaderRow + 2; + $rowNumber = $subHeaderRow + 1; } // dd($rowNumber); @@ -1629,6 +1648,7 @@ class LeadsController extends BaseController //premium data if ($type == 2) { + if($is_placement == true){$columnLetterForPremium = "B";}else{$columnLetterForPremium = "C";} $rowNumber += 2; // Add premium data @@ -1636,19 +1656,26 @@ class LeadsController extends BaseController // $labelArray = ["Premium", "GST (%)", "GST Amount (₹)", "Total"]; $labelArray = ["Premium", "GST Amount (₹)", "Total"]; $premiumData = $data['premium_data']['data']; + // dd($premiumData); // $premium = [$labelArray[0]]; // $gst = [$labelArray[1]]; // $gstAmt = [$labelArray[1]]; // $total = [$labelArray[2]]; + if($is_placement == true){ + $premium[] = $labelArray[0]; + $gstAmt[] = $labelArray[1]; + $total[] = $labelArray[2]; + } + foreach ($premiumData as $proposal => $insurers) { if ($proposal != 'Particulars') { foreach ($insurers as $insurer => $values) { if($insurer == 'Quote Asked'){ - $premium[] = $labelArray[0]; + $premium[] = count($insurers ?? []) > 1 ? $labelArray[0] : ""; // $gst[] = ""; - $gstAmt[] = $labelArray[1]; - $total[] = $labelArray[2]; + $gstAmt[] = count($insurers ?? []) > 1 ? $labelArray[1] : ""; + $total[] = count($insurers ?? []) > 1 ? $labelArray[2] : ""; }else{ $premium[] = formatIndianCurrency($values[$labelArray[0]]); // $gst[] = $values[$labelArray[1]]; @@ -1659,8 +1686,10 @@ class LeadsController extends BaseController } } + // dd([$premium, $gstAmt, $total]); die; + foreach ([$premium, $gstAmt, $total] as $index => $rowData) { - $columnLetter = 'C'; + $columnLetter = $columnLetterForPremium; foreach ($rowData as $key => $value) { $sheet->setCellValue("{$columnLetter}{$rowNumber}", $value); if (in_array($value, $labelArray)) { @@ -1677,8 +1706,8 @@ class LeadsController extends BaseController $prevColumn3 = $this->getPreviousColumn($columnLetter, 2); } - $premiumRange = "C" . ($rowNumber - 3) . ":" . "{$prevColumn3}" . ($rowNumber - 1); - // dd($premiumRange); + $premiumRange = $columnLetterForPremium . ($rowNumber - 3) . ":" . "{$prevColumn3}" . ($rowNumber - 1); + // dd($prevColumn3, $premiumRange, $this->getPreviousColumn($columnLetter, 2), $columnLetter, $rowNumber); $sheet->getStyle($premiumRange)->applyFromArray([ 'borders' => [ diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php index 25b91991..c6f1d3b4 100644 --- a/app/Views/view_rfq.php +++ b/app/Views/view_rfq.php @@ -29,12 +29,45 @@ padding: 4px; } - .table th[contenteditable], + /* .table th[contenteditable], .table td[contenteditable] { border: 1px solid #007bff; outline: none; + } */ + + #rfqTable th:nth-child(-n+3), + #rfqTable td:nth-child(-n+3) { + border: none; } + #rfqTable th:nth-child(-n+3), + #rfqTable td:nth-child(-n+3) { + border: 3px solid snow; + } + + #rfqTable th:nth-child(n+4), + #rfqTable td:nth-child(n+4) { + border: 2px solid #007bff; + /* outline: none; */ + } + + #rfqTable thead th { + border-bottom: none !important; + } + + /* Apply border to all columns */ + #rfqTable_for_calc th, + #rfqTable_for_calc td { + border: 2px solid #007bff; + } + + /* Remove border from first 2 and last column */ + #rfqTable_for_calc th:nth-child(-n+2), + #rfqTable_for_calc td:nth-child(-n+2), + #rfqTable_for_calc th:last-child, + #rfqTable_for_calc td:last-child { + border: none; + } .table th, .table td { @@ -196,11 +229,15 @@ color: #666; } - table th.action, + /* table th.action, table th.disableborder, table td.action, table td.disableborder { border: none !important; + } */ + + .no-border { + border: none !important; } @@ -244,10 +281,10 @@ - - - - + + + - - - - + + + + - + @@ -299,7 +336,6 @@
SnoParticularsProposal 1 + S.No.ParticularsProposal Coverage 1 Action
- - Quote Asked - - Quote Asked -
11
- @@ -647,6 +683,7 @@ var jsonDataForHide = null; var multi_file_data = []; var totalSumAssuredData = []; + var snoColumnWidth = "72px"; const editorConfig = { buttons: [ @@ -1200,10 +1237,13 @@ function addSuggestionsToTable() { console.log('leadType', leadType); let renewal_or_rollover = "Proposal 1"; + let renewal_or_rollover_display_name = "Proposal Coverage 1"; if (leadType == 2) { renewal_or_rollover = "Existing Renewal"; + renewal_or_rollover_display_name = "Existing Coverage"; } else if (leadType == 3) { renewal_or_rollover = "Existing Rollover"; + renewal_or_rollover_display_name = "Existing Coverage"; } over_all_column_data = { @@ -1219,7 +1259,7 @@ function addSuggestionsToTable() { $('#first_proposel_title').html(` - ${renewal_or_rollover} + ${renewal_or_rollover_display_name}