From d9c9209286961032e1a382dd481d6c3eab375ce8 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 3 Jun 2024 10:06:15 +0530
Subject: [PATCH 1/7] 
 CHANGE_ALL_IMPORT_EXPORT_FUNCTION_TO_CHECK_VALIDATION_AND_CONVERT_TO_JOB : RV

---
 app/Controllers/ClientController.php         |    5 +-
 app/Controllers/EmpDataServiceController.php | 2151 ++++++++++++------
 app/Controllers/EmployeeController.php       |  184 +-
 app/Controllers/JobWorker.php                |   12 +
 app/Models/EmployeePolicyModel.php           |  253 +-
 app/Views/client_policy.php                  |    6 +-
 app/Views/employee_upload.php                |   57 +-
 app/Views/file_list.php                      |    6 +-
 app/Views/policy_grid.php                    |    7 +-
 app/Views/view_file_upload_emp_list.php      |    2 +-
 10 files changed, 1886 insertions(+), 797 deletions(-)

diff --git a/app/Controllers/ClientController.php b/app/Controllers/ClientController.php
index 033300aa..52b3dbca 100644
--- a/app/Controllers/ClientController.php
+++ b/app/Controllers/ClientController.php
@@ -586,11 +586,11 @@ class ClientController extends AdminController
 
         $this->myLogger->logme('error','Client policy CREATE function called');
 
-        $policy_id = $this->request->getPost('policy_id');
+        $policy_type_id = $this->request->getPost('policy_type_id');
         $client_branch_id = $this->request->getPost('client_branch_id');
 
         $policyCount = $this->clientPolicyModel
-        ->where('policy_id', $policy_id) 
+        ->where('policy_type_id', $policy_type_id) 
         ->where('client_branch_id', $client_branch_id)
         ->countAllResults(); 
 
@@ -816,7 +816,6 @@ class ClientController extends AdminController
 
             $jsonDataForRelation = json_encode($relation_data);
 
-
             // if($policy_grid_id == 10 || $policy_grid_id == 11){
             //     $premium_type = 1;
             // }else{
diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 9ea04893..6325255f 100644
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -111,7 +111,7 @@ class EmpDataServiceController extends BaseController
 
             $batch_list_data['batch_code'] =  $params['batch_code'];
             $batch_list_data['emp_policy_id'] =  $value['primaryKey'];
-            $batch_list_data['created_by'] = get_session_userid();
+            $batch_list_data['created_by'] = $params['user_id'];
             $this->batchListModel->insert($batch_list_data);
         }
 
@@ -133,30 +133,29 @@ class EmpDataServiceController extends BaseController
     public function generateExcelForAdditionandInception($export_data)
     {
 
-        $return = $this->removeOldExportInfoFromBatchFile($export_data);
-
         // Fetch employee data for export from the database
         $objects = $this->employeePolicyModel->getInceptionEmployeeDataForExportExcel($export_data);
-
         $insurer_id = $this->clientPolicyModel->where('id', $export_data['client_policy_id'])->first();
-
         $cash_balance = $this->clientDepositModel->where('client_id', $export_data['client_id'])->where('insurer_id', $insurer_id['insurer_id'])->orderBy('id', 'DESC')->first();
 
 
-        $totals = 0;
-        foreach ($objects as $key => $value) {
+        // Calculate the total amount from the objects
+        $totals = array_reduce($objects, function ($carry, $item) {
+            return $carry + $item->total;
+        }, 0);
+
+        $totals = round($totals, 2);
+
+        $this->removeOldExportInfoFromBatchFile($export_data);
 
-            $totals += $value->total;
-        }
 
         if (!empty($cash_balance)) {
 
             if ((int) $cash_balance['balance']  < (int) $totals) {
 
+                $this->myLogger->logme('error', 'Inception export failed due to insufficient deposit amount.');
                 return 0;
             }
-        } else {
-            // return 0;
         }
 
 
@@ -171,6 +170,8 @@ class EmpDataServiceController extends BaseController
 
         // If no data is found for export, return false
         if ($count == 0) {
+
+            $this->myLogger->logme('error', 'No Record found. TPA ID or UHID are Alread Updated.  Correction export data count : {data}', ['data' => $count]);
             return false;
         }
 
@@ -212,30 +213,35 @@ class EmpDataServiceController extends BaseController
         // If Excel generation is successful
         if ($success) {
 
-
-            // Batch files and list entry
-            // $return = $this->batchFilesAndBatchListEntry($export_data, $objects);
-
             $random_number_count = 4;
             $export_data['batch_code'] = generate_random_string($random_number_count);
             $export_data['created_by'] = get_session_userid();
-    
+
             $insert = $this->batchFileModel->insert($export_data);
             $batch_file_batch_code = $this->batchFileModel->where('id', $insert)->first();
             $batch_code = $batch_file_batch_code['batch_code'];
 
             // $this->insertBatchList(['batch_code' => $batch_code, 'batch_list_data' => $objects ]);
 
-            $job_details  = new Jobs();                             
-            $r = Jobs::addJob(['job_name' => 'insertBatchList','payload' => ['batch_code' => $batch_code, 'batch_list_data' => $objects ]]);
+            $job_details  = new Jobs();
+            $r = Jobs::addJob(['job_name' => 'insertBatchList', 'payload' => ['batch_code' => $batch_code, 'user_id' => get_session_userid(), 'batch_list_data' => $objects]]);
 
 
             // If batch operation is successful
             if (true) {
+
+                // Clear the output buffer to avoid any unwanted output
+                if (ob_get_level()) {
+                    ob_end_clean();
+                }
+
                 // Set headers for Excel file download
                 header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-                header('Content-Disposition: attachment;filename="' . $export_data['file_name'] . '"');
-                header('Cache-Control: max-age=0');
+                header('Content-Disposition: attachment; filename="' . $export_data['file_name'] . '"');
+                header('Content-Transfer-Encoding: binary');
+                header('Cache-Control: must-revalidate');
+                header('Pragma: public');
+                header('Expires: 0');
 
                 // Output file contents
                 rewind($tempFile);
@@ -247,7 +253,7 @@ class EmpDataServiceController extends BaseController
                 return true; // Excel file successfully generated and exported
 
             } else {
-                
+
                 return false; // Batch operation failed
             }
         }
@@ -266,17 +272,18 @@ class EmpDataServiceController extends BaseController
             $ids[] = $obj->id;
         }
 
-        // echo '<pre>';
-        // print_r($objects); die;
-
         $count = count($objects);
         $export_data['count'] = $count;
         $this->myLogger->logme('error', 'Correction export data count : {data}', ['data' => $count]);
 
         if ($count == 0) {
-            return false;
+            $this->myLogger->logme('error', 'No Record found. Endorsement ID Alread Updated.  Correction export data count : {data}', ['data' => $count]);
+            return false;  
         }
 
+        $this->removeOldExportInfoFromBatchFile($export_data);
+
+
         $this->myLogger->logme('error', 'Correction export file name : {data}', ['data' => $export_data['file_name']]);
 
         $correction_data = transform_objects_to_array_for_correction($objects);
@@ -302,7 +309,11 @@ class EmpDataServiceController extends BaseController
         $value = generate_excel($headers, $correction_data, $tempFile);
 
         if ($value) {
+
+
+
             $return = $this->batchFilesAndBatchListEntry($export_data, $objects);
+
             if ($return) {
 
                 foreach ($ids as $key => $id) {
@@ -312,7 +323,6 @@ class EmpDataServiceController extends BaseController
                     }
                 }
 
-
                 // Set the appropriate headers for Excel file download
                 header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
                 header('Content-Disposition: attachment;filename="' . $export_data['file_name'] . '"');
@@ -329,7 +339,6 @@ class EmpDataServiceController extends BaseController
 
                 return true;
             } else {
-
                 return false;
             }
         }
@@ -347,6 +356,7 @@ class EmpDataServiceController extends BaseController
             $ids[] = $obj->endorsement_primarykey;
             $totals += $obj->total;
         }
+        
         $rounded_totals = round($totals, 2);
         // echo '<pre>';
         // print_r($ids); die;
@@ -354,13 +364,17 @@ class EmpDataServiceController extends BaseController
         $count = count($objects);
         $export_data['count'] = $count;
         $export_data['amount'] = $rounded_totals;
+        $export_data['status'] = 'success';
 
         $this->myLogger->logme('error', 'SI_Enhancement export data count : {data}', ['data' => $count]);
 
         if ($count == 0) {
+
+            $this->myLogger->logme('error', 'No Record found. Endorsement ID Alread Updated. SI_Enhancement export data count : {data}', ['data' => $count]);
             return false;
         }
 
+        $this->removeOldExportInfoFromBatchFile($export_data);
         $this->myLogger->logme('error', 'SI_Enhancement export file name : {data}', ['data' => $export_data['file_name']]);
 
         $si_data = transform_objects_to_array_for_si_enhancement($objects);
@@ -440,21 +454,21 @@ class EmpDataServiceController extends BaseController
             $totals += $obj->total;
         }
         $rounded_totals = round($totals, 2);
-        // echo '<pre>';
-        // print_r($ids); 
-        // print_r($objects); die;
 
         $count = count($objects);
         $export_data['count'] = $count;
         $export_data['amount'] = $rounded_totals;
-
+        $export_data['status'] = 'success';
 
         $this->myLogger->logme('error', 'Deletion export data count : {data}', ['data' => $count]);
 
         if ($count == 0) {
+
+            $this->myLogger->logme('error', 'No Record found. Endorsement ID Alread Updated. Deletion export data count : {data}', ['data' => $count]);
             return false;
         }
 
+        $this->removeOldExportInfoFromBatchFile($export_data);
         $this->myLogger->logme('error', 'Deletion export file name : {data}', ['data' => $export_data['file_name']]);
 
         $si_data = transform_objects_to_array_for_deletion($objects);
@@ -539,48 +553,24 @@ class EmpDataServiceController extends BaseController
      *               - 0 if the provided data is incomplete or incorrect.
      */
 
-    public function importExcelDataForInception($import_data)
-    {
-
-        $file = $import_data['file'];
-
-        $is_moved = $file->move(WRITEPATH . 'uploads/import_excel');
-        $filename = $file->getName();
-        $this->myLogger->logme('error', 'Inception Import file name : {data}', ['data' => $filename]);
-
-
-        $random_number_count = 4;
-        $import_data['batch_code'] = generate_random_string($random_number_count);
-        $import_data['created_by'] = get_session_userid();
-        $import_data['status'] = 'pending';
-        $import_data['file_name'] = $filename;
-
-        $insert = $this->batchFileModel->insert($import_data);
-
-        $file_id['file_id'] = $insert;
-
-        $job_details  = new Jobs();                             
-        $r = Jobs::addJob(['job_name' => 'importInceptionFileValidation','payload' => ['file_id' => $insert]]);
-
-        return 1;
-    }
 
+    //Endorsement Inception
 
     public function importInceptionFileValidation($params)
     {
 
-        $this->myLogger->logme('info', 'importInceptionFileValidation called');
+        $this->myLogger->logme('info', 'Inception File Validation --  Function called');
 
         $file_id = $params['file_id'];
 
-        $this->myLogger->logme('error', 'importInceptionFileValidation batch file table primary id : {data}', ['data' => $file_id]);
+        $this->myLogger->logme('error', 'Inception File Validation --   Batch File Table Primary ID : {data}', ['data' => $file_id]);
         
         $file = $this->batchFileModel->where('id', $file_id)->first();
         $client_id = $file['client_id'];
         $client_policy_id = $file['client_policy_id'];
         $client_branch_id = $file['client_branch_id'];
         $batch_code = $file['batch_code'];
-
+        $user_id = $file['created_by'];
 
         $insurer_or_tpa = $file['insurer_or_tpa'];
         if ($insurer_or_tpa == 'tpa') {
@@ -629,10 +619,12 @@ class EmpDataServiceController extends BaseController
             ->where('employees.client_id', $client_id)
             ->where('employees.client_branch_id', $client_branch_id)
             ->where("employee_polices.{$id} IS NULL OR employee_polices.{$id} = ''")
+            ->where('employee_polices.is_active', 1)
+            ->where('employee_polices.status', 'active')
+            ->where('employees.is_active', 1)
+            ->where('employees.emp_status', 'active')
             ->findAll();
 
-        // echo '<pre>';
-        // print_r($employee_data); die;
 
 
         if ($employee_data == null || empty($employee_data)) {
@@ -644,12 +636,12 @@ class EmpDataServiceController extends BaseController
                 ];
     
                 $this->batchFileModel->where('id', $file_id)->set($data)->update();
-                $this->myLogger->logme('error', 'importInceptionFileValidation TPAID already updated');
+                $this->myLogger->logme('error', 'Inception File Validation --   TPAID already updated');
 
                 $file_data = $this->getDataByFileId($file_id, 'failure');
                 $this->setPullNotification($file_data);
 
-                return 'The list of employees provided has already been updated with the TPA ID, or this is not the correct file';
+                return ['status' => 'error', 'message' => 'The list of employees provided has already been updated with the TPA ID, or this is not the correct file'];
 
             } else if ($insurer_or_tpa == 'insurer') {
 
@@ -658,23 +650,23 @@ class EmpDataServiceController extends BaseController
                 ];
     
                 $this->batchFileModel->where('id', $file_id)->set($data)->update();
-                $this->myLogger->logme('error', 'importInceptionFileValidation UHID already updated');
+                $this->myLogger->logme('error', 'Inception File Validation --   UHID already updated');
 
                 $file_data = $this->getDataByFileId($file_id, 'failure');
                 $this->setPullNotification($file_data);
 
-                return 'The list of employees provided has already been updated with the UHID, or this is not the correct file';
+                return ['status' => 'error', 'message' =>'The list of employees provided has already been updated with the UHID, or this is not the correct file'];
             }
 
-            $this->myLogger->logme('error', 'importInceptionFileValidation UHID or TPAID already updated or the uploadedfile is not correct');
+            $this->myLogger->logme('error', 'Inception File Validation --   UHID or TPAID already updated or the uploadedfile is not correct');
 
         }
 
         $excel_data_count = count($excel_data);
         $emp_data_count = count($employee_data);
 
-        $this->myLogger->logme('error', 'importInceptionFileValidation excel file count : {data}', ['data' => $excel_data_count]);
-        $this->myLogger->logme('error', 'importInceptionFileValidation database count : {data}', ['data' => $emp_data_count]);
+        $this->myLogger->logme('error', 'Inception File Validation --   Excel File count : {data}', ['data' => $excel_data_count]);
+        $this->myLogger->logme('error', 'Inception File Validation --   Database count : {data}', ['data' => $emp_data_count]);
 
 
         // dd($excel_data_count, $emp_data_count);
@@ -685,7 +677,7 @@ class EmpDataServiceController extends BaseController
 
             $status = 'in-progress-partially';
             $partially_updated_data = 'Expected : ' . $emp_data_count . ',  ' . 'Updated : ' . $excel_data_count . ',  ' . 'difference : ' . $difference;
-            $this->myLogger->logme('error', 'importInceptionFileValidation excel file count partially : {data}', ['data' => $partially_updated_data]);
+            $this->myLogger->logme('error', 'Inception File Validation --   excel file count partially : {data}', ['data' => $partially_updated_data]);
         }
 
 
@@ -697,12 +689,12 @@ class EmpDataServiceController extends BaseController
             ];
 
             $this->batchFileModel->where('id', $file_id)->set($data)->update();
-            $this->myLogger->logme('error', 'importInceptionFileValidation excel file count ( {excel} ) exceeds db count ( {db} )', ['db' => $emp_data_count, 'excel' => $excel_data_count]);
+            $this->myLogger->logme('error', 'Inception File Validation --   Excel File Count ( {excel} ) exceeds db count ( {db} )', ['db' => $emp_data_count, 'excel' => $excel_data_count]);
 
             $file_data = $this->getDataByFileId($file_id, 'failure');
             $this->setPullNotification($file_data);
 
-            return 'The Excel record count exceeds the DB record count. excel file count : ' .  $excel_data_count . 'db count : ' .  $emp_data_count;
+            return ['status' => 'error', 'message' =>'The Excel record count exceeds the DB record count. excel file count : ' .  $excel_data_count . 'db count : ' .  $emp_data_count];
         }
 
 
@@ -874,15 +866,11 @@ class EmpDataServiceController extends BaseController
         $error_count = count($errors);
         $json_errors = json_encode($errors);
 
-        // echo $json_errors; die;
-
         $missing_id_count = count($missing_id);
         $json_missing_id = json_encode($missing_id);
 
         // dd($error_count, $missing_id_count, $json_errors, $json_missing_id);
 
-        // dd($batch_list_id);
-
         if ($missing_id_count > 0) {
 
             $data = [
@@ -897,14 +885,14 @@ class EmpDataServiceController extends BaseController
                 $file_data = $this->getDataByFileId($file_id, 'failure');
                 $this->setPullNotification($file_data);
 
-                return 'The TPA ID column is either partially or entirely empty.';
+                return ['status' => 'error', 'message' =>'The TPA ID column is either partially or entirely empty.'];
 
             } else if ($insurer_or_tpa == 'insurer') {
 
                 $file_data = $this->getDataByFileId($file_id, 'failure');
                 $this->setPullNotification($file_data);
 
-                return 'The UHID column is either partially or entirely empty.';
+                return ['status' => 'error', 'message' =>'The UHID column is either partially or entirely empty.'];
             }
         }
 
@@ -916,8 +904,11 @@ class EmpDataServiceController extends BaseController
                 'status' => 'failed',
             ];
 
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
             $this->batchFileModel->where('id', $file_id)->set($data)->update();
-            return 0;
+            return ['status' => 'error', 'message' => 'Inception File Validation Failed Excel and Database Data are Mismatching'];
 
         } else {
 
@@ -935,6 +926,7 @@ class EmpDataServiceController extends BaseController
                 $data = [
                     'emp_policy_id' => $value,
                     'batch_code' => $batch_code,
+                    'created_by' => $user_id
                 ];
 
                 $insert = $this->batchListModel->insert($data);
@@ -946,9 +938,10 @@ class EmpDataServiceController extends BaseController
             $job_details  = new Jobs();                             
             $r = Jobs::addJob(['job_name' => 'importInceptionUpdateTPAandUHID','payload' => ['file_id' => $file_id]]);
 
-
             // $this->importInceptionUpdateTPAandUHID(['file_id' => $file_id]);
 
+            return ['status' => 'error', 'message' => 'Inception File Validation Successfully Completed'];
+
         }
         
     }
@@ -957,7 +950,7 @@ class EmpDataServiceController extends BaseController
     public function importInceptionUpdateTPAandUHID($params)
     {
 
-        $this->myLogger->logme('error', 'importInceptionUpdateTPAandUHID called');
+        $this->myLogger->logme('error', 'Inception Update TPA and UHID --  Function called');
 
         $file_id = $params['file_id'];
         $file = $this->batchFileModel->find($file_id);
@@ -968,12 +961,12 @@ class EmpDataServiceController extends BaseController
             ];
 
             $this->batchFileModel->where('id', $file_id)->set($data)->update();
-            $this->myLogger->logme('error', 'importInceptionUpdateTPAandUHID the Physical file not found - file id : {data}', ['data' => $file_id]);
+            $this->myLogger->logme('error', 'Inception Update TPA and UHID --   The Physical file not found --   File id : {data}', ['data' => $file_id]);
 
             $file_data = $this->getDataByFileId($file_id, 'failure');
             $this->setPullNotification($file_data);
 
-            return 'importInceptionUpdateTPAandUHID the Physical file not found'; // Return error code if file not found
+            return ['status' => 'error', 'message' => 'Inception Update TPA and UHID --   The Physical file not found']; // Return error code if file not found
         }
 
         $client_id = $file['client_id'];
@@ -986,11 +979,11 @@ class EmpDataServiceController extends BaseController
 
 
         $get_policy_type = $this->clientPolicyModel
-                                ->select('policy_type.policy_type, policies.policy_type_id as policy_type_id')
-                                ->join('policies', 'policies.id = client_policy.policy_id')
-                                ->join('policy_type', 'policy_type.id = policies.policy_type_id')
-                                ->where('client_policy.id', $client_policy_id)
-                                ->first();
+            ->select('policy_type.policy_type, policies.policy_type_id as policy_type_id')
+            ->join('policies', 'policies.id = client_policy.policy_id')
+            ->join('policy_type', 'policy_type.id = policies.policy_type_id')
+            ->where('client_policy.id', $client_policy_id)
+            ->first();
 
 
         $status_val = 'success';
@@ -999,7 +992,7 @@ class EmpDataServiceController extends BaseController
             $status_val = 'partially success';
         }
 
-        $this->myLogger->logme('error', 'importInceptionUpdateTPAandUHID  file name : {data}', ['data'=> $file['file_name']]);
+        $this->myLogger->logme('error', 'Inception Update TPA and UHID --    file name : {data}', ['data' => $file['file_name']]);
 
 
         $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
@@ -1025,10 +1018,8 @@ class EmpDataServiceController extends BaseController
             $uhid[] = $value[16];
             $amount = $value[20];
 
-            $totals += $amount;
+            $totals = $totals + $amount;
 
-
-            // Execute the query
             $query = $db->table('employee_polices');
             $query->select('employee_polices.id');
             $query->join('employees', 'employees.id = employee_polices.employee_id');
@@ -1045,45 +1036,19 @@ class EmpDataServiceController extends BaseController
                 $query->where('(employee_polices.uhid IS NULL OR employee_polices.uhid = "")');
             }
             $query->where('employee_polices.is_active', 1);
+            $query->where('employee_polices.status', 'active');
+            $query->where('employees.is_active', 1);
+            $query->where('employees.emp_status', 'active');
             $query->limit(1);
 
-            // Get the result
             $result = $query->get()->getRowArray();
             if (isset($result['id']) && $result['id'] !== null) {
-                $emp_policy_ids[] = $result['id'];
-                $emp_details[] = array('id' => $result['id'],'tpa_id' => $value[15], 'uhid' => $value[16]);
+                $emp_policy_ids[] = $result['id']; //for cash deposite
+                $emp_details[] = array('id' => $result['id'], 'tpa_id' => $value[15], 'uhid' => $value[16]);
             }
-
-
-
-            // $sql = "
-            // UPDATE employee_polices
-            // JOIN employees ON employees.id = employee_polices.employee_id
-            // SET tpa_id = ?
-            // WHERE employees.name = ?
-            // AND employees.emp_code = ?
-            // AND employee_polices.client_policy_id = ?
-            // AND (employee_polices.tpa_id IS NULL OR employee_polices.tpa_id = '')";
-
-            // $params = [$tpa_id, $name, $emp_code, $client_policy_id];
-            // $db->query($sql, $params);
-
-
-
-            // $sql = "
-            // UPDATE employee_polices 
-            // JOIN employees ON employees.id = employee_polices.employee_id 
-            // SET employee_polices.uhid = ? 
-            // WHERE employees.name = ? 
-            // AND employees.emp_code = ? 
-            // AND employee_polices.client_policy_id = ?
-            // AND (employee_polices.uhid IS NULL OR employee_polices.uhid = '')";
-
-            // $params = [$uhid, $name, $emp_code, $client_policy_id];
-            // $db->query($sql, $params);
         }
 
-       $return = $this->employeePolicyModel->bulkUpdate($emp_details);
+        $return = $this->employeePolicyModel->bulkUpdate($emp_details);
 
         // Update batch file status and amount
         $this->batchFileModel->update($file_id, [
@@ -1093,14 +1058,14 @@ class EmpDataServiceController extends BaseController
         ]);
 
 
-        $this->myLogger->logme('error', 'importInceptionUpdateTPAandUHID  employee count : {data}', ['data'=> $emp_count]);
-        $this->myLogger->logme('error', 'importInceptionUpdateTPAandUHID  batch file status : {data}', ['data'=> $status_val]);
-        $this->myLogger->logme('error', 'importInceptionUpdateTPAandUHID  total amount for cash deposite : {data}', ['data'=> $totals]);
+        $this->myLogger->logme('error', 'Inception Update TPA and UHID --    employee count : {data}', ['data' => $emp_count]);
+        $this->myLogger->logme('error', 'Inception Update TPA and UHID --    batch file status : {data}', ['data' => $status_val]);
+        $this->myLogger->logme('error', 'Inception Update TPA and UHID --    total amount for cash deposite : {data}', ['data' => $totals]);
 
 
         if ($file['insurer_or_tpa'] == 'tpa') {
 
-            $this->myLogger->logme('error', 'importInceptionUpdateTPAandUHID  set  cashDepositCalculationForInception and sendMailForDownloadingECard in JOB QUEUE');
+            $this->myLogger->logme('error', 'Inception Update TPA and UHID --    set  cashDepositCalculationForInception and sendMailForDownloadingECard in JOB QUEUE');
 
             $policy_name = $this->getPolicyNameUsingClientPolicyId($client_policy_id);
             $depositeData = [
@@ -1116,8 +1081,8 @@ class EmpDataServiceController extends BaseController
 
 
 
-            $job_details  = new Jobs();                             
-            $r = Jobs::addJob(['job_name' => 'cashDepositCalculationForInception','payload' => [
+            $job_details  = new Jobs();
+            $r = Jobs::addJob(['job_name' => 'cashDepositCalculationForInception', 'payload' => [
                 'employeeIds' => $emp_policy_ids,
                 'client_id' => $client_id,
                 'client_policy_id' => $client_policy_id,
@@ -1127,12 +1092,11 @@ class EmpDataServiceController extends BaseController
                 'policy_name' => $policy_name['policy_name'],
                 'user_id' => $user_id,
             ]]);
-    
-            if($get_policy_type['policy_type_id'] != 1){
 
-                $job_details  = new Jobs();                             
-                $r = Jobs::addJob(['job_name' => 'sendMailForDownloadingECard','payload' => $emp_policy_ids]);  
+            if ($get_policy_type['policy_type_id'] != 1) {
 
+                $job_details  = new Jobs();
+                $r = Jobs::addJob(['job_name' => 'sendMailForDownloadingECard', 'payload' => $emp_policy_ids]);
             }
 
             // $this->cashDepositCalculationForInception($depositeData);
@@ -1144,602 +1108,1474 @@ class EmpDataServiceController extends BaseController
         $this->setPullNotification($file_data);
 
 
-        return 'Import Inception Updated '. $status_val . '- Updated Count : ' . $emp_count;
+        return 'Import Inception Updated ' . $status_val . '- Updated Count : ' . $emp_count;
     }
 
 
 
 
 
+    //Endorsement Correction
 
-
-    public function importExcelDataForCorrection($import_data)
+    public function importCorrectionValidation($params)
     {
 
-        $client_id = $import_data['client_id'];
-        $client_policy_id = $import_data['client_policy_id'];
-        $client_branch_id = $import_data['client_branch_id'];
-        $file = $import_data['file'];
+        $this->myLogger->logme('error', 'Correction File Validation --   Function called');
 
-        $data = $this->readExcelToArray($file);
-        unset($data[0]);
-        $count = count($data);
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->where('id', $file_id)->first();
 
-        $missing_id = [];
-        $empty_emp_tpa_uh_ids = [];
-        foreach ($data as $key => $value) {
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
 
-            try {
-
-                if ($value[10] === null) {
-                    $missing_id[] = $key + 1;
-                }
-
-                $emp_code = $value[0];
-                $uhid = $value[1];
-                $endorsement_id = $value[10] != null ? $value[10] : '';
-
-                $db = \Config\Database::connect();
-
-                // Execute the query
-                $query = $db->table('emp_endorsement')
-                    ->select('emp_endorsement.id')
-                    ->join('employees', 'employees.id = emp_endorsement.pk')
-                    ->join('employee_polices', 'employee_polices.employee_id = employees.id')
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('employee_polices.uhid', $uhid)
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = "")')
-                    ->groupBy('emp_endorsement.group_key')
-                    ->limit(1);
-
-                // Get the result
-                $result = $query->get()->getRowArray();
-                if (isset($result['id']) && $result['id'] !== null) {
-                    $empty_emp_tpa_uh_ids[] = $result['id'];
-                }
-            } catch (\Exception $e) {
-                // Handle the exception here
-                return 0;
-            }
-        }
-
-        $missing_id_count = count($missing_id);
-        $empty_id_count = count($empty_emp_tpa_uh_ids);
-
-        // if($missing_id_count != $count){
-
-        //     return 2;
-        // }
-
-        if ($missing_id_count != 0) {
-
-            return 2;
-        }
-
-
-        if ($empty_id_count == 0) {
-
-            return 3;
-        }
-
-        // dd($count, $missing_id, $missing_id_count, $empty_id_count, $data, $empty_emp_tpa_uh_ids);
-
-
-        $is_moved = $file->move(WRITEPATH . 'uploads/import_excel');
-        $filename = $file->getName();
-
-        $this->myLogger->logme('error', 'Correction Import file name : {data}', ['data' => $filename]);
-        $random_number_count = 4;
-        $batch_code = generate_random_string($random_number_count);
-        $this->myLogger->logme('error', 'Correction Import BATCH CODE : {data}', ['data' => $batch_code]);
-
-
-        $import_data['batch_code'] = $batch_code;
-        $import_data['created_by'] = get_session_userid();
-        $import_data['file_name'] = $filename;
-        $insert = $this->batchFileModel->insert($import_data);
-        $batch_file_batch_code = $this->batchFileModel->where('id', $insert)->first();
-
-        $batch_code_for_batch_list['batch_code'] = $batch_file_batch_code['batch_code'];
-        $batch_code_for_batch_list['created_by'] = get_session_userid();
-
-        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $batch_file_batch_code['file_name'];
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
 
         if (!file_exists($file_name_with_path)) {
-            return 2;
+
+            $this->myLogger->logme('error', 'Correction File Validation --   The Physical file not found');
+            $this->myLogger->logme('error', 'Correction File Validation --   File Name : {data}', ['data' => $file['file_name']]);
+            $this->myLogger->logme('error', 'Correction File Validation --   File Path : {data}', ['data' => $file_name_with_path]);
+
+            return 'The Physical file not found';
         }
 
-        $data = read_excel_file_to_array($file_name_with_path);
-        unset($data[0]);
-        $count = count($data);
-        $this->batchFileModel->where('id', $insert)->set('count', $count)->update();
-        foreach ($data as $key => $value) {
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]);
 
-            if (!empty($value) && isset($value[10])) {
 
-                $emp_code = $value[0];
-                $uhid = $value[1];
-                $endorsement_id = $value[10] != null ? $value[10] : '';
+        $endorsement_data = $this->empEndorsementModel
+            ->select("
+                                emp_endorsement.id, 
+                                emp_endorsement.pk, 
+                                emp_endorsement.emp_code, 
+                                emp_endorsement.endorsement_id, 
+                                emp_endorsement.old_value, 
+                                emp_endorsement.new_value, 
+                                emp_endorsement.field_name, 
+                                emp_endorsement.remarks, 
+                                emp_endorsement.actions, 
+                                employees.id AS primaryKey, 
+                                employees.name AS emp_name, 
+                                employees.dob AS emp_dob, 
+                                employees.gender AS emp_gender, 
+                                employees.client_id AS emp_client_id, 
+                                'Has Define' AS emp_type,
+                                employee_polices.uhid,
+                                employees.relationship_code
+                            ")
+            ->join("employees", "employees.id = emp_endorsement.pk", "left")
+            ->join("employee_polices", "employees.id = employee_polices.employee_id", "left")
+            ->where("employees.client_id", $client_id)
+            ->where("employee_polices.client_policy_id", $client_policy_id)
+            ->where("employees.client_branch_id", $client_branch_id)
+            ->where("employees.is_active", 1)
+            ->where("employees.emp_status", "active")
+            ->where("emp_endorsement.actions", "c")
+            ->where("(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = '')")
+            ->findAll();
 
-                $val = $this->employeePolicyModel
-                    ->select('employees.id')
-                    ->join('employees', 'employees.id = employee_polices.employee_id')
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('employee_polices.uhid', $uhid)
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('employees.is_active', 1)
-                    ->first();
 
-                $batch_code_for_batch_list['emp_policy_id'] = $val['id'];
-                $this->batchListModel->insert($batch_code_for_batch_list);
 
-                // $this->employeePolicyModel->updateCorrectionData($emp_code, $uhid, $endorsement_id);
+        // dd($endorsement_data, $excel_data);
 
-                $queryData =  $this->empEndorsementModel->select('emp_endorsement.*, employees.id as emp_id')
-                    ->join('employees', 'employees.id = emp_endorsement.pk')
-                    ->join('employee_polices', 'employee_polices.employee_id = employees.id')
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('employee_polices.uhid', $uhid)
-                    ->get()
-                    ->getResultArray();
 
-                // dd($queryData);
+        if ($endorsement_data == null || empty($endorsement_data)) {
 
-                foreach ($queryData as $endorsementData) {
+            $data = [
+                'status' => 'failed-1',
+            ];
 
-                    $emp_endoresment_id = $endorsementData['id'];
-                    $emp_id = $endorsementData['emp_id'];
-                    $field_name = $endorsementData['field_name'];
-                    $new_value = $endorsementData['new_value'];
-                    $endoresment_udate_data = [
-                        'endorsement_id' => $endorsement_id,
-                        'status' => 'complete',
-                    ];
-                    $this->empEndorsementModel->where('id', $emp_endoresment_id)->set($endoresment_udate_data)->update();
-                    $this->employeeModel->where('id', $emp_id)->set($field_name, $new_value)->update();
-                }
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'correctionFileValidation ENDORSEMENT ID already updated');
 
-                // $query = $this->employeePolicyModel->getLastQuery();
-                // echo $query . "<br>"; 
-            } else {
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
 
-                return 0;
-            }
+            return 'The list of employees provided has already been updated with the ENDORSEMENT ID, or this is not the correct file';
+
+            $this->myLogger->logme('error', 'correctionFileValidation ENDORSEMENT ID already updated or the uploadedfile is not correct');
+        }
+
+        $excel_data_count = count($excel_data);
+        $endorsement_data_count = count($endorsement_data);
+
+        $this->myLogger->logme('error', 'correctionFileValidation excel file count : {data}', ['data' => $excel_data_count]);
+        $this->myLogger->logme('error', 'correctionFileValidation database count : {data}', ['data' => $endorsement_data_count]);
+
+
+        $difference = $endorsement_data_count - $excel_data_count;
+
+        $status = 'in-progress';
+        if ($excel_data_count < $endorsement_data_count) {
+
+            $status = 'in-progress-partially';
+            $partially_updated_data = 'Expected : ' . $endorsement_data_count . ',  ' . 'Updated : ' . $excel_data_count . ',  ' . 'difference : ' . $difference;
+            $this->myLogger->logme('error', 'correctionFileValidation excel file count partially : {data}', ['data' => $partially_updated_data]);
         }
 
 
-        return 1;
-    }
-
-
-    public function importExcelDataForSIEnhancement($import_data)
-    {
-
-        $client_id = $import_data['client_id'];
-        $client_policy_id = $import_data['client_policy_id'];
-        $client_branch_id = $import_data['client_branch_id'];
-        $file = $import_data['file'];
-
-        $data = $this->readExcelToArray($file);
-        unset($data[0]);
-        $count = count($data);
+
+        if ($endorsement_data_count < $excel_data_count) {
+
+            $data = [
+                'status' => 'failed-3',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'correctionFileValidation excel file count ( {excel} ) exceeds db count ( {db} )', ['db' => $endorsement_data_count, 'excel' => $excel_data_count]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The Excel record count exceeds the DB record count. excel file count : ' .  $excel_data_count . 'db count : ' .  $endorsement_data_count;
+        }
 
 
+        $errors = []; // Initialize an array to store errors
         $missing_id = [];
-        $empty_emp_tpa_uh_ids = [];
-        $totals = 0;
-        foreach ($data as $key => $value) {
+        $batch_list_id = [];
 
-            try {
-                if ($value[19] === null) {
-                    $missing_id[] = $key + 1;
-                }
+        foreach ($endorsement_data as $key => $endorsement_value) {
 
-                $totals += $value[18];
+            $key = $key + 1;
 
-                $emp_name = $value[1];
-                $emp_code = $value[2];
-                $endorsement_id = $value[19] != null ? $value[19] : '';
-
-                $db = \Config\Database::connect();
-
-                // Execute the query
-                $query = $db->table('emp_endorsement')
-                    ->select('emp_endorsement.id')
-                    ->join('employee_polices', 'employee_polices.id = emp_endorsement.pk')
-                    ->join('employees', 'employees.emp_code = emp_endorsement.emp_code')
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('employees.name', $emp_name)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('emp_endorsement.actions', 'si')
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = "")')
-                    ->groupBy('emp_endorsement.group_key');
-
-                // Get the result
-                $result = $query->get()->getRowArray();
-                if (isset($result['id']) && $result['id'] !== null) {
-                    $empty_emp_tpa_uh_ids[] = $result['id'];
-                }
-            } catch (\Exception $e) {
-                // Handle the exception here
-                return 0;
+            if (!isset($excel_data[$key])) {
+                break;
             }
+
+
+            if ($excel_data[$key][10] === null) {
+                $missing_id[$key][] = [
+                    'row' => $key,
+                    'column' => 10,
+                ];
+            }
+
+
+            if ($endorsement_value['emp_name'] != $excel_data[$key][2]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 2,
+                    'db_data' => $endorsement_value['emp_name'],
+                    'excel_data' => $excel_data[$key][2]
+                ];
+            }
+
+            if ($endorsement_value['emp_code'] != $excel_data[$key][0]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 0,
+                    'db_data' => $endorsement_value['emp_code'],
+                    'excel_data' => $excel_data[$key][0]
+                ];
+            }
+
+            if ($endorsement_value['emp_dob'] != $excel_data[$key][5]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 5,
+                    'db_data' => $endorsement_value['emp_dob'],
+                    'excel_data' => $excel_data[$key][5]
+                ];
+            }
+
+            if ($endorsement_value['emp_gender'] != $excel_data[$key][6]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 6,
+                    'db_data' => $endorsement_value['emp_gender'],
+                    'excel_data' => $excel_data[$key][6]
+                ];
+            }
+
+            if ($endorsement_value['old_value'] != $excel_data[$key][7]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 7,
+                    'db_data' => $endorsement_value['old_value'],
+                    'excel_data' => $excel_data[$key][7]
+                ];
+            }
+
+            if ($endorsement_value['new_value'] != $excel_data[$key][8]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 8,
+                    'db_data' => $endorsement_value['new_value'],
+                    'excel_data' => $excel_data[$key][8]
+                ];
+            }
+
+
+
+            if ($endorsement_value['uhid'] != $excel_data[$key][1]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 1,
+                    'db_data' => $endorsement_value['uhid'],
+                    'excel_data' => $excel_data[$key][1]
+                ];
+            }
+
+            $batch_list_id[] = $endorsement_value['primaryKey'];
         }
-        $rounded_totals = round($totals, 2);
+
+
+        $error_count = count($errors);
+        $json_errors = json_encode($errors);
+
 
         $missing_id_count = count($missing_id);
-        $empty_id_count = count($empty_emp_tpa_uh_ids);
+        $json_missing_id = json_encode($missing_id);
 
-        // if($missing_id_count != $count){
+        // dd($error_count, $missing_id_count, $json_errors, $json_missing_id, $batch_list_id);
 
-        //     return 2;
-        // }
 
-        if ($missing_id_count != 0) {
+        if ($missing_id_count > 0) {
 
-            return 2;
+            $data = [
+
+                'count' => $endorsement_data_count,
+                'error_data' => $json_missing_id,
+                'status' => 'failed',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The ENDORSEMENT ID column is either partially or entirely empty.';
+           
         }
 
-        // if($empty_emp_tpa_uh_ids != $count){
 
-        //     return 3;
-        // }
+        if ($error_count > 0) {
 
-        if ($empty_id_count == 0) {
+            $data = [
 
-            return 3;
-        }
+                'count' => $endorsement_data_count,
+                'error_data' => $json_errors,
+                'status' => 'failed',
+            ];
 
-        // dd($count, $missing_id, $missing_id_count, $empty_id_count, $data, $empty_emp_tpa_uh_ids);
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            return 'Correction Validation Failed';
 
-        $is_moved = $file->move(WRITEPATH . 'uploads/import_excel');
-        $filename = $file->getName();
+        } else {
 
-        $this->myLogger->logme('error', 'SI_Enhancement Import file name : {data}', ['data' => $filename]);
-        $random_number_count = 4;
-        $batch_code = generate_random_string($random_number_count);
-        $this->myLogger->logme('error', 'SI_Enhancement Import BATCH CODE : {data}', ['data' => $batch_code]);
+            $data = [
+                'count' => $endorsement_data_count,
+                'status' => $status,
+                'error_data' => $partially_updated_data ?? null,
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
 
 
-        $import_data['batch_code'] = $batch_code;
-        $import_data['created_by'] = get_session_userid();
-        $import_data['file_name'] = $filename;
-        $import_data['amount'] = $rounded_totals;
-        $insert = $this->batchFileModel->insert($import_data);
-        $batch_file_batch_code = $this->batchFileModel->where('id', $insert)->first();
+            foreach ($batch_list_id as $key => $value) {
 
-        $batch_code_for_batch_list['batch_code'] = $batch_file_batch_code['batch_code'];
-        $batch_code_for_batch_list['created_by'] = get_session_userid();
-
-        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $batch_file_batch_code['file_name'];
-
-        if (!file_exists($file_name_with_path)) {
-            return 2;
-        }
-
-        $data = read_excel_file_to_array($file_name_with_path);
-        unset($data[0]);
-        $count = count($data);
-        $this->batchFileModel->where('id', $insert)->set('count', $count)->update();
-        $employeeIds = [];
-        foreach ($data as $key => $value) {
-
-            if (!empty($value) && isset($value[19])) {
-
-                $emp_name = $value[1];
-                $emp_code = $value[2];
-                // echo $emp_name .'-'. $emp_code; die;
-                $endorsement_id = $value[19] != null ? $value[19] : '';
-
-                $updateData = [
-                    'emp_code' => $emp_code,
-                    'client_id' => $client_id,
-                    'client_policy_id' => $client_policy_id,
-                    'emp_name' => $emp_name,
-                    'endorsement_id' => $endorsement_id,
+                $data = [
+                    'emp_policy_id' => $value,
+                    'batch_code' => $batch_code,
+                    'created_by' => $user_id,
                 ];
 
-                $this->employeePolicyModel->updateEndoresmentIdForSIEnhancement($updateData);
-
-                $queryData = $this->employeePolicyModel
-                    ->select('employee_polices.*')
-                    ->join('employees', 'employee_polices.employee_id = employees.id')
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('employees.name', $emp_name)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('employee_polices.is_active', 1)
-                    ->first();
-
-                $queryData['is_active'] = 0;
-                $this->employeePolicyModel->save($queryData);
-
-                unset($queryData['id']);
-                unset($queryData['created_by']);
-                unset($queryData['created_at']);
-                unset($queryData['updated_by']);
-                unset($queryData['updated_at']);
-                unset($queryData['is_active']);
-
-                $queryData['basic_cover_si'] = $value[8];
-                $queryData['premium'] = $value[14];
-                $queryData['si_enhancement_date'] = $value[10];
-                $queryData['rata_premimum'] = $value[16];
-                $queryData['gst'] = $value[17];
-                $queryData['created_by'] = get_session_userid();
-
-                //new insert
-                $this->employeePolicyModel->save($queryData);
-
-                $val = $this->employeePolicyModel
-                    ->select('employee_polices.id')
-                    ->join('employees', 'employees.id = employee_polices.employee_id')
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('employees.name', $emp_name)
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('employee_polices.is_active', 1)
-                    ->first();
-
-                if ($val !== null) {
-                    $id = $val['id'];
-                    $batch_code_for_batch_list['emp_policy_id'] = $id;
-                    $this->batchListModel->insert($batch_code_for_batch_list);
-                    array_push($employeeIds, $id);
-                }
-            } else {
-
-                return 0;
+                $insert = $this->batchListModel->insert($data);
             }
+
+
+            $job_details  = new Jobs();                             
+            $r = Jobs::addJob(['job_name' => 'importCorrectionUpdateEndorsementID','payload' => ['file_id' => $file_id]]);
+
+            // $this->importCorrectionUpdateEndorsementID(['file_id' => $file_id]);
+
+            return 'Correction Validation Success';
         }
-
-        $policy_name = $this->getPolicyNameUsingClientPolicyId($client_policy_id);
-        $depositeData = [
-            'employeeIds' => $employeeIds,
-            'client_id' => $client_id,
-            'client_policy_id' => $client_policy_id,
-            'client_branch_id' => $client_branch_id,
-            'count' => $count,
-            'event' => $import_data['event_type'],
-            'policy_name' => $policy_name['policy_name'],
-        ];
-
-        // dd($depositeData);
-        $this->cashDepositCalculationForSIEnhancement($depositeData);
-
-        return 1;
     }
 
 
-    public function importExcelDataForDeletion($import_data)
+    public function importCorrectionUpdateEndorsementID($params){
+
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID called');
+
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->find($file_id);
+        if (!$file) {
+
+            $data = [
+                'status' => 'failed-4',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID the Physical file not found - file id : {data}', ['data' => $file_id]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'importCorrectionUpdateEndorsementID the Physical file not found'; // Return error code if file not found
+        }
+
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $insurer_or_tpa = $file['insurer_or_tpa'];
+        $status = $file['status'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
+
+
+        $status_val = 'success';
+        if ($status == 'in-progress-partially') {
+
+            $status_val = 'partially success';
+        }
+
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID  file name : {data}', ['data'=> $file['file_name']]);
+
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]); 
+
+        $emp_ids = [];
+        $emp_details = [];
+        $endorsement_id = [];
+        $endorsement_details = [];
+
+        $emp_count = count($excel_data);
+        $db = \Config\Database::connect();
+
+
+        foreach ($excel_data as $key => $value) {
+
+            $emp_code = $value[0];
+            $old_value = $value[7];
+            $endorsement_id[] = $value[10];
+            $uhid = $value[1];
+
+
+            $result =  $this->empEndorsementModel
+            ->select('emp_endorsement.*, employees.id as emp_id')
+            ->join('employees', 'employees.id = emp_endorsement.pk')
+            ->join('employee_polices', 'employee_polices.employee_id = employees.id')
+            ->where('employees.emp_code', $emp_code)
+            ->where('employees.client_id', $client_id)
+            ->where('employees.client_branch_id', $client_branch_id)
+            ->where('employee_polices.client_policy_id', $client_policy_id)
+            ->where('employee_polices.uhid', $uhid)
+            ->where('emp_endorsement.old_value', $old_value)
+            
+            ->where('employee_polices.is_active', 1)
+            ->where('employee_polices.status', 'active')
+            ->where('employees.is_active', 1)
+            ->where('employees.emp_status', 'active')
+            ->first();
+
+            if (isset($result['id']) && $result['id'] !== null) {
+
+                // return $result;
+                $emp_details[] = array('id' => $result['emp_id'], 'group_key' => $result['group_key'], $result['field_name'] => $value[8]);
+                $endorsement_details[] = array('group_key' => $result['group_key'], 'id' => $result['id'], 'endorsement_id' => $value[10], 'status' => 'complete');
+            }
+
+        }
+
+        // return [$emp_details, $endorsement_details];
+
+       $this->empEndorsementModel->updateBatch($endorsement_details, 'group_key');
+       $this->employeeModel->updateBatch($emp_details);
+
+        // Update batch file status and amount
+        $this->batchFileModel->update($file_id, [
+            'count' => $emp_count,
+            'status' =>  $status_val,
+        ]);
+
+
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID  employee count : {data}', ['data'=> $emp_count]);
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID  batch file status : {data}', ['data'=> $status_val]);
+
+
+        $file_data = $this->getDataByFileId($file_id, 'success');
+        $this->setPullNotification($file_data);
+
+
+        return 'Import Correction Updated '. $status_val . '- Updated Count : ' . $emp_count;
+
+    }
+
+
+
+
+    //Endorsement SIEnhancement
+
+    public function importSIEnhancementValidation($params)
+    {
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->where('id', $file_id)->first();
+
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
+
+
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
+
+        if (!file_exists($file_name_with_path)) {
+            return 'The Physical file not found';
+        }
+
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]);
+
+
+            $db = \Config\Database::connect();
+
+            // Raw SQL query
+            $sql = "
+                SELECT 
+                    a.id as endorsement_primarykey,
+                    a.group_key,
+                    employee_polices.id AS primaryKey,
+                    employees.id AS emp_primary,
+                    employees.name AS emp_name,
+                    employees.emp_code AS emp_code,
+                    employees.dob AS emp_dob,
+                    employees.gender AS emp_gender,
+                    employees.relationship_code AS emp_relationship_code,
+                    'Has Define' AS emp_type,
+                    employee_polices.uhid AS risk_id,
+                    employee_polices.pre_existing_alignments,
+                    employee_polices.policy_end_date,
+                    employee_polices.basic_cover_si as old_basic_cover_si,
+                    employee_polices.rata_premimum as old_si_premium,
+                    sidata.new_basic_cover_si,
+                    sidata.new_si_premium,
+                    sidata.date_of_coverage,
+                    DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1 AS no_of_days,
+                    sidata.new_si_premium - employee_polices.rata_premimum AS difference_premium,
+                    ROUND((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365, 2) AS pro_rata_premimum,
+                    ROUND(((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) * 0.18, 2) AS gst,
+                    ((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) + ROUND(((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) * 0.18, 2) AS total
+                FROM 
+                    emp_endorsement a
+                LEFT JOIN 
+                    employees ON employees.emp_code = a.emp_code
+                LEFT JOIN 
+                    employee_polices ON employees.id = employee_polices.employee_id 
+                LEFT JOIN (
+                    SELECT 
+                        aa.emp_code, 
+                        aa.new_value as new_basic_cover_si, 
+                        bb.new_value as new_si_premium, 
+                        cc.new_value as date_of_coverage 
+                    FROM (
+                        SELECT  
+                            a1.emp_code, 
+                            a1.field_name, 
+                            a1.new_value 
+                        FROM 
+                            emp_endorsement as a1 
+                        WHERE 
+                            a1.field_name = 'basic_cover_si'
+                    ) aa 
+                    LEFT JOIN (
+                        SELECT  
+                            b1.emp_code, 
+                            b1.field_name, 
+                            b1.new_value 
+                        FROM 
+                            emp_endorsement as b1 
+                        WHERE 
+                            b1.field_name = 'premium'
+                    ) bb ON aa.emp_code = bb.emp_code 
+                    LEFT JOIN (
+                        SELECT  
+                            c1.emp_code, 
+                            c1.field_name, 
+                            c1.new_value 
+                        FROM 
+                            emp_endorsement as c1  
+                        WHERE 
+                            c1.field_name = 'si_enhancement_date'
+                    ) cc ON aa.emp_code = cc.emp_code
+                ) as sidata ON a.emp_code = sidata.emp_code 
+                WHERE 
+                    employee_polices.client_policy_id = '$client_policy_id'
+                    AND employees.client_branch_id = '$client_branch_id'
+                    AND employee_polices.is_active = '1'
+                    AND (a.endorsement_id IS NULL OR a.endorsement_id = '')   
+                    AND a.actions = 'si'
+                GROUP BY group_key
+            ";
+
+            // Execute the query
+            $query = $db->query($sql);
+
+            // Fetch the results
+            $endorsement_data = $query->getResultArray();
+
+
+
+        // dd($endorsement_data, $excel_data);
+
+
+        if ($endorsement_data == null || empty($endorsement_data)) {
+
+            $data = [
+                'status' => 'failed-1',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'SI Enhancement_File Validation --    ENDORSEMENT ID already updated or the uploadedfile is not correct');
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The list of employees provided has already been updated with the ENDORSEMENT ID, or this is not the correct file';
+        }
+
+        $excel_data_count = count($excel_data);
+        $endorsement_data_count = count($endorsement_data);
+
+        $this->myLogger->logme('error', 'SI Enhancement_File Validation --   Excel file count : {data}', ['data' => $excel_data_count]);
+        $this->myLogger->logme('error', 'SI Enhancement File Validation --   Database count : {data}', ['data' => $endorsement_data_count]);
+
+
+        $difference = $endorsement_data_count - $excel_data_count;
+
+        $status = 'in-progress';
+        if ($excel_data_count < $endorsement_data_count) {
+
+            $status = 'in-progress-partially';
+            $partially_updated_data = 'Expected : ' . $endorsement_data_count . ',  ' . 'Updated : ' . $excel_data_count . ',  ' . 'difference : ' . $difference;
+            $this->myLogger->logme('error', 'SI Enhancement File Validation --    excel file count partially : {data}', ['data' => $partially_updated_data]);
+        }
+
+
+
+        if ($endorsement_data_count < $excel_data_count) {
+
+            $data = [
+                'status' => 'failed-3',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'SI_Enhancement_FileValidation excel file count ( {excel} ) exceeds db count ( {db} )', ['db' => $endorsement_data_count, 'excel' => $excel_data_count]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The Excel record count exceeds the DB record count. excel file count : ' .  $excel_data_count . 'db count : ' .  $endorsement_data_count;
+        }
+
+
+        $errors = []; // Initialize an array to store errors
+        $missing_id = [];
+        $batch_list_id = [];
+
+        foreach ($endorsement_data as $key => $endorsement_value) {
+
+            $key = $key + 1;
+
+            if (!isset($excel_data[$key])) {
+                break;
+            }
+
+
+            if ($excel_data[$key][19] === null) {
+                $missing_id[$key][] = [
+                    'row' => $key,
+                    'column' => 19,
+                ];
+            }
+
+
+            if ($endorsement_value['emp_name'] != $excel_data[$key][1]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 1,
+                    'db_data' => $endorsement_value['emp_name'],
+                    'excel_data' => $excel_data[$key][1]
+                ];
+            }
+
+            if ($endorsement_value['emp_code'] != $excel_data[$key][2]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 2,
+                    'db_data' => $endorsement_value['emp_code'],
+                    'excel_data' => $excel_data[$key][2]
+                ];
+            }
+
+            if ($endorsement_value['emp_relationship_code'] != $excel_data[$key][4]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 4,
+                    'db_data' => $endorsement_value['emp_relationship_code'],
+                    'excel_data' => $excel_data[$key][4]
+                ];
+            }
+
+            if ($endorsement_value['emp_dob'] != $excel_data[$key][5]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 5,
+                    'db_data' => $endorsement_value['emp_dob'],
+                    'excel_data' => $excel_data[$key][5]
+                ];
+            }
+
+            if ($endorsement_value['emp_gender'] != $excel_data[$key][6]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 6,
+                    'db_data' => $endorsement_value['emp_gender'],
+                    'excel_data' => $excel_data[$key][6]
+                ];
+            }
+
+
+            if ($endorsement_value['pre_existing_alignments'] != $excel_data[$key][7]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 7,
+                    'db_data' => $endorsement_value['pre_existing_alignments'],
+                    'excel_data' => $excel_data[$key][7]
+                ];
+            }
+
+            if ($endorsement_value['new_basic_cover_si'] != $excel_data[$key][8]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 8,
+                    'db_data' => $endorsement_value['new_basic_cover_si'],
+                    'excel_data' => $excel_data[$key][8]
+                ];
+            }
+
+            if ($endorsement_value['old_basic_cover_si'] != $excel_data[$key][9]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 9,
+                    'db_data' => $endorsement_value['old_basic_cover_si'],
+                    'excel_data' => $excel_data[$key][9]
+                ];
+            }
+
+
+
+            if ($endorsement_value['date_of_coverage'] != $excel_data[$key][10]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 10,
+                    'db_data' => $endorsement_value['date_of_coverage'],
+                    'excel_data' => $excel_data[$key][10]
+                ];
+            }
+
+            if ($endorsement_value['policy_end_date'] != $excel_data[$key][11]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 11,
+                    'db_data' => $endorsement_value['policy_end_date'],
+                    'excel_data' => $excel_data[$key][11]
+                ];
+            }
+
+            if ($endorsement_value['no_of_days'] != $excel_data[$key][12]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 12,
+                    'db_data' => $endorsement_value['no_of_days'],
+                    'excel_data' => $excel_data[$key][12]
+                ];
+            }
+
+            if ($endorsement_value['old_si_premium'] != $excel_data[$key][13]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 13,
+                    'db_data' => $endorsement_value['old_si_premium'],
+                    'excel_data' => $excel_data[$key][13]
+                ];
+            }
+
+            if ($endorsement_value['new_si_premium'] != $excel_data[$key][14]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 14,
+                    'db_data' => $endorsement_value['new_si_premium'],
+                    'excel_data' => $excel_data[$key][14]
+                ];
+            }
+
+            if ($endorsement_value['difference_premium'] != $excel_data[$key][15]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 15,
+                    'db_data' => $endorsement_value['difference_premium'],
+                    'excel_data' => $excel_data[$key][15]
+                ];
+            }
+
+            if ($endorsement_value['pro_rata_premimum'] != $excel_data[$key][16]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 16,
+                    'db_data' => $endorsement_value['pro_rata_premimum'],
+                    'excel_data' => $excel_data[$key][16]
+                ];
+            }
+
+            if ($endorsement_value['gst'] != $excel_data[$key][17]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 17,
+                    'db_data' => $endorsement_value['gst'],
+                    'excel_data' => $excel_data[$key][17]
+                ];
+            }  
+            
+            $batch_list_id[] = $endorsement_value['primaryKey'];
+        }
+
+
+        $error_count = count($errors);
+        $json_errors = json_encode($errors);
+
+
+        $missing_id_count = count($missing_id);
+        $json_missing_id = json_encode($missing_id);
+
+        // dd($error_count, $missing_id_count, $json_errors, $json_missing_id, $batch_list_id);
+
+
+        if ($missing_id_count > 0) {
+
+            $data = [
+
+                'count' => $endorsement_data_count,
+                'error_data' => $json_missing_id,
+                'status' => 'failed',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The ENDORSEMENT ID column is either partially or entirely empty.';
+        }
+
+
+        if ($error_count > 0) {
+
+            $data = [
+
+                'count' => $endorsement_data_count,
+                'error_data' => $json_errors,
+                'status' => 'failed',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            return 'SI ENHANCEMENT File Validation Failed';
+        } else {
+
+            $data = [
+                'count' => $endorsement_data_count,
+                'status' => $status,
+                'error_data' => $partially_updated_data ?? null,
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+
+            foreach ($batch_list_id as $key => $value) {
+
+                $data = [
+                    'emp_policy_id' => $value,
+                    'batch_code' => $batch_code,
+                    'created_by' => $user_id,
+                ];
+
+                $insert = $this->batchListModel->insert($data);
+            }
+
+
+            $job_details  = new Jobs();
+            $r = Jobs::addJob(['job_name' => 'importSIEnhancementUpdateEndorsementID', 'payload' => ['file_id' => $file_id]]);
+
+            // $this->importSIEnhancementUpdateEndorsementID(['file_id' => $file_id]);
+            return 'SI Enhancement_File Validation --    Success';
+        }
+    }
+
+
+    public function importSIEnhancementUpdateEndorsementID($params)
     {
 
-        $client_id = $import_data['client_id'];
-        $client_policy_id = $import_data['client_policy_id'];
-        $client_branch_id = $import_data['client_branch_id'];
-        $file = $import_data['file'];
+        $this->myLogger->logme('error', 'SI Enhancement Update Endorsement ID --   Function called');
+
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->find($file_id);
+        if (!$file) {
+
+            $data = [
+                'status' => 'failed-4',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'SI Enhancement Update Endorsement ID --     The Physical file not found --   File id : {data}', ['data' => $file_id]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'SI Enhancement Update Endorsement ID --     The Physical file not found'; // Return error code if file not found
+        }
+
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $status = $file['status'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
 
 
-        $data = $this->readExcelToArray($file);
-        unset($data[0]);
-        array_pop($data);
-        $count = count($data);
+        $status_val = 'success';
+        if ($status == 'in-progress-partially') {
 
+            $status_val = 'partially success';
+        }
 
-        $missing_id = [];
-        $empty_emp_tpa_uh_ids = [];
+        $this->myLogger->logme('error', 'SI Enhancement Update Endorsement ID --      file name : {data}', ['data' => $file['file_name']]);
+
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]);
+
+        $emp_count = count($excel_data); //excel file count
+
+        $emp_policy_ids = [];
+        $employeeIds = [];
+        $emp_details = [];
+        $endorsement_id = [];
+        $endorsement_details = [];
         $totals = 0;
-        foreach ($data as $key => $value) {
 
-            try {
+        foreach ($excel_data as $key => $value) {
 
-                if ($value[15] === null) {
-                    $missing_id[] = $key + 1;
-                }
+            $emp_name = $value[1];
+            $emp_code = $value[2];
+            $endorsement_id[] = $value[19];
+            $totals += $value[18];
 
-                $totals += $value[13];
 
-                $emp_name = $value[2]; //employee name
-                $emp_code = $value[1]; //employee code
-                $date_of_exit = $value[7]; // date of releving
-                $endorsement_id = $value[15] != null ? $value[15] : ''; //endorsement id
+            $result =  $this->empEndorsementModel
 
-                $db = \Config\Database::connect();
+                ->select('emp_endorsement.*, employees.id as emp_id, employee_polices.id as emp_policy_id')
+                ->join('employee_polices', 'employee_polices.id = emp_endorsement.pk')
+                ->join('employees', 'employees.emp_code = emp_endorsement.emp_code')
+                ->where('employees.emp_code', $emp_code)
+                ->where('employees.name', $emp_name)
+                ->where('employees.client_id', $client_id)
+                ->where('employees.client_branch_id', $client_branch_id)
+                ->where('emp_endorsement.actions', 'si')
+                ->where('employee_polices.client_policy_id', $client_policy_id)
+                ->where('employee_polices.is_active', 1)
+                ->where('employee_polices.status', 'active')
+                ->where('employees.is_active', 1)
+                ->where('employees.emp_status', 'active')
+                ->where('(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = "")')
+                ->groupBy('emp_endorsement.group_key')
+                ->first();
 
-                // Execute the query
-                $query = $db->table('emp_endorsement')
-                    ->select('emp_endorsement.id')
-                    ->join('employee_polices', 'employee_polices.id = emp_endorsement.pk')
-                    ->join('employees', 'employees.emp_code = emp_endorsement.emp_code')
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('employees.name', $emp_name)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('emp_endorsement.actions', 'd')
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = "")')
-                    ->groupBy('emp_endorsement.group_key');
-
-                $result = $query->get()->getRowArray();
-                if (isset($result['id']) && $result['id'] !== null) {
-                    $empty_emp_tpa_uh_ids[] = $result['id'];
-                }
-            } catch (\Exception $e) {
-                // Handle the exception here
-                return 0;
+            if (isset($result['id']) && $result['id'] !== null) {
+                $emp_policy_ids[] = array('id' => $result['emp_policy_id'], 'is_active' => 0);
+                $employeeIds[] = $result['emp_policy_id'];
+                $endorsement_details[] = array('id' => $result['id'], 'group_key' => $result['group_key'], 'endorsement_id' => $value[19], 'status' => 'complete');
             }
+
+            $empData = $this->employeePolicyModel
+                ->select('employee_polices.*')
+                ->join('employees', 'employee_polices.employee_id = employees.id')
+                ->where('employees.emp_code', $emp_code)
+                ->where('employees.name', $emp_name)
+                ->where('employees.client_id', $client_id)
+                ->where('employees.client_branch_id', $client_branch_id)
+                ->where('employee_polices.client_policy_id', $client_policy_id)
+                ->where('employee_polices.is_active', 1)
+                ->where('employee_polices.status', 'active')
+                ->where('employees.is_active', 1)
+                ->where('employees.emp_status', 'active')
+                ->first();
+
+                unset($empData['id'], $empData['created_by'], $empData['created_at'], $empData['updated_by'], $empData['updated_at'], $empData['is_active']);
+                
+                $empData['basic_cover_si'] = $value[8];
+                $empData['premium'] = $value[14];
+                $empData['si_enhancement_date'] = $value[10];
+                $empData['rata_premimum'] = $value[16];
+                $empData['gst'] = $value[17];
+                $empData['created_by'] =  $user_id;
+
+                $emp_details[] = $empData;
         }
 
         $rounded_totals = round($totals, 2);
-        $missing_id_count = count($missing_id);
-        $empty_id_count = count($empty_emp_tpa_uh_ids);
 
-        // if($missing_id_count != $count){
+        // dd($emp_policy_ids, $emp_details, $endorsement_details);
 
-        //     return 2;
+        $this->employeePolicyModel->updateBatch($emp_policy_ids, 'id');
+
+        $db = \Config\Database::connect();
+        $db->transStart();
+        
+        $this->employeePolicyModel->insertBatch($emp_details);
+        
+        $insertedIds = [];
+        $startId = $db->insertID(); // Get the first inserted ID
+        
+        for ($i = 0; $i < count($emp_details); $i++) {
+            $insertedIds[] = $startId + $i;
+        }
+        
+        $db->transComplete();
+        
+        // if ($db->transStatus() === FALSE) {
+        //     // Handle the error, rollback, etc.
+        // } else {
+        //     // Transaction successful
+        //     print_r($insertedIds); // This will print the array of inserted IDs
         // }
+        
+        $this->employeePolicyModel->bulkUpdateForEndorsement($endorsement_details);
 
-        if ($missing_id_count != 0) {
-
-            return 2;
-        }
-
-        // if($empty_emp_tpa_uh_ids != $count){
-
-        //     return 3;
-        // }
-
-        if ($empty_id_count == 0) {
-
-            return 3;
-        }
-
-        // dd($count,  $missing_id_count, $empty_id_count, $data, $empty_emp_tpa_uh_ids);
-
-        $is_moved = $file->move(WRITEPATH . 'uploads/import_excel');
-        $filename = $file->getName();
-
-        $this->myLogger->logme('error', 'Deletion Import file name : {data}', ['data' => $filename]);
-        $random_number_count = 4;
-        $batch_code = generate_random_string($random_number_count);
-        $this->myLogger->logme('error', 'Deletion Import BATCH CODE : {data}', ['data' => $batch_code]);
+        // Update batch file status and amount
+        $this->batchFileModel->update($file_id, [
+            'count' => $emp_count,
+            'status' =>  $status_val,
+            'amount' =>  $rounded_totals,
+        ]);
 
 
-        $import_data['batch_code'] = $batch_code;
-        $import_data['created_by'] = get_session_userid();
-        $import_data['file_name'] = $filename;
-        $import_data['amount'] = $rounded_totals;
-        $insert = $this->batchFileModel->insert($import_data);
-        $batch_file_batch_code = $this->batchFileModel->where('id', $insert)->first();
-
-        $batch_code_for_batch_list['batch_code'] = $batch_file_batch_code['batch_code'];
-        $batch_code_for_batch_list['created_by'] = get_session_userid();
-
-        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $batch_file_batch_code['file_name'];
-
-        if (!file_exists($file_name_with_path)) {
-            return 2;
-        }
-
-        $data = read_excel_file_to_array($file_name_with_path);
-        unset($data[0]);
-        array_pop($data);
-
-        $count = count($data);
-        $this->batchFileModel->where('id', $insert)->set('count', $count)->update();
-
-        $employeeIds = [];
-        foreach ($data as $key => $value) {
-
-            if (!empty($value) && isset($value[15])) {
-
-                $emp_name = $value[2]; //employee name
-                $emp_code = $value[1]; //employee code
-                $date_of_exit = $value[7]; // date of releving
-
-                // echo $emp_name .'-'. $emp_code .'-'.  $date_of_exit; die;
-                $endorsement_id = $value[15] != null ? $value[15] : ''; //endorsement id
-
-                $val = $this->employeePolicyModel
-                    ->select('employee_polices.id')
-                    ->join('employees', 'employees.id = employee_polices.employee_id')
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('employees.name', $emp_name)
-                    ->where('employees.emp_code', $emp_code)
-                    ->where('employee_polices.is_active', 1)
-                    ->first();
+        $this->myLogger->logme('error', 'SI Enhancement Update Endorsement ID --      Employee count : {data}', ['data' => $emp_count]);
+        $this->myLogger->logme('error', 'SI Enhancement Update Endorsement ID --      Batch File status : {data}', ['data' => $status_val]);
 
 
-                if ($val !== null) {
+        $file_data = $this->getDataByFileId($file_id, 'success');
+        $this->setPullNotification($file_data);
 
-                    $id = $val['id'];
-                    $batch_code_for_batch_list['emp_policy_id'] = $id;
-                    $this->batchListModel->insert($batch_code_for_batch_list);
-                    array_push($employeeIds, $id);
-                }
-
-                // $updateData = [
-                //     'emp_code' =>$emp_code,
-                //     'client_id' =>$client_id,
-                //     'client_policy_id' =>$client_policy_id,
-                //     'emp_name' =>$emp_name,
-                //     'endorsement_id' =>$endorsement_id,
-                // ];
-
-                // $this->employeePolicyModel->updateEndoresmentIdForDeletion($updateData);
-
-                $deletionDataForEmployee = $this->empEndorsementModel
-                    ->select('emp_endorsement.new_value, emp_endorsement.id as ee_id, employees.id')
-                    ->join('employees', 'emp_endorsement.emp_code = employees.emp_code')
-                    ->join('employee_polices', 'employee_polices.employee_id = employees.id')
-                    ->where('emp_endorsement.emp_code', $emp_code)
-                    ->where('employees.client_id', $client_id)
-                    ->where('employees.client_branch_id', $client_branch_id)
-                    ->where('employee_polices.client_policy_id', $client_policy_id)
-                    ->where('emp_endorsement.name', $emp_name)
-                    ->where('emp_endorsement.field_name', 'emp_status')
-                    ->first();
-
-                $deletionDataForEmployee['updated_by'] = get_session_userid();
-                $this->employeeModel->save($deletionDataForEmployee);
-
-                $e_Data = [
-                    'endorsement_id' => $endorsement_id,
-                    'status' => 'complete',
-                ];
-                $group_key = $this->empEndorsementModel->select('group_key')->where('id', $deletionDataForEmployee['ee_id'])->first();
-                $this->empEndorsementModel->where('group_key', $group_key)->set($e_Data)->update();
-
-                $fetchData = [
-                    'emp_code' => $emp_code,
-                    'client_policy_id' => $client_policy_id,
-                    'emp_name' => $emp_name,
-                ];
-
-                $deletionDataForEmployeePolicy = $this->employeePolicyModel->fetchEmpEndorsementData($fetchData);
-                $deletionDataForEmployeePolicy['updated_by'] = get_session_userid();
-                $this->employeePolicyModel->save($deletionDataForEmployeePolicy);
-
-                // $query = $this->employeePolicyModel->getLastQuery();
-                // echo $query . "<br>"; 
-
-            } else {
-
-                return 0;
-            }
-        }
+        //call the cash deposite function
 
         $policy_name = $this->getPolicyNameUsingClientPolicyId($client_policy_id);
-        $depositeData = [
-            'employeeIds' => $employeeIds,
+        $job_details  = new Jobs();                             
+        $r = Jobs::addJob(['job_name' => 'cashDepositCalculationForSIEnhancement','payload' => [
+            'employeeIds' => $insertedIds,
             'client_id' => $client_id,
-            'client_branch_id' => $client_branch_id,
             'client_policy_id' => $client_policy_id,
-            'count' => $count,
-            'event' => $import_data['event_type'],
+            'client_branch_id' => $client_branch_id,
+            'count' => $emp_count,
+            'event' => $file['event_type'],
             'policy_name' => $policy_name['policy_name'],
-        ];
+            'user_id' => $user_id,
+        ]]);
 
-        $this->cashDepositCalculationForDeletion($depositeData);
-        return 1;
+        return 'SI Enhancement Update Endorsement ID --      ' . $status_val . '--   Updated Count : ' . $emp_count;
     }
 
 
 
+    //Endorsement Deletion
+
+    public function importDeletionValidation($params)
+    {
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->where('id', $file_id)->first();
+
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
+
+
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
+
+        if (!file_exists($file_name_with_path)) {
+            return 'The Physical file not found';
+        }
+
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]);
+        array_pop($excel_data);
+
+
+        $db = \Config\Database::connect();
+
+        $sql = "
+            SELECT DISTINCT
+                a.id as endorsement_primarykey,
+                a.group_key,
+                employee_polices.id as primaryKey, 
+                employees.name AS emp_name,
+                employees.emp_code AS emp_code,
+                employees.dob AS emp_dob,
+                employees.gender AS emp_gender,
+                employees.relationship AS emp_relationship,
+                'Has Define' as emp_type,
+                
+                employee_polices.basic_cover_si, 
+                employee_polices.uhid as risk_id, 
+                employee_polices.policy_end_date, 
+                employee_polices.rata_premimum as premium, 
+                
+                
+                deletiondata.empstatus, 
+                deletiondata.changeevent,
+                deletiondata.dateofexit,
+                deletiondata.reasonforexit,
+                deletiondata.status,
+                
+                DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) AS no_of_days,
+                ROUND((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365, 2) AS pro_rata_premium,
+                ROUND(((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365) * 0.18, 2) AS gst,
+                ROUND(((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365) + (((employee_polices.rata_premimum * DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit)) / 365) * 0.18), 2) AS total
+            FROM 
+                emp_endorsement a
+            LEFT JOIN 
+                employees ON a.emp_code = employees.emp_code and a.pk = employees.id 
+            LEFT JOIN 
+                employee_polices ON employees.id = employee_polices.employee_id 
+            
+            LEFT JOIN( 
+                
+                select aa.emp_code, aa.new_value as 'empstatus', bb.new_value as 'changeevent', cc.new_value as 'dateofexit', dd.new_value as 'reasonforexit', ee.new_value as 'status' from
+                
+                ( SELECT  a1.emp_code, a1.field_name, a1.new_value from emp_endorsement as a1 where a1.field_name = 'emp_status') aa 
+                left join 
+                    ( SELECT  b1.emp_code, b1.field_name, b1.new_value from emp_endorsement as b1 where b1.field_name = 'change_event') bb on aa.emp_code = bb.emp_code 
+                left join
+                    ( SELECT  c1.emp_code, c1.field_name, c1.new_value from emp_endorsement as c1  where c1.field_name = 'date_of_exit') cc on aa.emp_code = cc.emp_code
+                left join
+                    ( SELECT  d1.emp_code, d1.field_name, d1.new_value from emp_endorsement as d1  where d1.field_name = 'reason_for_exit') dd on aa.emp_code = dd.emp_code 
+                left JOIN
+                    ( SELECT  e1.emp_code, e1.field_name, e1.new_value from emp_endorsement as e1  where e1.field_name = 'status') ee on aa.emp_code = ee.emp_code
+                
+                ) as deletiondata on a.emp_code = deletiondata.emp_code 
+            
+            WHERE employee_polices.client_policy_id = '$client_policy_id'
+                AND employees.client_branch_id = '$client_branch_id'
+                AND a.actions = 'd'
+                AND employee_polices.is_active = 1
+                AND employee_polices.status = 'active'
+                AND employees.is_active = 1
+                AND employees.emp_status = 'active'
+                AND (a.endorsement_id IS NULL OR a.endorsement_id = '') 
+            group by group_key
+        ";
+
+        $query = $db->query($sql);
+        $endorsement_data = $query->getResultArray();
+
+
+        if ($endorsement_data == null || empty($endorsement_data)) {
+
+            $data = [
+                'status' => 'failed-1',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'Deletion File Validation ENDORSEMENT ID already updated');
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The list of employees provided has already been updated with the ENDORSEMENT ID, or this is not the correct file';
+            $this->myLogger->logme('error', 'Deletion File Validation ENDORSEMENT ID already updated or the uploadedfile is not correct');
+        }
+
+        $excel_data_count = count($excel_data);
+        $endorsement_data_count = count($endorsement_data);
+
+        $this->myLogger->logme('error', 'Deletion File Validation excel file count : {data}', ['data' => $excel_data_count]);
+        $this->myLogger->logme('error', 'Deletion File Validation database count : {data}', ['data' => $endorsement_data_count]);
+
+
+        $difference = $endorsement_data_count - $excel_data_count;
+
+        $status = 'in-progress';
+        if ($excel_data_count < $endorsement_data_count) {
+
+            $status = 'in-progress-partially';
+            $partially_updated_data = 'Expected : ' . $endorsement_data_count . ',  ' . 'Updated : ' . $excel_data_count . ',  ' . 'difference : ' . $difference;
+            $this->myLogger->logme('error', 'Deletion File Validation excel file count partially : {data}', ['data' => $partially_updated_data]);
+        }
+
+
+
+        if ($endorsement_data_count < $excel_data_count) {
+
+            $data = [
+                'status' => 'failed-3',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'Deletion File Validation excel file count ( {excel} ) exceeds db count ( {db} )', ['db' => $endorsement_data_count, 'excel' => $excel_data_count]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The Excel record count exceeds the DB record count. excel file count : ' .  $excel_data_count . '  db count : ' .  $endorsement_data_count;
+        }
+
+
+        $errors = []; // Initialize an array to store errors
+        $missing_id = [];
+        $batch_list_id = [];
+
+        foreach ($endorsement_data as $key => $endorsement_value) {
+
+            $key = $key + 1;
+
+            if (!isset($excel_data[$key])) {
+                break;
+            }
+
+
+            if ($excel_data[$key][15] === null) {
+                $missing_id[$key][] = [
+                    'row' => $key,
+                    'column' => 15,
+                ];
+            }
+
+
+            if ($endorsement_value['emp_name'] != $excel_data[$key][2]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 2,
+                    'db_data' => $endorsement_value['emp_name'],
+                    'excel_data' => $excel_data[$key][2]
+                ];
+            }
+
+            if ($endorsement_value['emp_code'] != $excel_data[$key][1]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 1,
+                    'db_data' => $endorsement_value['emp_code'],
+                    'excel_data' => $excel_data[$key][1]
+                ];
+            }
+
+            if ($endorsement_value['emp_dob'] != $excel_data[$key][3]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 3,
+                    'db_data' => $endorsement_value['emp_dob'],
+                    'excel_data' => $excel_data[$key][3]
+                ];
+            }
+
+            if ($endorsement_value['emp_gender'] != $excel_data[$key][4]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 4,
+                    'db_data' => $endorsement_value['emp_gender'],
+                    'excel_data' => $excel_data[$key][4]
+                ];
+            }
+
+
+            if ($endorsement_value['emp_relationship'] != $excel_data[$key][5]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 5,
+                    'db_data' => $endorsement_value['emp_relationship'],
+                    'excel_data' => $excel_data[$key][5]
+                ];
+            }
+
+            if ($endorsement_value['basic_cover_si'] != $excel_data[$key][6]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 6,
+                    'db_data' => $endorsement_value['basic_cover_si'],
+                    'excel_data' => $excel_data[$key][6]
+                ];
+            }
+
+            if ($endorsement_value['dateofexit'] != $excel_data[$key][7]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 7,
+                    'db_data' => $endorsement_value['dateofexit'],
+                    'excel_data' => $excel_data[$key][7]
+                ];
+            }
+
+            if ($endorsement_value['policy_end_date'] != $excel_data[$key][8]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 8,
+                    'db_data' => $endorsement_value['policy_end_date'],
+                    'excel_data' => $excel_data[$key][8]
+                ];
+            }
+
+            if ($endorsement_value['no_of_days'] != $excel_data[$key][9]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 9,
+                    'db_data' => $endorsement_value['no_of_days'],
+                    'excel_data' => $excel_data[$key][9]
+                ];
+            }
+
+
+
+            if ($endorsement_value['premium'] != $excel_data[$key][10]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 10,
+                    'db_data' => $endorsement_value['premium'],
+                    'excel_data' => $excel_data[$key][10]
+                ];
+            }
+
+            if ($endorsement_value['pro_rata_premium'] != $excel_data[$key][11]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 11,
+                    'db_data' => $endorsement_value['pro_rata_premium'],
+                    'excel_data' => $excel_data[$key][11]
+                ];
+            }
+
+            if ($endorsement_value['gst'] != $excel_data[$key][12]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 12,
+                    'db_data' => $endorsement_value['gst'],
+                    'excel_data' => $excel_data[$key][12]
+                ];
+            }
+
+            $batch_list_id[] = array('emp_policy_id' =>$endorsement_value['primaryKey'], 'batch_code' => $batch_code, 'created_by' => $user_id);
+        }
+
+
+        $error_count = count($errors);
+        $json_errors = json_encode($errors);
+
+
+        $missing_id_count = count($missing_id);
+        $json_missing_id = json_encode($missing_id);
+
+        // dd($error_count, $missing_id_count, $json_errors, $json_missing_id, $batch_list_id);
+
+        if ($missing_id_count > 0) {
+
+            $data = [
+
+                'count' => $endorsement_data_count,
+                'error_data' => $json_missing_id,
+                'status' => 'failed',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The ENDORSEMENT ID column is either partially or entirely empty.';
+        }
+
+
+        if ($error_count > 0) {
+
+            $data = [
+                'count' => $endorsement_data_count,
+                'error_data' => $json_errors,
+                'status' => 'failed',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'Deletion File Validation Failed';
+
+        } else {
+
+            $data = [
+                'count' => $endorsement_data_count,
+                'status' => $status,
+                'error_data' => $partially_updated_data ?? null,
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $insert = $this->batchListModel->insertBatch($batch_list_id);
+
+
+            $job_details  = new Jobs();
+            $r = Jobs::addJob(['job_name' => 'importDeletionUpdateEndorsementID', 'payload' => ['file_id' => $file_id]]);
+
+            // $this->importDeletionUpdateEndorsementID(['file_id' => $file_id]);
+
+            return 'Deletion File Validation ENDORSEMENT ID validated the file Successfully';
+        }
+
+    }
+
+
+    public function importDeletionUpdateEndorsementID($params)
+    {
+
+        $this->myLogger->logme('error', 'Deletion Update Endorsement ID --   Function called');
+
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->find($file_id);
+        if (!$file) {
+
+            $data = [
+                'status' => 'failed-4',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'Deletion Update Endorsement ID --     The Physical file not found --   File id : {data}', ['data' => $file_id]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'Deletion Update Endorsement ID --     The Physical file not found'; // Return error code if file not found
+        }
+
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $status = $file['status'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
+
+
+        $status_val = 'success';
+        if ($status == 'in-progress-partially') {
+
+            $status_val = 'partially success';
+        }
+
+        $this->myLogger->logme('error', 'Deletion Update Endorsement ID --      file name : {data}', ['data' => $file['file_name']]);
+
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]);
+        array_pop($excel_data);
+
+        $emp_count = count($excel_data); //excel file count
+
+        $employees_table_data = [];
+        $emp_endorsement_table_data = [];
+        $employee_policy_table_data = [];
+        $employee_policy_table_primaryKey = [];
+
+        $totals = 0;
+
+        
+        foreach ($excel_data as $key => $value) {
+
+            $emp_name = $value[2]; //employee name
+            $emp_code = $value[1]; //employee code
+            $totals = $totals + $value[13];
+
+
+            $fetch_data = [
+                'client_policy_id' => $client_policy_id,
+                'client_branch_id' => $client_branch_id,
+                'emp_name' => $emp_name,
+                'emp_code' => $emp_code
+            ];
+            $result = $this->employeePolicyModel->fetchEmpEndorsementData($fetch_data);
+
+            // dd($result['emp_endorsement_primarykey']);
+
+            if (isset($result['emp_endorsement_primarykey']) && $result['emp_endorsement_primarykey'] !== null) {
+
+                $employee_policy_table_primaryKey[] = $result['emp_policy_primarykey']; //for cash deposite
+                $employee_policy_table_data[] = array('id' => $result['emp_policy_primarykey'], 'date_of_exit' => $result['date_of_exit'], 'reason_for_exit' => $result['reason_for_exit'], 'status' => $result['status'], 'is_active' => 0);
+                $employees_table_data[] = array('id' => $result['employees_primarykey'], 'emp_status' => $result['status'], 'is_active' => 0);
+                $emp_endorsement_table_data[] = array('id' => $result['emp_endorsement_primarykey'], 'group_key' => $result['group_key'], 'endorsement_id' => $value[15], 'status' => 'complete');
+            }
+          
+        }
+
+        $rounded_totals = round($totals, 2);
+
+        // dd($employees_table_data, $emp_endorsement_table_data, $employee_policy_table_data, $employee_policy_table_primaryKey, $totals, $emp_count);
+
+
+        // Check if $employees_table_data is null or empty
+        if (empty($employees_table_data)) {
+            return ['error' => true, 'message' => 'Employees table data is empty or null.'];
+        }
+
+        // Check if $employee_policy_table_data is null or empty
+        if (empty($employee_policy_table_data)) {
+            return ['error' => true, 'message' => 'Employee policy table data is empty or null.'];
+        }
+
+        // Check if $emp_endorsement_table_data is null or empty
+        if (empty($emp_endorsement_table_data)) {
+            return ['error' => true, 'message' => 'Employee endorsement table data is empty or null.'];
+        }
+
+        $this->employeeModel->updateBatch($employees_table_data, 'id');
+        $this->employeePolicyModel->updateBatch($employee_policy_table_data, 'id');
+        $this->employeePolicyModel->bulkUpdateForEndorsement($emp_endorsement_table_data);
+
+        // Update batch file status and amount
+        $this->batchFileModel->update($file_id, [
+            'count' => $emp_count,
+            'status' =>  $status_val,
+            'amount' =>  $rounded_totals,
+        ]);
+
+
+        $this->myLogger->logme('error', 'Deletion Update Endorsement ID --      Employee count : {data}', ['data' => $emp_count]);
+        $this->myLogger->logme('error', 'Deletion Update Endorsement ID --      Batch File status : {data}', ['data' => $status_val]);
+
+
+        $file_data = $this->getDataByFileId($file_id, 'success');
+        $this->setPullNotification($file_data);
+
+        //call the cash deposite function
+
+        $policy_name = $this->getPolicyNameUsingClientPolicyId($client_policy_id);
+
+        $job_details  = new Jobs();
+        $r = Jobs::addJob(['job_name' => 'cashDepositCalculationForDeletion', 'payload' => [
+            'employeeIds' => $employee_policy_table_primaryKey,
+            'client_id' => $client_id,
+            'client_policy_id' => $client_policy_id,
+            'client_branch_id' => $client_branch_id,
+            'count' => $emp_count,
+            'event' => $file['event_type'],
+            'policy_name' => $policy_name['policy_name'],
+            'user_id' => $user_id,
+        ]]);
+
+        return 'Deletion Update Endorsement ID --      ' . $status_val . '--   Updated Count : ' . $emp_count;
+    }
+
+
     /**
      * The below functions are Calculates and records cash deposits for employee policies at inception.
      * 
@@ -1795,16 +2631,17 @@ class EmpDataServiceController extends BaseController
 
 
     public function cashDepositCalculationForSIEnhancement($arrayData)
-    {
+    {  
+        // return $arrayData;
+
         if (!empty($arrayData)) {
 
             $amount = $this->employeePolicyModel->query("
-                SELECT
-                    SUM(ROUND((employee_polices.premium * DATEDIFF(employee_polices.policy_end_date, employee_polices.si_enhancement_date)) / 365, 2) +
-                        ROUND(((employee_polices.premium * DATEDIFF(employee_polices.policy_end_date, employee_polices.si_enhancement_date)) / 365) * 0.18, 2)) AS total_sum
+                SELECT SUM(rata_premimum + gst) AS total_sum
                 FROM employee_polices
                 WHERE id IN (" . implode(',', $arrayData['employeeIds']) . ")
-                ")->getRow();
+            ")->getRow();
+
             $insurer_id = $this->clientPolicyModel->where('id', $arrayData['client_policy_id'])->first();
             $description = 'The following amount of ' . $amount->total_sum . ' has been credited for the ' . $arrayData['count'] . ' employees at ' . remove_underscore_capitalize_first_letter($arrayData['event']) . ' to ' . remove_underscore_capitalize_first_letter($arrayData['policy_name']) . '.';
 
@@ -1816,11 +2653,12 @@ class EmpDataServiceController extends BaseController
                 'insurer_id' => $insurer_id['insurer_id'],
                 'description' => $description,
                 'transaction_type' => 'Debit',
-                'updated_by' => get_session_userid(),
+                'updated_by' => $arrayData['user_id'],
                 'is_active' => 1,
             ];
-            $response = DepositHelper::saveDeposit($data, get_session_userid());
-            return true;
+            $response = DepositHelper::saveDeposit($data, $arrayData['user_id']);
+            $msg = "SI Enhancement Cash Deposite Updated Successfully -- " . $description;
+            return [$msg, $response];
             // print_r($response);
             // $query = $this->employeePolicyModel->getLastQuery();
             // echo $query . "<br>"; 
@@ -1839,11 +2677,9 @@ class EmpDataServiceController extends BaseController
             // echo '<pre>';
             // print_r($arrayData); die;
             $amount = $this->employeePolicyModel->query("
-                SELECT
-                    SUM(ROUND((employee_polices.premium * DATEDIFF(employee_polices.policy_end_date, employee_polices.date_of_exit)) / 365, 2) +
-                        ROUND(((employee_polices.premium * DATEDIFF(employee_polices.policy_end_date, employee_polices.date_of_exit)) / 365) * 0.18, 2)) AS total_sum
-                FROM employee_polices
-                WHERE id IN (" . implode(',', $arrayData['employeeIds']) . ")
+                SELECT SUM(rata_premimum + gst) AS total_sum
+                    FROM employee_polices
+                    WHERE id IN (" . implode(',', $arrayData['employeeIds']) . ")
                 ")->getRow();
 
             $insurer_id = $this->clientPolicyModel->where('id', $arrayData['client_policy_id'])->first();
@@ -1857,10 +2693,13 @@ class EmpDataServiceController extends BaseController
                 'insurer_id' => $insurer_id['insurer_id'],
                 'description' => $description,
                 'transaction_type' => 'Credit',
-                'updated_by' => get_session_userid(),
+                'updated_by' => $arrayData['user_id'],
                 'is_active' => 1,
             ];
-            $response = DepositHelper::saveDeposit($data, get_session_userid());
+            $response = DepositHelper::saveDeposit($data, $arrayData['user_id']);
+            $msg = "Deletion Cash Deposite Updated Successfully -- " . $description;
+            return [$msg, $response];
+
             return true;
             // print_r($response);
             // $query = $this->employeePolicyModel->getLastQuery();
@@ -2210,15 +3049,26 @@ class EmpDataServiceController extends BaseController
 
     public function readExcelFileToArray($path)
     {
-
         $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($path);
         $sheet = $spreadsheet->getActiveSheet();
-
+    
         $highestRowAndColumn = $sheet->getHighestRowAndColumn();
         $excel_data = $sheet->rangeToArray('A1:' . $highestRowAndColumn['column'] . $highestRowAndColumn['row']);
-
-        return $excel_data;
+    
+        // Filter out empty or null rows
+        $filtered_data = array_filter($excel_data, function($row) {
+            // Check if all cells in the row are empty or null
+            foreach ($row as $cell) {
+                if (!is_null($cell) && $cell !== '') {
+                    return true;
+                }
+            }
+            return false;
+        });
+    
+        return $filtered_data;
     }
+    
 
 
     public function removeOldExportInfoFromBatchFile($params){
@@ -2242,7 +3092,6 @@ class EmpDataServiceController extends BaseController
 
                 $id = $batch_data['id'];
                 $batch_code = $batch_data['batch_code'];
-
                 $this->batchFileModel->where('id', $id)->delete();
                 $this->batchListModel->where('batch_code', $batch_code)->delete();
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 3e73f9a8..feba609b 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -358,7 +358,7 @@ class EmployeeController extends AdminController
     public function importExport()
     {
 
-        $this->myLogger->logme('error', 'importExport function called');
+        $this->myLogger->logme('error', 'Import Export --  Function called');
         $empDataServiceController = new EmpDataServiceController();
 
         $client_id = $this->request->getPost('client_id');
@@ -370,10 +370,10 @@ class EmployeeController extends AdminController
 
         $client_data = $this->clientModel->where('id', $client_id)->first();
         $policy_name_and_branch_name = $this->clientPolicyModel->select('policies.name, client_branch.branch_code')
-                            ->join('client_branch', 'client_branch.id = client_policy.client_branch_id')
-                            ->join('policies', 'policies.id = client_policy.policy_id')
-                            ->where('client_policy.id', $client_policy_id)
-                            ->first();
+        ->join('client_branch', 'client_branch.id = client_policy.client_branch_id')
+        ->join('policies', 'policies.id = client_policy.policy_id')
+        ->where('client_policy.id', $client_policy_id)
+            ->first();
         $file_name = generate_filename($client_data['short_name'], $event_type, $actions, $insurer_or_tpa, $policy_name_and_branch_name['name'], $policy_name_and_branch_name['branch_code']);
 
         $batch_data = [
@@ -386,20 +386,19 @@ class EmployeeController extends AdminController
             'file_name' => $file_name,
         ];
 
-        //  $event_type = 'si_enhancement';
 
         if ($actions == 'export') {
 
             if ($event_type == 'inception' || $event_type == 'addition' || $event_type == 'dependent_addition') {
 
                 $return = $empDataServiceController->generateExcelForAdditionandInception($batch_data);
-               
-                if($return == 0){
+
+                if ($return == 0) {
 
                     session()->setFlashdata('error', "Insufficient deposit amount.");
                     return redirect()->to(base_url('employee/upload'));
-                } 
-                
+                }
+
                 if (!$return) {
 
                     if ($insurer_or_tpa == 'tpa') {
@@ -409,7 +408,6 @@ class EmployeeController extends AdminController
                         session()->setFlashdata('error', "No data was found for this action. The UHID has already been updated.");
                         return redirect()->to(base_url('employee/upload'));
                     }
-
                 } else {
                     $this->myLogger->logme('error', 'Successfully exported Excel file in {data}.', ['data' => $event_type]);
                 }
@@ -425,6 +423,13 @@ class EmployeeController extends AdminController
             } else if ($event_type == 'si_enhancement') {
 
                 $return = $empDataServiceController->generateExcelForSIEnhancement($batch_data);
+
+                if ($return == 0) {
+
+                    session()->setFlashdata('error', "Insufficient deposit amount.");
+                    return redirect()->to(base_url('employee/upload'));
+                }
+
                 if (!$return) {
                     session()->setFlashdata('error', 'No data found about this action');
                     return redirect()->to(base_url('employee/upload'));
@@ -444,29 +449,25 @@ class EmployeeController extends AdminController
         } else if ($actions == 'import') {
 
             $batch_data['file'] = $this->request->getFile('import_file_data');
-            
+            $file = $this->request->getFile('import_file_data');
+
+            $is_moved = $file->move(WRITEPATH . 'uploads/import_excel');
+            $filename = $file->getName();
+            $this->myLogger->logme('error', 'Inception Import file name : {data}', ['data' => $filename]);
+
+            $random_number_count = 4;
+            $batch_data['batch_code'] = generate_random_string($random_number_count);
+            $batch_data['created_by'] = get_session_userid();
+            $batch_data['status'] = 'pending';
+            $batch_data['file_name'] = $filename;
 
             if ($event_type == 'inception' || $event_type == 'addition' || $event_type == 'dependent_addition') {
 
-
-                $file = $this->request->getFile('import_file_data');
-
-                $is_moved = $file->move(WRITEPATH . 'uploads/import_excel');
-                $filename = $file->getName();
-                $this->myLogger->logme('error', 'Inception Import file name : {data}', ['data' => $filename]);
-        
-        
-                $random_number_count = 4;
-                $batch_data['batch_code'] = generate_random_string($random_number_count);
-                $batch_data['created_by'] = get_session_userid();
-                $batch_data['status'] = 'pending';
-                $batch_data['file_name'] = $filename;
-        
                 $file_id = $this->batchFileModel->insert($batch_data);
 
-                $job_details  = new Jobs();                             
-                $r = Jobs::addJob(['job_name' => 'importInceptionFileValidation','payload' => ['file_id' => $file_id]]);
-        
+                $job_details  = new Jobs();
+                $r = Jobs::addJob(['job_name' => 'importInceptionFileValidation', 'payload' => ['file_id' => $file_id]]);
+
                 $return = 1;
 
                 // $return = $empDataServiceController->importInceptionFileValidation(['file_id' => $file_id]);
@@ -474,71 +475,64 @@ class EmployeeController extends AdminController
                 if ($return == 1) {
                     session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 2) {
-                    session()->setFlashdata('error', 'The TPA ID column is either partially or entirely empty.');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 0) {
-                    session()->setFlashdata('error', 'Please upload the correct file.');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 3) {
-                    session()->setFlashdata('error', 'The list of employees provided has already been updated with the TPA ID, or this is not the correct file');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 4) {
-                    session()->setFlashdata('error', 'The UHID column is either partially or entirely empty.');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 5) {
-                    session()->setFlashdata('error', 'The list of employees provided has already been updated with the UHID, or this is not the correct file');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 6) {
-                    session()->setFlashdata('error', 'The Excel record count exceeds the DB record count.');
+                } else {
+                    session()->setFlashdata($return['status'], $return['message']);
                     return redirect()->to(base_url('employee/upload'));
                 }
             } else if ($event_type == 'correction') {
 
-                $return = $empDataServiceController->importExcelDataForCorrection($batch_data);
+                $file_id = $this->batchFileModel->insert($batch_data);
+
+                $job_details  = new Jobs();
+                $r = Jobs::addJob(['job_name' => 'importCorrectionValidation', 'payload' => ['file_id' => $file_id]]);
+
+                $return = 1;
+
+                // $return = $empDataServiceController->importCorrectionValidation(['file_id' => $file_id]);
+
                 if ($return == 1) {
-                    session()->setFlashdata('success', 'Data updated successfully');
+                    session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 2) {
-                    session()->setFlashdata('error', 'The Endorsement ID columns are empty.');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 0) {
-                    session()->setFlashdata('error', 'Please upload the correct file');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 3) {
-                    session()->setFlashdata('error', 'File already uploaded');
+                } else {
+                    session()->setFlashdata('error', $return);
                     return redirect()->to(base_url('employee/upload'));
                 }
             } else if ($event_type == 'si_enhancement') {
 
-                $return = $empDataServiceController->importExcelDataForSIEnhancement($batch_data);
+
+                $file_id = $this->batchFileModel->insert($batch_data);
+
+                $job_details  = new Jobs();
+                $r = Jobs::addJob(['job_name' => 'importSIEnhancementValidation', 'payload' => ['file_id' => $file_id]]);
+
+                $return = 1;
+
+                // $return = $empDataServiceController->importSIEnhancementValidation(['file_id' => $file_id]);
+
                 if ($return == 1) {
-                    session()->setFlashdata('success', 'Data updated successfully');
+                    session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 2) {
-                    session()->setFlashdata('error', 'The Endorsement ID columns are empty.');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 0) {
-                    session()->setFlashdata('error', 'Please upload the correct file');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 3) {
-                    session()->setFlashdata('error', 'File already uploaded');
+                } else {
+                    session()->setFlashdata('error', $return);
                     return redirect()->to(base_url('employee/upload'));
                 }
             } else if ($event_type == 'deletion') {
 
-                $return = $empDataServiceController->importExcelDataForDeletion($batch_data);
+                $file_id = $this->batchFileModel->insert($batch_data);
+
+                $job_details  = new Jobs();
+                $r = Jobs::addJob(['job_name' => 'importDeletionValidation', 'payload' => ['file_id' => $file_id]]);
+
+                $return = 1;
+
+                // $return = $empDataServiceController->importDeletionValidation(['file_id' => $file_id]);
+
+
                 if ($return == 1) {
-                    session()->setFlashdata('success', 'Data updated successfully');
+                    session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 2) {
-                    session()->setFlashdata('error', 'The Endorsement ID columns are empty.');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 0) {
-                    session()->setFlashdata('error', 'Please upload the correct file');
-                    return redirect()->to(base_url('employee/upload'));
-                } else if ($return == 3) {
-                    session()->setFlashdata('error', 'File already uploaded');
+                } else {
+                    session()->setFlashdata('error', $return);
                     return redirect()->to(base_url('employee/upload'));
                 }
             }
@@ -707,6 +701,9 @@ class EmployeeController extends AdminController
 
     public function viewUploadedEmployeeList()
     {
+
+        $empDataServiceController = new EmpDataServiceController();
+
         $file_id = $this->request->getGet('file_id');
         // $emp_data['employees'] = $this->employeePolicyModel->getViewEmpSuccessList($file_id);
         // $html = view('view_file_upload_emp_list', $emp_data);
@@ -718,20 +715,21 @@ class EmployeeController extends AdminController
             ->join('clients c', 'files.client_id = c.id and files.client_id = cp.client_id', 'left')
             ->where('files.id', $file_id)->first();
 
+            // dd($file_name);
+
         try {
 
             $filePath = WRITEPATH . '/uploads/excel/' . $file_name['file_name'];
 
             if (file_exists($filePath)) {
-                $spreadsheet = \PhpOffice\PhpSpreadsheet\IOFactory::load($filePath);
-                $sheet = $spreadsheet->getActiveSheet();
-
-                $highestRowAndColumn = $sheet->getHighestRowAndColumn();
-                $excel_data = $sheet->rangeToArray('A1:' . $highestRowAndColumn['column'] . $highestRowAndColumn['row']);
-                // dd($excel_data);
+                
+                $excel_data = $empDataServiceController->readExcelFileToArray($filePath);
                 $emp_data['thead'] = $excel_data[0];
                 unset($excel_data[0]);
                 $emp_data['tbody'] = $excel_data;
+                $emp_data['count'] = count($excel_data);
+
+                // dd($emp_data);
 
                 $html = view('view_file_upload_emp_list', $emp_data);
             } else {
@@ -1210,6 +1208,7 @@ class EmployeeController extends AdminController
         $client_id = $file['client_id'];
         $client_policy_id = $file['client_policy_id'];
         $insurer_or_tpa = $file['insurer_or_tpa'];
+        $event_type = $file['event_type'];
 
         $error_data = json_decode($file['error_data']);
 
@@ -1225,8 +1224,10 @@ class EmployeeController extends AdminController
         $excel_data = $empDataServiceController->readExcelFileToArray($file_name_with_path);
         $excelErrorData['excel_header'] = $excel_data[0];
         unset($excel_data[0]);
-        array_pop($excel_data);
 
+        if($event_type == 'inception' || $event_type == 'deletion'){
+            array_pop($excel_data);
+        }
 
         $finalArray = [];
         foreach ($error_data as $key => $values) {
@@ -1242,15 +1243,22 @@ class EmployeeController extends AdminController
 
                 }else{
 
-                    if ($insurer_or_tpa == 'tpa') {
+                    if($event_type == 'inception'){
 
-                        $error = 'Expected value : TPA ID';
+                        if ($insurer_or_tpa == 'tpa') {
 
-                    } else if ($insurer_or_tpa == 'insurer') {
-        
-                        $error = 'Expected value : UHID';
+                            $error = 'Expected value : TPA ID';
+    
+                        } else if ($insurer_or_tpa == 'insurer') {
+            
+                            $error = 'Expected value : UHID';
+                        }
+
+                    }else{
+                        $error = 'Expected value : ENDORSEMENT ID';
                     }
 
+
                 }
                 $data = ['value' => $excel_data[$row][$column], 'error' => $error,];
                 $excel_data[$row][$column] = $data;
diff --git a/app/Controllers/JobWorker.php b/app/Controllers/JobWorker.php
index 793ddb76..38fd648a 100644
--- a/app/Controllers/JobWorker.php
+++ b/app/Controllers/JobWorker.php
@@ -16,10 +16,22 @@ class JobWorker extends AdminController
 
     private  static $event_class_mapping = [
         'add' => ['type' => 'HC', 'handler' => 'App\\Helpers\\HttpRequestHelper'], 'sub' =>  ['type' => 'CC', 'handler' => 'App\\Controllers\\Jobs\SubJob'], 'fancy_date_time_format' => ['type' => 'HF', 'handler' => 'fancy_date_time_format'], 'addNumber' => ['type' => 'HC', 'handler' => 'App\\Model\\HttpRequestHelper'], 'excelFileFormatValidation' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmployeeServiceController'], 'excelFileDataValidation' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmployeeServiceController'], 'employeesOnboardPreprocess' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmployeeServiceController'], 'employeeDisembark' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmployeeServiceController'], 'employeesSIEnhanceProcess' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmployeeServiceController'], 'employeesCorrectionProcess' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmployeeServiceController'], 'send_email' => ['type' => 'HC', 'handler' => 'App\\Helpers\\MailHelper'], 'bulk_mail' => ['type' => 'HC', 'handler' => 'App\\Helpers\\MailHelper'], 'insertBatchList' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+       
         'importInceptionFileValidation' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
         'importInceptionUpdateTPAandUHID' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
         'cashDepositCalculationForInception' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
         'sendMailForDownloadingECard' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        
+        'importCorrectionValidation' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        'importCorrectionUpdateEndorsementID' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        
+        'cashDepositCalculationForSIEnhancement' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        'importSIEnhancementValidation' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        'importSIEnhancementUpdateEndorsementID' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        
+        'cashDepositCalculationForDeletion' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        'importDeletionValidation' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
+        'importDeletionUpdateEndorsementID' => ['type' => 'CC', 'handler' => 'App\\Controllers\\EmpDataServiceController'],
     ];
     public function __construct()
     {
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index 2e7bcf23..4f9652d9 100644
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -143,7 +143,7 @@ class EmployeePolicyModel extends Model
                 employees.relationship AS emp_relationship,
                 employees.relationship_code AS emp_relationship_code,
                 TIMESTAMPDIFF(YEAR, employees.dob, CURDATE()) AS emp_age,
-                'Has Define' as emp_type,
+                employees.emp_type as emp_type,
 
                 employee_polices.id as primaryKey, 
                 employee_polices.tpa_id, 
@@ -175,8 +175,13 @@ class EmployeePolicyModel extends Model
             ) as batch_data ON employee_polices.id = batch_data.emp_policy_id
             WHERE employee_polices.client_policy_id = '{$client_policy_id}'
                 AND (employee_polices.{$id} IS NULL OR employee_polices.{$id} = '')
+                AND employees.client_branch_id = '{$client_branch_id}'
                 AND employee_polices.is_active = 1
-                AND employees.client_branch_id = '{$client_branch_id}'";
+                AND employee_polices.status = 'active'
+                AND employees.is_active = 1
+                AND employees.emp_status = 'active'
+                
+        ";
 
             // Get the result set
             $query = $this->db->query($sql);
@@ -209,7 +214,7 @@ class EmployeePolicyModel extends Model
                         employees.dob AS emp_dob, 
                         employees.gender AS emp_gender, 
                         employees.client_id AS emp_client_id, 
-                        'Has Define' AS emp_type,
+                        employees.emp_type as emp_type,
                         employee_polices.uhid,
                         employees.relationship_code,
                         batch_data.emp_policy_id, 
@@ -235,12 +240,16 @@ class EmployeePolicyModel extends Model
                         AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}'
                     ) AS batch_data ON emp_endorsement.pk = batch_data.emp_policy_id
 
-                    WHERE batch_data.bf IS NULL
-                    AND batch_data.bl IS NULL
-                    AND employees.client_id = '{$client_id}'
+                    WHERE employees.client_id = '{$client_id}'
                     AND employee_polices.client_policy_id = '{$client_policy_id}'
                     AND employees.client_branch_id = '{$client_branch_id}'
                     AND emp_endorsement.actions = 'c'
+                    AND employee_polices.is_active = 1
+                    AND employee_polices.status = 'active'
+                    AND employees.is_active = 1
+                    AND employees.emp_status = 'active'
+                    AND (employee_polices.tpa_id IS NOT NULL AND employee_polices.tpa_id != '')
+                    AND (employee_polices.uhid IS NOT NULL AND employee_polices.uhid != '')                    
                     AND (emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = '')";
 
                 // Execute the raw query
@@ -265,13 +274,14 @@ class EmployeePolicyModel extends Model
             $query = $this->db->query("
                     SELECT 
                         a.id as endorsement_primarykey,
+                        a.group_key,
                         employee_polices.id AS primaryKey,
                         employees.name AS emp_name,
                         employees.emp_code AS emp_code,
                         employees.dob AS emp_dob,
                         employees.gender AS emp_gender,
                         employees.relationship_code AS emp_relationship_code,
-                        'Has Define' AS emp_type,
+                        employees.emp_type as emp_type,
                         employee_polices.uhid AS risk_id,
                         employee_polices.pre_existing_alignments,
                         employee_polices.policy_end_date,
@@ -283,10 +293,15 @@ class EmployeePolicyModel extends Model
                         sidata.new_basic_cover_si, 
                         sidata.new_si_premium,
                         sidata.date_of_coverage,
+                        
                         DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1 AS no_of_days,
+
                         sidata.new_si_premium - employee_polices.rata_premimum AS difference_premium,
+
                         ROUND((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365, 2) AS pro_rata_premimum,
+
                         ROUND(((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) * 0.18, 2) AS gst,
+
                         ((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) + ROUND(((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) * 0.18, 2) AS total
 
                     FROM 
@@ -346,14 +361,16 @@ class EmployeePolicyModel extends Model
                             AND batch_files.actions = 'export' 
                             AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}'
                     ) AS batch_data ON employee_polices.id = batch_data.emp_policy_id
-                    WHERE 
-                        batch_data.bf IS NULL 
-                        AND batch_data.bl IS NULL 
-                        AND employee_polices.client_policy_id = '{$client_policy_id}'
-                        AND employees.client_branch_id = '{$client_policy_id}'
-                        AND employee_polices.is_active = '1'
+
+                    WHERE employee_polices.client_policy_id = '{$client_policy_id}'
+                        AND employees.client_branch_id = '{$client_branch_id}'
                         AND (a.endorsement_id IS NULL OR a.endorsement_id = '') 
-                        AND a.field_name = 'si_enhancement_date'
+                        AND a.actions = 'si'
+                        AND employee_polices.is_active = 1
+                        AND employee_polices.status = 'active'
+                        AND employees.is_active = 1
+                        AND employees.emp_status = 'active'
+                        group by group_key
                 ");
 
                 // Get the result set
@@ -374,13 +391,14 @@ class EmployeePolicyModel extends Model
             $query = $this->db->query("
             SELECT DISTINCT
                 a.id as endorsement_primarykey,
+                a.group_key,
                 employee_polices.id as primaryKey, 
                 employees.name AS emp_name,
                 employees.emp_code AS emp_code,
                 employees.dob AS emp_dob,
                 employees.gender AS emp_gender,
                 employees.relationship AS emp_relationship,
-                'Has Define' as emp_type,
+                employees.emp_type as emp_type,
                 
                 employee_polices.basic_cover_si, 
                 employee_polices.uhid as risk_id, 
@@ -404,7 +422,7 @@ class EmployeePolicyModel extends Model
             FROM 
                 emp_endorsement a
             LEFT JOIN 
-                employees ON a.emp_code = employees.emp_code 
+                employees ON a.emp_code = employees.emp_code and a.pk = employees.id 
             LEFT JOIN 
                 employee_polices ON employees.id = employee_polices.employee_id 
             
@@ -439,16 +457,20 @@ class EmployeePolicyModel extends Model
                     AND batch_files.actions = 'export'
                     AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}'
                 ) AS batch_data ON employee_polices.id = batch_data.emp_policy_id 
-            WHERE 
-                batch_data.bf IS NULL
-                AND batch_data.bl IS NULL
-                AND employee_polices.client_policy_id = {$client_policy_id}
+
+            WHERE employee_polices.client_policy_id = {$client_policy_id}
                 AND employees.client_branch_id = {$client_branch_id}
+                AND (a.endorsement_id IS NULL OR a.endorsement_id = '')
+                AND a.actions = 'd'
                 AND employee_polices.is_active = 1
-                AND (a.endorsement_id IS NULL OR a.endorsement_id = '') AND a.field_name = 'status'
+                AND employee_polices.status = 'active'
+                AND employees.is_active = 1
+                AND employees.emp_status = 'active'
+                group by group_key
         ");
     
         $result = $query->getResult();
+
         return $result;
         
     }
@@ -547,34 +569,62 @@ class EmployeePolicyModel extends Model
 
     public function fetchEmpEndorsementData($fetch_data)
     {
+        // dd($fetch_data);
+
         $client_policy_id = $fetch_data['client_policy_id'];
+        $client_branch_id = $fetch_data['client_branch_id'];
         $emp_name = $fetch_data['emp_name'];
         $emp_code = $fetch_data['emp_code'];
 
         // Your raw SQL query
         $sql = "
-            SELECT 
-                ep.id,
-                MAX(CASE WHEN ee.field_name = 'date_of_exit' THEN ee.new_value END) AS date_of_exit,
-                MAX(CASE WHEN ee.field_name = 'reason_for_exit' THEN ee.new_value END) AS reason_for_exit,
-                MAX(CASE WHEN ee.field_name = 'status' THEN ee.new_value END) AS status
-            FROM 
-                emp_endorsement AS ee
-            JOIN 
-                employee_polices AS ep ON ep.id = ee.pk
-            WHERE 
-                ee.emp_code = '$emp_code'
-                AND ep.client_policy_id = $client_policy_id
-                AND ee.name = '$emp_name'
-                AND ee.field_name IN ('date_of_exit', 'reason_for_exit', 'status')
-            GROUP BY 
-                ee.emp_code, ee.name, ep.id";
+                SELECT
+                    ee.id as emp_endorsement_primarykey,
+                    ep.id as emp_policy_primarykey,
+                    e.id as employees_primarykey,
+                    ee.group_key,
+                    MAX(
+                    CASE
+                        WHEN ee.field_name = 'date_of_exit' THEN ee.new_value
+                    END
+                    ) AS date_of_exit,
+                    MAX(
+                    CASE
+                        WHEN ee.field_name = 'reason_for_exit' THEN ee.new_value
+                    END
+                    ) AS reason_for_exit,
+                    MAX(
+                    CASE
+                        WHEN ee.field_name = 'status' THEN ee.new_value
+                    END
+                    ) AS status
+                FROM
+                    emp_endorsement AS ee
+                    JOIN employee_polices AS ep ON ep.id = ee.pk
+                    JOIN employees AS e ON e.emp_code = ee.emp_code
+                WHERE
+                    ee.emp_code = '$emp_code'
+                    AND ep.client_policy_id = '$client_policy_id'
+                    AND e.client_branch_id = '$client_branch_id'
+                    AND ee.name = '$emp_name'
+                    AND ee.field_name IN ('date_of_exit', 'reason_for_exit', 'status')
+                    AND ep.is_active = 1
+                    AND ep.status = 'active'
+                    AND e.is_active = 1
+                    AND e.emp_status = 'active'
+                GROUP BY
+                    ee.group_key
+        ";
+
+        // dd($sql);
 
         // Execute the raw SQL query
         $query = $this->db->query($sql);
 
         // Fetch and return results
-        return  $row = $query->getRowArray();
+         $row = $query->getRowArray();
+
+         return $row;
     }
     
 
@@ -659,7 +709,7 @@ class EmployeePolicyModel extends Model
                 $query2->join('insurers', 'insurers.id = policies.insurer_id');
                 $query2->whereIn('e.actions', ['si', 'd']);
                 $query2->where('ep.client_policy_id', $policy_id);
-                $query2->where('employees.client_id', $policy_id);
+                $query2->where('employees.client_id', $client_id);
                 $query1->where('employees.client_branch_id', $branch_id);
                 if($status != 0 && !empty($status)){
 
@@ -931,7 +981,132 @@ class EmployeePolicyModel extends Model
             throw $e;
         }
     }
+
+
+    public function bulkUpdateForEndorsement($endorsement_details)
+    {
+
+        // Extract IDs, endorsement_ids, and statuses
+        $ids = array_column($endorsement_details, 'group_key');
+        $endorsement_ids = array_column($endorsement_details, 'endorsement_id');
+        $statuses = array_column($endorsement_details, 'status');
+
+        // Escape values for SQL
+        $escapedIds = array_map([$this->db, 'escape'], $ids);
+        $escapedEndorsementIds = array_map([$this->db, 'escape'], $endorsement_ids);
+        $escapedStatuses = array_map([$this->db, 'escape'], $statuses);
+
+        // Construct the CASE statements
+        $caseEndorsementId = array_map(function ($id, $endorsement_id) {
+            return "WHEN group_key = $id THEN $endorsement_id";
+        }, $escapedIds, $escapedEndorsementIds);
+
+        $caseStatus = array_map(function ($id, $status) {
+            return "WHEN status = $id THEN $status";
+        }, $escapedIds, $escapedStatuses);
+
+        // Convert cases to a string
+        $caseEndorsementIdString = implode(' ', $caseEndorsementId);
+        $caseStatusString = implode(' ', $caseStatus);
+
+        // Convert ids to a string
+        $idsString = implode(', ', $escapedIds);
+
+        // Construct the SQL query
+        $sql = "
+            UPDATE emp_endorsement
+            SET 
+                endorsement_id = CASE {$caseEndorsementIdString} END,
+                status = CASE {$caseStatusString} END
+            WHERE group_key IN ({$idsString})
+        ";
+
+        // Begin a transaction
+        $this->db->transBegin();
+
+        try {
+            // Execute the query
+            $this->db->query($sql);
+
+            // Commit the transaction
+            if ($this->db->transStatus() === FALSE) {
+                // If something went wrong, rollback
+                $this->db->transRollback();
+                throw new \Exception('Bulk update failed.');
+            } else {
+                // Otherwise, commit
+                $this->db->transCommit();
+            }
+
+            return $this->db->getLastQuery();
+        } catch (\Exception $e) {
+            // Rollback the transaction on error
+            $this->db->transRollback();
+            throw $e;
+        }
+    }
     
 
+    public function bulkUpdateForCorrection($emp_details){
+
+        foreach ($emp_details as $employee) {
+            $id = $this->db->escape($employee['id']);
+            $ids[] = $id;
+        
+            foreach ($employee as $field => $value) {
+                if ($field === 'id') continue;
+                $escapedValue = $this->db->escape($value);
+        
+                if (!isset($caseStatements[$field])) {
+                    $caseStatements[$field] = [];
+                }
+        
+                $caseStatements[$field][] = "WHEN id = $id THEN $escapedValue";
+            }
+        }
+        
+        // Construct the CASE strings
+        $caseStrings = [];
+        foreach ($caseStatements as $field => $cases) {
+            $caseStrings[] = "$field = CASE " . implode(' ', $cases) . " END";
+        }
+        
+        // Convert ids to a string
+        $idsString = implode(', ', $ids);
+        
+        // Construct the SQL query
+        $sql = "
+            UPDATE employees
+            SET " . implode(', ', $caseStrings) . "
+            WHERE id IN ($idsString)
+        ";
+        
+        // Begin a transaction
+        $this->db->transBegin();
+        
+        try {
+            // Execute the query
+            $this->db->query($sql);
+        
+            // Commit the transaction
+            if ($this->db->transStatus() === FALSE) {
+                // If something went wrong, rollback
+                $this->db->transRollback();
+                throw new \Exception('Bulk update failed.');
+            } else {
+                // Otherwise, commit
+                $this->db->transCommit();
+            }
+        
+            return $this->db->getLastQuery();
+            
+        } catch (\Exception $e) {
+            // Rollback the transaction on error
+            $this->db->transRollback();
+            throw $e;
+        }
+
+    }
+
 
 }
\ No newline at end of file
diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php
index ab4e17f4..18d6ee36 100644
--- a/app/Views/client_policy.php
+++ b/app/Views/client_policy.php
@@ -14,7 +14,7 @@
                     <th>Policy</th>
                     <th>TPA</th>
                     <th>Date</th>
-                    <th>Enrollment Status</th>
+                    <th>Enrollment <br> Status</th>
                     <th>Status</th>
                     <th>Action</th>
                 </tr>
@@ -252,7 +252,7 @@
                         <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
                         <td>${item.policy_name}  (${item.policy_type_name})</td>
                         <td>${tpaValue}</td>
-                        <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
+                        <td>${(item.policy_start_date)} / <br> ${(item.policy_end_date)}</td>
                         <td style="text-align: center;">${(enrollmentStatus)}</td>
                         <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                         <td>
@@ -474,7 +474,7 @@
                             <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
                             <td>${item.policy_name}  (${item.policy_type_name})</td>
                             <td>${tpaValue}</td>
-                            <td>${rearrangeDateFormat(item.policy_start_date)} - ${rearrangeDateFormat(item.policy_end_date)}</td>
+                            <td>${rearrangeDateFormat(item.policy_start_date)} / <br> ${rearrangeDateFormat(item.policy_end_date)}</td>
                             <td style="text-align: center;">${(enrollmentStatus)}</td>
                             <td>${checkDateStatus(item.policy_end_date, 1)}</td>
                             <td>
diff --git a/app/Views/employee_upload.php b/app/Views/employee_upload.php
index 052b1bab..82d763cb 100644
--- a/app/Views/employee_upload.php
+++ b/app/Views/employee_upload.php
@@ -20,8 +20,8 @@ option:disabled {
                     <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion1">
                         <div class="card-body">
                             <!-- <div class="text-center"> -->
-                            <form class="parsley-examples" id="emp-upload-form"
-                                action="<?php echo base_url().'employee/upload'?>" method="post">
+                            <form class="parsley-examples" id="emp-upload-form" action="<?php echo base_url().'employee/upload'?>" method="post" enctype="multipart/form-data">
+                               
                                 <input type="hidden" name="<?= csrf_token() ?>" value="<?= csrf_hash() ?>"
                                     id="csrf_token">
 
@@ -38,14 +38,14 @@ option:disabled {
 
                                         <div class="form-group col-md-4">
                                             <label>Branch</label> <br />
-                                            <select name="branch_id" class="form-control" id="branch_id">
+                                            <select name="branch_id" class="form-control" id="branch_id" required>
                                                 <option value="0">Select</option>
                                             </select>
                                         </div>
 
                                         <div class="form-group col-md-4">
                                             <label>Policy</label> <br />
-                                            <select name="policy_id" class="form-control" id="policy_id" onchange="checkPolicyTermsAndRackRatesHasDefiend(event)">
+                                            <select name="policy_id" class="form-control" id="policy_id" onchange="checkPolicyTermsAndRackRatesHasDefiend(event)" required>
                                                 <option value="0">Select</option>
                                             </select>
                                         </div>
@@ -214,7 +214,21 @@ $(document).ready(function() {
         // console.log('submit called');
 
 
+        if(!checkValues()){
+
+            toastr.warning('Form is Empty', 'warning')
+            return false;
+        }
+
+
+        $('#client_id').val()
+        $('#policy_id').val()
+        $('#branch_id').val()
+        $('#upload-action-type').val()
+
         var isValid = $('#emp-upload-form').parsley().validate();
+
+        console.log('isValid', isValid)
         if (!isValid) {
             console.log('Form is Empty', 'Warning');
             return;
@@ -933,7 +947,7 @@ function checkPolicyTermsAndRackRatesHasDefiend(event)
                     setTimeout(function() {
                         $('.loader').fadeOut();
                         $('.loader-mask').delay(350).fadeOut('slow');
-                    }, 1000);
+                    }, 300);
 
                     console.log('check policy responce', response);
 
@@ -965,7 +979,7 @@ function checkPolicyTermsAndRackRatesHasDefiend(event)
                     setTimeout(function() {
                     $('.loader').fadeOut();
                     $('.loader-mask').delay(350).fadeOut('slow');
-                }, 1000);
+                }, 300);
                     // toastr.error('Something went wrong! Try Later', 'Error');
                     console.error('Error fetching data from checkPolicyTermsAndRackRatesHasDefiend API:', error);
                     return false;
@@ -976,5 +990,36 @@ function checkPolicyTermsAndRackRatesHasDefiend(event)
 }
 
 
+function checkValues() {
+    
+    var clientId = $('#client_id').val();
+    var policyId = $('#policy_id').val();
+    var branchId = $('#branch_id').val();
+    var uploadActionType = $('#upload-action-type').val();
+    
+    if (!clientId || clientId == '0') {
+        // alert('Client ID is empty or zero');
+        return false;
+    }
+    
+    if (!policyId || policyId == '0') {
+        // alert('Policy ID is empty or zero');
+        return false;
+    }
+    
+    if (!branchId || branchId == '0') {
+        // alert('Branch ID is empty or zero');
+        return false;
+    }
+    
+    if (!uploadActionType || uploadActionType == '0') {
+        // alert('Upload action type is empty or zero');
+        return false;
+    }
+    
+    // If all values are valid, return true
+    return true;
+}
+
 //---------------------------------------------------------------------------------------------------------
 </script>
\ No newline at end of file
diff --git a/app/Views/file_list.php b/app/Views/file_list.php
index 5c3504af..3f8320ad 100644
--- a/app/Views/file_list.php
+++ b/app/Views/file_list.php
@@ -81,7 +81,7 @@
                                         class="mdi mdi-dots-horizontal"></i></a>
                                 <div class="dropdown-menu dropdown-menu-right">
                                     <?php if($file['status'] == 'failed') { ?>
-                                    <a data-id="<?= htmlspecialchars(json_encode($file)) ?>" data-toggle="modal"
+                                    <a data-id="<?= htmlspecialchars(json_encode(['client_id' => $file['client_id'], 'client_policy_id' => $file['client_policy_id'], 'action' => $file['action']])) ?>" data-toggle="modal"
                                         data-target="#file-upload-modal" class="dropdown-item upload_button" href="#"><i
                                             class="mdi mdi-upload mr-2 text-muted font-18 vertical-middle"></i>Re-Upload</a>
                                     <?php } ?>
@@ -136,7 +136,7 @@
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h4 class="modal-title" id="myCenterModalLabel">Reupload the file</h4>
+                <h4 class="modal-title" id="myCenterModalLabel">ReUpload the file</h4>
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
             </div>
             <div class="modal-body">
@@ -158,7 +158,7 @@
 <script>
 $('body').on('click', '.view_emp_list', function() {
 
-    console.log('file_id');
+    console.log('file_id', 'file_id');
     $('#emp_data_success').empty();
     $('#title').html(' ');
     var file_id = $(this).attr('data-id');
diff --git a/app/Views/policy_grid.php b/app/Views/policy_grid.php
index 333f05e9..dc1747d7 100644
--- a/app/Views/policy_grid.php
+++ b/app/Views/policy_grid.php
@@ -902,6 +902,7 @@ $("#AdditionalGridForm").submit(function(event) {
 
     if (!checkCheckboxes()) {
         event.preventDefault(); 
+        return;
     }
 
     var isValid = $('#AdditionalGridForm').parsley().validate();
@@ -2648,12 +2649,11 @@ function createCheckboxes(obj, additional_relationship) {
     $.each(obj, function(key, value) {
         if (value > 0 && key != 'either-parents-pil') {
             const isChecked = additional_relationship && typeof additional_relationship === 'object' && additional_relationship[key] == 1 ? 'checked' : '';
-            key = formatString(key);
             console.log('isChecked', isChecked);
             html += `
                     <div class="col-2">
                         <input class="relation_checkbox" type="checkbox" name="${key}" ${isChecked}>
-                        <label style="position: relative;left: 18px;bottom: 30px;">${key}</label>
+                        <label style="position: relative;left: 18px;bottom: 30px;">${formatString(key)}</label>
                     </div>`;
             // console.log(html);
         }
@@ -2743,6 +2743,7 @@ $('#del_btn').click(function() {
 
 
 function checkCheckboxes() {
+
     var checkboxes = $('input.relation_checkbox');
     var checkedCount = checkboxes.filter(':checked').length;
     var uncheckedCount = checkboxes.not(':checked').length;
@@ -2753,7 +2754,7 @@ function checkCheckboxes() {
     if (checkedCount < 1) {
         toastr.warning('You must select at least one checkbox.', 'Warning');
         return false;
-    } else if (checkedCount != uncheckedCount) {
+    } else if (checkedCount == uncheckedCount) {
         toastr.warning('You can not select all of the checkboxes', 'Waraning');
         return false;
     }
diff --git a/app/Views/view_file_upload_emp_list.php b/app/Views/view_file_upload_emp_list.php
index e1e2091f..918af33c 100644
--- a/app/Views/view_file_upload_emp_list.php
+++ b/app/Views/view_file_upload_emp_list.php
@@ -22,7 +22,7 @@ table.dataTable tbody td {
                 </thead>
 
                 <tbody class="font-12">
-                    <?php for ($i = 1; $i <= count($tbody); $i++): ?>
+                    <?php for ($i = 1; $i <= $count; $i++): ?>
                     <tr>
                         <?php foreach ($tbody[$i] as $data): ?>
                         <td>

From 248ddbc9e33d0bba4d70921ca34638413d6e7c12 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Mon, 3 Jun 2024 10:27:03 +0530
Subject: [PATCH 2/7] CHANGE_BRABCH_ID&ADDITIONAL_PREMIUM_TYPE

---
 README.md                                     |  58 +---
 app/Controllers/EmployeeController.php        |  27 +-
 app/Controllers/EmployeeServiceController.php |  97 +++---
 app/Helpers/excel_util_helper.php             | 281 ++++++++++++++----
 app/Models/InsurerModel.php                   |   1 +
 app/Models/PolicesModel.php                   |  20 +-
 tests/unit/PremiumCalculationTest.php         | 154 ++++++++++
 7 files changed, 475 insertions(+), 163 deletions(-)
 create mode 100644 tests/unit/PremiumCalculationTest.php

diff --git a/README.md b/README.md
index 00cdf704..8c8c98a2 100644
--- a/README.md
+++ b/README.md
@@ -1,59 +1,11 @@
 # CodeIgniter 4 Framework
 
-## What is CodeIgniter?
+## Unit Testing
 
-CodeIgniter is a PHP full-stack web framework that is light, fast, flexible and secure.
-More information can be found at the [official site](https://codeigniter.com).
+From command propmt run the following cmds 
 
-This repository holds the distributable version of the framework.
-It has been built from the
-[development repository](https://github.com/codeigniter4/CodeIgniter4).
+`php vendor/bin/phpunit tests\unit\GridType11PremiumCalculationTest.php`
 
-More information about the plans for version 4 can be found in [CodeIgniter 4](https://forum.codeigniter.com/forumdisplay.php?fid=28) on the forums.
+Run speeific method
 
-The user guide corresponding to the latest version of the framework can be found
-[here](https://codeigniter4.github.io/userguide/).
-
-## Important Change with index.php
-
-`index.php` is no longer in the root of the project! It has been moved inside the *public* folder,
-for better security and separation of components.
-
-This means that you should configure your web server to "point" to your project's *public* folder, and
-not to the project root. A better practice would be to configure a virtual host to point there. A poor practice would be to point your web server to the project root and expect to enter *public/...*, as the rest of your logic and the
-framework are exposed.
-
-**Please** read the user guide for a better explanation of how CI4 works!
-
-## Repository Management
-
-We use GitHub issues, in our main repository, to track **BUGS** and to track approved **DEVELOPMENT** work packages.
-We use our [forum](http://forum.codeigniter.com) to provide SUPPORT and to discuss
-FEATURE REQUESTS.
-
-This repository is a "distribution" one, built by our release preparation script.
-Problems with it can be raised on our forum, or as issues in the main repository.
-
-## Contributing
-
-We welcome contributions from the community.
-
-Please read the [*Contributing to CodeIgniter*](https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md) section in the development repository.
-
-## Server Requirements
-
-PHP version 7.4 or higher is required, with the following extensions installed:
-
-- [intl](http://php.net/manual/en/intl.requirements.php)
-- [mbstring](http://php.net/manual/en/mbstring.installation.php)
-
-> **Warning**
-> The end of life date for PHP 7.4 was November 28, 2022. If you are
-> still using PHP 7.4, you should upgrade immediately. The end of life date
-> for PHP 8.0 will be November 26, 2023.
-
-Additionally, make sure that the following extensions are enabled in your PHP:
-
-- json (enabled by default - don't turn it off)
-- [mysqlnd](http://php.net/manual/en/mysqlnd.install.php) if you plan to use MySQL
-- [libcurl](http://php.net/manual/en/curl.requirements.php) if you plan to use the HTTP\CURLRequest library
+`>php vendor/bin/phpunit tests\unit\PremiumCalculationTest.php --filter testPremiumCalculationWithPrimaryRackRateAndAdditionalRackRate`
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index 77a14554..3aa5c42d 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -180,16 +180,31 @@ class EmployeeController extends AdminController
                 'emplist' => [
                     'uploaded[emplist]',
                     'mime_in[emplist,application/vnd.ms-excel,application/vnd,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.oasis.opendocument.spreadsheet]',
-                    'max_size[emplist,8192]',
+                    'max_size[emplist,16384]',
                 ],
             ]);
+            
+            if ($validated) 
+            {
+                    $avatar = $this->request->getFile('emplist');
+                    if (!$avatar) {
+                        $this->myLogger->logme("error", 'File not found');
+                        return $this->respond(['dataStatus' => false, 'code' => 400, 'message' => 'File not found'], 400);
+                    }
 
-            if ($validated) {
-                $avatar = $this->request->getFile('emplist');
-                $is_moved = $avatar->move(WRITEPATH . 'uploads/excel/');
-                $filename = $avatar->getName();
+                    $is_moved = $avatar->move(WRITEPATH . 'uploads/excel/');
+                    if ($is_moved) {
+                        $filename = $avatar->getName();
+                        // Handle successful upload, e.g., log success or further processing
+                        $this->myLogger->logme("error", 'File move successful');
+                        
+                    } else {
+                        $this->myLogger->logme("error", 'File move failed');
+                        return $this->respond(['dataStatus' => false, 'code' => 500, 'message' => 'File move failed'], 500);
+                    }
             } else {
-                return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'invalid file'], 200);
+                $this->myLogger->logme("error", 'Upload failed Invalid file');
+                return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'Invalid file'], 404);
             }
 
             //process post variable entry in file table
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 63a240d1..cb6705f4 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -668,7 +668,7 @@ class EmployeeServiceController extends AdminController
             // for employee policy table
             $this->empEndorsementModel->save(['pk' => (int)$data['emp_policy_id'],'emp_code' => $data['emp_code'],'table_name' => 'employee_polices','actions' => 'd','name' => $data['name'],'field_name' => 'date_of_exit','old_value' => $data['date_of_exit'],'new_value' => change_date_format($row[4],'d-M-Y','Y-m-d'),'created_by' => $file['created_by'],'remarks' => 'general deletion','group_key' => $group_key,'file_id' => $file['id']]);
             $this->empEndorsementModel->save(['pk' => (int)$data['emp_policy_id'],'emp_code' => $data['emp_code'],'table_name' => 'employee_polices','actions' => 'd','name' => $data['name'],'field_name' => 'reason_for_exit','old_value' => $data['reason_for_exit'],'new_value' => $row[5],'created_by' => $file['created_by'],'remarks' => 'general deletion','group_key' => $group_key,'file_id' => $file['id']]);
-            $this->empEndorsementModel->save(['pk' => (int)$data['emp_policy_id'],'emp_code' => $data['emp_code'],'table_name' => 'employee_polices','actions' => 'd','name' => $data['name'],'field_name' => 'status','old_value' => $data['status'],'new_value' => 'deactivate','created_by' => $file['created_by'],'remarks' => 'general deletion','group_key' => $group_key,'file_id' => $file['id']]);
+            $this->empEndorsementModel->save(['pk' => (int)$data['emp_policy_id'],'emp_code' => $data['emp_code'],'table_name' => 'employee_polices','actions' => 'd','name' => $data['name'],'field_name' => 'status','old_value' => $data['status'],'new_value' => 'inactive','created_by' => $file['created_by'],'remarks' => 'general deletion','group_key' => $group_key,'file_id' => $file['id']]);
         };
         //iterate each row
         foreach ($excel_data as $col_key => $row) 
@@ -679,47 +679,56 @@ class EmployeeServiceController extends AdminController
             }
             // echo '<br>START- ' . $row[2];
             $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->where('client_branch_id',$file['client_branch_id'])->first();
-
-            $existing_endorsements = $this->empEndorsementModel->where('actions','d')
-                                                     ->where('table_name','employees')
-                                                     ->where('endorsement_id is null')
-                                                     ->where('emp_code',$employee['emp_code'])
-                                                     ->where('name',$employee['name'])
-                                                     ->where('field_name','emp_status')
-                                                     ->findAll();
-
-
-            if(!count($existing_endorsements))
+            // $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->first();
+            // dd($employee);
+            if(is_array($employee) && count($employee))
             {
-                    if(strtolower($employee['relationship']) != 'self')
-                    {
-                        
-                        if(!in_array($employee['id'],$endorsement_data))//make entry in endorsement firsttime only with checking that PK of emp exisintg in variable $endorsement_data
-                        {
-                            $employee_policy = $this->employeePolicyModel->where('employee_id',$employee['id'])->where('client_policy_id',$file['policy_id'])->first();
-                            $data = ['emp_id' => $employee['id'],'name' => $employee['name'],'emp_status' => $employee['emp_status'],'emp_policy_id' => $employee_policy['id'],'emp_code' => $employee['emp_code'],'change_event' => $employee['change_event'],'date_of_exit' => $employee_policy['date_of_exit'],'reason_for_exit' => $employee_policy['reason_for_exit'],'status' => $employee_policy['status']];
-                            $endorsement($data,$file,$row);
-                            $endorsement_data[] = $employee['id'];
-                        }
-                    }
-                    else
-                    {
-                        
-                         $family = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $row[1],client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status: ['active']);
-                        // Kint::dump($family);
-                         foreach ($family as $key => $emp) {
-                             
-                             if(!in_array($emp['emp_id'],$endorsement_data))
-                             {
-                                $endorsement($emp,$file,$row);
-                                
-                                $endorsement_data[] = $emp['emp_id'];
-                                
-                             }
-                         }
+                    $existing_endorsements = $this->empEndorsementModel->where('actions','d')
+                                                             ->where('table_name','employees')
+                                                             ->where('endorsement_id is null')
+                                                             ->where('emp_code',$employee['emp_code'])
+                                                             ->where('name',$employee['name'])
+                                                             ->where('field_name','emp_status')
+                                                             ->findAll();
 
+
+                    if(!count($existing_endorsements))
+                    {
+                            if(strtolower($employee['relationship']) != 'self')
+                            {
+                                
+                                if(!in_array($employee['id'],$endorsement_data))//make entry in endorsement firsttime only with checking that PK of emp exisintg in variable $endorsement_data
+                                {
+                                    $employee_policy = $this->employeePolicyModel->where('employee_id',$employee['id'])->where('client_policy_id',$file['policy_id'])->first();
+                                    $data = ['emp_id' => $employee['id'],'name' => $employee['name'],'emp_status' => $employee['emp_status'],'emp_policy_id' => $employee_policy['id'],'emp_code' => $employee['emp_code'],'change_event' => $employee['change_event'],'date_of_exit' => $employee_policy['date_of_exit'],'reason_for_exit' => $employee_policy['reason_for_exit'],'status' => $employee_policy['status']];
+                                    $endorsement($data,$file,$row);
+                                    $endorsement_data[] = $employee['id'];
+                                }
+                            }
+                            else
+                            {
+                                
+                                 $family = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $row[1],client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status: ['active']);
+                                // Kint::dump($family);
+                                 foreach ($family as $key => $emp) {
+                                     
+                                     if(!in_array($emp['emp_id'],$endorsement_data))
+                                     {
+                                        $endorsement($emp,$file,$row);
+                                        
+                                        $endorsement_data[] = $emp['emp_id'];
+                                        
+                                     }
+                                 }
+
+                            }
                     }
             }
+            else
+            {
+
+                $this->myLogger->logme("error",'{emp_code} - {name} not found',['emp_code' => $row[1],'name' => $row[2]]);
+            }
 
             // print_r($endorsement_data);
 
@@ -887,8 +896,10 @@ class EmployeeServiceController extends AdminController
                         // Kint::dump($value);
                         // Kint::dump($policy_data);
                     //start implemet of si enhancement of grid type 10,11
-                     if(count($employee) && (($file['action'] == 'dependent_addition' && in_array($value['temp']['source'],[10,11]) && ($slab_details['slab_rates'][0]['premium_type'] == 1 && strtolower($value['relationship']) == 'self') || ($slab_details['slab_rates'][0]['premium_type'] == 2 || $slab_details['slab_rates'][0]['premium_type'] == null))))
+                     if(count($employee) && $file['action'] == 'dependent_addition' && $value['temp']['source'] == 'db' && ( ($slab_details['slab_rates'][0]['premium_type'] == 1 && (strtolower($value['relationship']) == 'self' || $temp['additional_rack_rate_acting_self'])) || ($slab_details['slab_rates'][0]['premium_type'] == 2 || $slab_details['slab_rates'][0]['premium_type'] == null)))
                     {
+                       $log_message = 'Employee record from DB,Checking SI for - '.$employee[0]['name'].'('.$employee[0]['emp_code'].')';
+                       $this->myLogger->logme('error',$log_message);
                        $res = $this->employeesSIEnhanceProcessWhileOnbboard(employee:$employee[0],policy_data: $policy_data,file:$file);// where employee holds existing emp data and policy_data holds new si enhancement
                        if(!$res)
                        {
@@ -964,7 +975,7 @@ class EmployeeServiceController extends AdminController
         $slab_details = $this->policiesModel->getPolicySlabRatesForEmpOnboard($employee_policy['client_policy_id'],$employee['client_id']);
     
         //check si has changed in normal case OR check premium only changed, still treat as SI enhancement in grid type 10
-        if($employee_policy['basic_cover_si'] != $policy_data['basic_cover_si'] || ($slab_details['grid_master']['ui_type'] == 10 && $policy_data['premimum'] != null && $policy_data['premimum'] != "" && $employee_policy['premimum'] != $policy_data['premimum']))
+        if($employee_policy['basic_cover_si'] != $policy_data['basic_cover_si'] || ($policy_data['premimum'] != null && $policy_data['premimum'] != "" && $employee_policy['premimum'] != $policy_data['premimum']))
         {
             $existing_endorsements = $this->empEndorsementModel->where('actions','si')
                                                          ->where('table_name','employee_polices')
@@ -986,7 +997,9 @@ class EmployeeServiceController extends AdminController
                             $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'basic_cover_si','old_value' => $employee_policy['basic_cover_si'],'new_value' => $policy_data['basic_cover_si'],'created_by' => $file['created_by'],'remarks' => 'general si enhancement via DA','group_key' => $group_key,'file_id' => $file['id']]);
                             $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'premium','old_value' => $employee_policy['premium'],'new_value' => $slab_value['premium'],'created_by' => $file['created_by'],'remarks' => 'general si enhancement via DA','group_key' => $group_key,'file_id' => $file['id']]);
                             $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'si_enhancement_date','old_value' => null,'new_value' => date('Y-m-d'),'created_by' => $file['created_by'],'remarks' => 'general si enhancement via DA','group_key' => $group_key,'file_id' => $file['id']]);
-                            $this->myLogger->logme('error',($employee['emp_code'].' - '.$employee['name'].'- ( NEW/OLD SI - '.$employee_policy['basic_cover_si'].'/'.$policy_data['basic_cover_si'].')'. '( NEW/OLD PREMIUM - '.$employee_policy['premium'].'/'.$policy_data['premimum'].') '.' - si enhancement via DA'));
+                            $this->myLogger->logme('error',($employee['emp_code'].' - '.$employee['name'].'- ( NEW/OLD SI - '.$employee_policy['basic_cover_si'].'/'.$policy_data['basic_cover_si'].')'. '( NEW/OLD PREMIUM - '.$employee_policy['premium'].'/'.$policy_data['premimum'].') '.' - si enhancement via DA')); 
+                            $log_message = 'SI enhancement done during dependent_addition - '.$employee[0]['name'].'('.$employee[0]['emp_code'].')';
+                            $this->myLogger->logme('error',$log_message);
                             return true; //retun true when endorsement inserted
                             
                         }
@@ -1123,7 +1136,7 @@ class EmployeeServiceController extends AdminController
         ->join('clients', 'clients.id = files.client_id')
         ->join('client_policy', 'client_policy.id = files.policy_id')
         ->join('policies', 'policies.id = client_policy.policy_id')
-        ->join('client_branch', 'client_branch.id = files.client_branch_id')
+        ->join('client_branch', 'client_branch.id = files.client_branch_id','left')
         ->where('files.id', $file_id)
         ->first();
 
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index ecef10e8..f48669a8 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Models\EmployeeModel;
+use App\Models\InsurerModel;
 use Kint\Kint;
 
 
@@ -405,15 +406,17 @@ if (!function_exists('name_and_empid_check_in_db'))
 
         foreach ($family_data as $rkey => $row) 
         {
-            if(($current_action == 'inception' || $current_action == 'addition') || ($current_action == 'dependent_addition' && (isset($row['temp']) && $row['temp']['source'] != 'db')))
-            {
+            if($current_action != 'dependent_addition' || (isset($row['temp']) && $row['temp']['source'] != 'db'))
+            {   
                 $res = $employeeModel
                         ->join('client_policy cp',"employees.client_id = cp.client_id")
                         ->join('employee_polices ep',"cp.id = ep.client_policy_id AND employees.id = ep.employee_id")
-                        // ->where("cp.id",$policy_id)
+                        ->where("cp.id",$policy_id)
                         ->where("employees.client_id",$client_id)
                         ->where("employees.is_active",1)
+                        ->where("employees.emp_status",'active')
                         ->where("ep.is_active",1)
+                        ->where("ep.status",'active')
                         // ->where("ep.client_id",$client_id)
                         ->where('name',$row[2])->where('emp_code',$row[1])
                         ->findAll();
@@ -594,28 +597,90 @@ if (!function_exists('calculate_premimum'))
 {
     function calculate_premimum($family_data,$policy_terms,$slab_details,$fileArr,$default_si = null)
     {
-// 
-        // dd($slab_details);
-        // grid type
-        // 1 = premium => si
+        // dd($family_data);
+        $slug = \Config\Services::slug();
         $result = [];
-        $grid_type = $slab_details['grid_master']['ui_type'];
-        $fileArr['grid_type'] = $grid_type;
+        $primary_grid_type = $slab_details['grid_master']['ui_type'];
+
+        //gather detailes for additional rack info
+        $additional_grid_type = isset($slab_details['additional_slab_info']['grid_master']['ui_type']) ? $slab_details['additional_slab_info']['grid_master']['ui_type'] : null;
+        // dd(isset($slab_details['additional_slab_info']['grid_master']['ui_type']));
+         $policy_terms_json = ($policy_terms['policy_terms']);
+         $policy_terms_json = (array) json_decode($policy_terms_json);
+        // dd($policy_terms);
+        $primary_rack_rate_applicable_familiy_members = ['self'];
+        if(isset($policy_terms_json['family_floaters']))
+        {
+            $primary_rack_rate_applicable_familiy_members = generate_family_relationship_array((array)$policy_terms_json['family_floaters']);
+        }
+        
+        $additional_grid_type_applicable_familiy_members = [];
+        if($additional_grid_type != null)
+        {
+            $additional_grid_type_applicable_familiy_members = (array)json_decode($slab_details['additional_slab_info']['slab_rates'][0]['additional_relationship']);
+            $additional_grid_type_applicable_familiy_members = generate_family_relationship_array($additional_grid_type_applicable_familiy_members);
+        }
+       //  Kint::dump($primary_rack_rate_applicable_familiy_members);
+       // Kint::dump($additional_grid_type_applicable_familiy_members);
+        //remove common family members in primary array
+        $primary_rack_rate_applicable_familiy_members = array_diff($primary_rack_rate_applicable_familiy_members,$additional_grid_type_applicable_familiy_members);
+        // dd($primary_rack_rate_applicable_familiy_members);
+        
+
+
         //this variable for store emp id and their band for emp band level premium calculation for all famility members (especially for grid type 9) also store max age and max count of a familiy for grid type 10,11
         $emp_details_with_empband_max_age_max_count = [];
-        //max age amoung familiy
-        $max_age = max(array_map(function($item) {return calculate_days_bw_dates(from_date: $item[3])->y; }, $family_data));
+        //find max age and max count of family members for both primary and additional grid type
+        $max_age_and_count = (array_reduce($family_data,function($max_age,$family_member) use ($primary_rack_rate_applicable_familiy_members,$slug) {
+            
+            if( in_array($slug->slugify($family_member[5]), $primary_rack_rate_applicable_familiy_members))
+                { 
+                    $max_age['primary_rack_rate_max_age'][] =  calculate_days_bw_dates(from_date: $family_member[3])->y; 
+                    $max_age['primary_rack_rate_max_count'] =  $max_age['primary_rack_rate_max_count'] + 1;
+                }
+                else
+                { 
+                    $max_age['additional_rack_rate_max_age'][] =  calculate_days_bw_dates(from_date: $family_member[3])->y; 
+                    $max_age['additional_rack_rate_max_count'] =  $max_age['additional_rack_rate_max_count'] + 1;
+                }
+                return $max_age;
+            }, ['primary_rack_rate_max_age' => [], 'additional_rack_rate_max_age' => [],'primary_rack_rate_max_count' => 0,'additional_rack_rate_max_count' => 0]));
 
+
+         $get_max_age_or_count = function($relationship,$flag) use ($slug, $primary_rack_rate_applicable_familiy_members, $max_age_and_count)
+                {
+                    if(in_array($slug->slugify($relationship),$primary_rack_rate_applicable_familiy_members))
+                    {
+                            return $flag == 'age' ? max($max_age_and_count['primary_rack_rate_max_age']) : $max_age_and_count['primary_rack_rate_max_count'];
+                    }
+                    return $flag == 'age' ? max($max_age_and_count['additional_rack_rate_max_age']) : $max_age_and_count['additional_rack_rate_max_count'];
+                };
+
+
+        $get_current_member_grid_type = function($relationship) use ($slug, $primary_rack_rate_applicable_familiy_members,$primary_grid_type,$additional_grid_type)
+                {
+                    if(in_array($slug->slugify($relationship),$primary_rack_rate_applicable_familiy_members))
+                    {
+                            return  ['type' => 'primary','grid_id' => $primary_grid_type];
+                    }
+                           return  ['type' => 'additional','grid_id' => $additional_grid_type];
+                };  
+        // Kint::dump($max_age_and_count);dd();
             foreach($family_data as $fkey => $member)
             {
+                //get grid type either primary or additional based on current member relationship available in primary_rack_rate_applicable_familiy_members or not. if yes then primaty grid type else additional grid type
+                $current_grid_info = $get_current_member_grid_type($member[5]);
+                $fileArr['grid_info'] = $current_grid_info;
                 //transform as db row column
                 $transformed_familiy_member_data = transform_excel_data_to_db($member,$fileArr);
                 // dd($transformed_familiy_member_data);
+                
                 //store emp id and emp band and attach it to their familiy members where band is always empty
 
                 $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['band'] = isset($emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['band']) ? $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['band'] : NULL;
 
                 $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si'] = isset($emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si']) ? $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si'] : NULL;
+                //get emp band and si from self and make it available for whole family
                 if(strtolower($transformed_familiy_member_data['relationship']) == 'self')
                 {
                     $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['band'] = $transformed_familiy_member_data['band'];
@@ -623,9 +688,17 @@ if (!function_exists('calculate_premimum'))
                 }
                
                 //end of store emp id and emp band and attach it to their familiy members where band is always empty
-                $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxcount'] =count($family_data);
+                $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxcount'] = $get_max_age_or_count($transformed_familiy_member_data['relationship'],'count');
                 
-                $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxage'] = $max_age;
+                $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['maxage'] = $get_max_age_or_count($transformed_familiy_member_data['relationship'],'age');
+
+                //set additional_rack_rate_acting_self in emp_details_with_empband_max_age_max_count array
+                $transformed_familiy_member_data['temp']['additional_rack_rate_acting_self'] = false;
+                if(!isset($emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['additional_rack_rate_acting_self']) && $current_grid_info['type'] == 'additional')
+                {
+                    $transformed_familiy_member_data['temp']['additional_rack_rate_acting_self'] = true;
+                    $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['additional_rack_rate_acting_self'] = true;
+                }
 
                 //generate relationship code
                 if($transformed_familiy_member_data['temp']['action'] != 'D' && $transformed_familiy_member_data['temp']['action'] != 'C' && $transformed_familiy_member_data['temp']['action'] != 'SI')
@@ -644,15 +717,33 @@ if (!function_exists('calculate_premimum'))
                      
                      $transformed_familiy_member_data['policy_details']['basic_cover_si'] = isset($emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si']) ? $emp_details_with_empband_max_age_max_count[ $transformed_familiy_member_data['emp_code'] ]['si']  : $transformed_familiy_member_data['policy_details']['basic_cover_si'];
 
-                    if( $fileArr['id'] == null || $transformed_familiy_member_data['temp']['source'] == 'excel' || ($fileArr['action'] == 'dependent_addition' && in_array($grid_type,[10,11]) && $slab_details['slab_rates'][0]['premium_type'] == 1 && strtolower($transformed_familiy_member_data['relationship']) == 'self'))//if file id is null then data coming from enrollment (from DB) otherwise data coming from xcel, so calculate only data from excel (new entry) note: even data coming from excel for event dependet additon we fetch other dependts from db and calculate premium for whole family
-                    {
+                     // this array hold conditions to allow calculate premium amt
+                    $conditions = [
+                        'isEmployeeSourceEnrollment' => $fileArr['id'] == null,
+                        'isEmployeeSourceExcelFile' => $transformed_familiy_member_data['temp']['source'] == 'excel',
+                        'isCurrentActionDependentAddition' => $fileArr['action'] == 'dependent_addition',
+                        'isPrimaryGridType' => $transformed_familiy_member_data['temp']['grid_type'] == 'primary',
+                        'isAdditionalGridType' => $transformed_familiy_member_data['temp']['grid_type'] == 'additional',
+                        'isPrimaryGridPremiumTypeSingle' => $slab_details['slab_rates'][0]['premium_type'] == 1,
+                        'isAdditionalPremiumTypeSingle' => isset($slab_details['additional_slab_info']['slab_rates'][0]['premium_type']) ? ( $slab_details['additional_slab_info']['slab_rates'][0]['premium_type'] == 1) : 0,
+                        'isCurrentRelationshipSelf' => strtolower($transformed_familiy_member_data['relationship']) == 'self',
+                        'isBasicCoverCalculatedToCurrentEmployee' => strtolower($transformed_familiy_member_data['policy_details']['basic_cover_si']) != null
+                    ];
+
+                    // same logic for both primay and additional grid type
+                    $primaryGridTypeCondition = $conditions['isCurrentActionDependentAddition'] && $conditions['isPrimaryGridType'] && $conditions['isPrimaryGridPremiumTypeSingle'] && $conditions['isCurrentRelationshipSelf'];
+                    $additionalGridTypeCondition = $conditions['isCurrentActionDependentAddition'] && $conditions['isAdditionalGridType'] && $conditions['isAdditionalPremiumTypeSingle'] && $conditions['isBasicCoverCalculatedToCurrentEmployee'];
+
+                    // Final combined condition
+                    if ($conditions['isEmployeeSourceEnrollment'] || $conditions['isEmployeeSourceExcelFile'] || $primaryGridTypeCondition || $additionalGridTypeCondition) {
+                        
                          $transformed_familiy_member_data = premium_calculation_manager($transformed_familiy_member_data,$policy_terms,$slab_details,$default_si);
                         
                         $result[] = $transformed_familiy_member_data;
                     }
                 }
             }
-
+            // Kint::dump($emp_details_with_empband_max_age_max_count);
         return $result;
     }
 }
@@ -702,7 +793,8 @@ if (!function_exists('transform_excel_data_to_db'))
             $result['file_id'] = $actionArr['id'];
             $result['client_id'] = $actionArr['client_id'];
             $result['change_event'] = $memArr[15];
-            $result['temp']['grid_type'] = $actionArr['grid_type'];
+            $result['temp']['grid_type'] = $actionArr['grid_info']['type'];
+            $result['temp']['grid_id'] = $actionArr['grid_info']['grid_id'];
             $result['temp']['action'] = isset($memArr['current_action']) ? $memArr['current_action'] : $current_column_action;
             $result['temp']['source'] = isset($memArr['temp']['source']) ? $memArr['temp']['source'] : 'excel';
             $result['temp']['emp_id'] = isset($memArr['temp']['emp_id']) ? $memArr['temp']['emp_id'] : null;
@@ -722,11 +814,12 @@ if (!function_exists('premium_calculation_manager'))
 {
     function premium_calculation_manager($emp_data,$policy_terms,$slab_details,$default_si = null)
     {
+        // Kint::dump($emp_data);
 
         $myLogger = \Config\Services::mylogger();
         // grid type
         // 1 = premium => si
-        // dd($emp_data);
+        // Kint::dump($emp_data);
 
         //check if the data comes from enrollment (DB) and status is draft then fetch original data of employee from 
                     //audit history table then initiate calculation with it. so this data again get updated in emp  table
@@ -758,14 +851,27 @@ if (!function_exists('premium_calculation_manager'))
         
         //gird and calculation start
         $slug = \Config\Services::slug();
-        $grid_type = $slab_details['grid_master']['ui_type'];
+        $grid_type = $emp_data['temp']['grid_id'];
+        $temp_slab_rates = $emp_data['temp']['grid_type'] == 'primary' ? $slab_details['slab_rates'] : $slab_details['additional_slab_info']['slab_rates'];
+
+        //if curent action is dependent addition OR addition then pull insurer master to set whether add one day from employee date of coverage
+        if($emp_data['temp']['action'] == 'DA' || $emp_data['temp']['action'] == 'A')
+        {
+            $insurer = new InsurerModel();
+            $insurer = ($insurer->find($policy_terms['insurer_id']));
+            if($insurer['addition_add_day'] == true)
+            {
+                $emp_data['policy_details']['date_coverage'] = (new DateTime($emp_data['policy_details']['date_coverage']))->modify('-1 day')->format('Y-m-d');
+            }
+        }
+        // dd($emp_data);
         $is_match_found = false;
         switch ($grid_type) {
             case "1":
                 //GPA - Sum Insured (SI) * Multiplier
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
                 $employee_received_band = $emp_data['temp']['band'];
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                     if(($slab_value['si'] == $employee_received_si) || ($slab_value['grade'] != null && $slab_value['grade'] ==  $employee_received_band && $slab_value['si'] == $employee_received_si))
                     {
@@ -774,7 +880,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -785,7 +891,7 @@ if (!function_exists('premium_calculation_manager'))
             case "2":
                  //GPA - Flat Rate for all SI
                  $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                     if($slab_value['si'] == $employee_received_si)
                     {
@@ -794,7 +900,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -804,7 +910,7 @@ if (!function_exists('premium_calculation_manager'))
             case "3":
                 //GMC - SI
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                     if($slab_value['si'] == $employee_received_si)
                     {
@@ -813,7 +919,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -826,7 +932,7 @@ if (!function_exists('premium_calculation_manager'))
                 //GMC - Employees Age band
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
                 // dd($employee_received_si);
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                     $age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
                     if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age))
@@ -837,7 +943,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -847,7 +953,7 @@ if (!function_exists('premium_calculation_manager'))
             case "5":
                 //GMC - Employees Age + SI
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                     $age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
                     if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age))
@@ -857,7 +963,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -867,10 +973,10 @@ if (!function_exists('premium_calculation_manager'))
             case "6":
                 //GMC - Employees + Dependent Age band
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                     $age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
-                    if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
+                    if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && (($slab_value['premium_type'] == 1 && ( strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self']) ) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
                     {
                         // echo $emp_data['name'];
                         $emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
@@ -878,7 +984,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -889,17 +995,17 @@ if (!function_exists('premium_calculation_manager'))
             case "7":
                 //GMC - Employees + Dependent Age + SI
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                     $age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
-                    if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
+                    if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && (($slab_value['premium_type'] == 1 && ( strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self']) ) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
                     {
                         $emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
                         $emp_data['policy_details']['date_coverage'] = (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']); 
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
 
                         $is_match_found = true;
@@ -911,10 +1017,10 @@ if (!function_exists('premium_calculation_manager'))
                 //GMC - SI as per Grade or Band
                 $employee_received_band = $emp_data['temp']['band'];
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                    
-                    if($slab_value['grade'] == $employee_received_band && $slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
+                    if($slab_value['grade'] == $employee_received_band && $slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && (strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self']) ) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
                     {
                         // $emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
                         $emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
@@ -922,7 +1028,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -933,17 +1039,17 @@ if (!function_exists('premium_calculation_manager'))
                 //GMC - Flat Rate for all 
                 $employee_received_band = $emp_data['temp']['band'];
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                    
-                    if($slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
+                    if($slab_value['si'] == $employee_received_si && (($slab_value['premium_type'] == 1 && (strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self'])) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
                     {
                         $emp_data['policy_details']['basic_cover_si'] = $slab_value['si'];
                         $emp_data['policy_details']['date_coverage'] = (isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date']); 
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = (float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.','');
                         $is_match_found = true;
                         break;
@@ -954,18 +1060,23 @@ if (!function_exists('premium_calculation_manager'))
                 //GMC - Maximum age of Dependents
                 $max_age = $emp_data['temp']['maxage'];
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
+                // echo $emp_data['name'].'-'.$employee_received_si.'<br>';
+                // echo $emp_data['temp']['grid_type'].'<br>';
                 $emp_data['policy_details']['basic_cover_si'] = null;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
-                   
-                    if($slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $max_age && $slab_value['age_to'] >= $max_age) && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
+                    // echo $slab_value['si'].'-'.$slab_value['age_from'].'-'.$slab_value['age_to'].'-'.$max_age.'<br>';
+                    if( $slab_value['si'] == $employee_received_si && 
+                        ($slab_value['age_from'] <= $max_age && $slab_value['age_to'] >= $max_age) && 
+                        (($slab_value['premium_type'] == 1 && 
+                            ( (strtolower($emp_data['relationship']) == 'self') || ($emp_data['temp']['additional_rack_rate_acting_self']) )) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ) )
                     {
                         $emp_data['policy_details']['basic_cover_si'] = $employee_received_si;
                         $emp_data['policy_details']['date_coverage'] = isset($emp_data['policy_details']['date_coverage']) ? $emp_data['policy_details']['date_coverage'] : $policy_terms['policy_start_date'];
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = ((float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.',''));
                         $is_match_found = true;
                         break;
@@ -979,10 +1090,11 @@ if (!function_exists('premium_calculation_manager'))
                 // echo $employee_received_band;
                 $employee_received_si = $default_si == null ? $emp_data['policy_details']['basic_cover_si'] : $default_si;
                 $emp_data['policy_details']['basic_cover_si'] = null;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
                    
-                    if($slab_value['si'] == $employee_received_si && ($slab_value['grade'] == $employee_received_band) && (($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self') || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
+                    if($slab_value['si'] == $employee_received_si && $slab_value['grade'] == $employee_received_band && (($slab_value['premium_type'] == 1 && 
+                            ( (strtolower($emp_data['relationship']) == 'self') || ($emp_data['temp']['additional_rack_rate_acting_self']) )) || ($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) ))
                     {
                         //calculate premium based on count
                         // echo $emp_data['name'];
@@ -994,7 +1106,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = get_premium_for_si(slab_details: $slab_details,si_amount: $familiy_si_covered,band: $employee_received_band);
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days']);
+                         $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = ((float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.',''));
                         $is_match_found = true;
                         break;
@@ -1009,9 +1121,9 @@ if (!function_exists('premium_calculation_manager'))
                 $employee_relationship = $slug->slugify($emp_data['relationship']);
                 $employee_relationship = ($employee_relationship == 'daughter' || $employee_relationship == 'son' ? $employee_relationship = 'child' : $employee_relationship);
                 $emp_data['policy_details']['basic_cover_si'] = null;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
-                    if( $slab_value['si'] == $employee_received_si && ((($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) && $slab_value['relationship'] == $employee_relationship) || ($slab_value['premium_type'] == 1 &&  strtolower($emp_data['relationship']) == 'self')) )
+                    if( $slab_value['si'] == $employee_received_si && ((($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) && $slab_value['relationship'] == $employee_relationship) || ($slab_value['premium_type'] == 1 &&  (strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self'] ) )) )
                     {
 
                         $emp_data['policy_details']['basic_cover_si'] = $employee_received_si;
@@ -1019,7 +1131,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = ((float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.',''));
                         $is_match_found = true;
                         break;
@@ -1034,9 +1146,9 @@ if (!function_exists('premium_calculation_manager'))
                 $employee_relationship = ($employee_relationship == 'daughter' || $employee_relationship == 'son' ? $employee_relationship = 'child' : $employee_relationship);
                 $emp_data['policy_details']['basic_cover_si'] = null;
                 $age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
-                foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
+                foreach ($temp_slab_rates as $skey => $slab_value) 
                 {
-                    if( $slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && ((($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) && $slab_value['relationship'] == $employee_relationship) || ($slab_value['premium_type'] == 1 && strtolower($emp_data['relationship']) == 'self')) )
+                    if( $slab_value['si'] == $employee_received_si && ($slab_value['age_from'] <= $age && $slab_value['age_to'] >= $age) && ((($slab_value['premium_type'] == 2 || $slab_value['premium_type'] == null) && $slab_value['relationship'] == $employee_relationship) || ($slab_value['premium_type'] == 1 && (strtolower($emp_data['relationship']) == 'self' || $emp_data['temp']['additional_rack_rate_acting_self']) )) )
                     {
 
                         $emp_data['policy_details']['basic_cover_si'] = $employee_received_si;
@@ -1044,7 +1156,7 @@ if (!function_exists('premium_calculation_manager'))
                         $emp_data['policy_details']['policy_end_date'] = $policy_terms['policy_end_date'];
                         $emp_data['policy_details']['days'] = calculate_days_bw_dates($emp_data['policy_details']['date_coverage'],$policy_terms['policy_end_date'])->days;
                         $emp_data['policy_details']['premium'] = $slab_value['premium'];
-                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($slab_value['premium'],$emp_data['policy_details']['days']);
+                        $emp_data['policy_details']['rata_premimum'] = calculate_pro_rata_premimum($emp_data['policy_details']['premium'],$emp_data['policy_details']['days'],calculate_days_bw_dates($policy_terms['policy_start_date'],$policy_terms['policy_end_date'])->days);
                         $emp_data['policy_details']['gst'] = ((float) number_format(($emp_data['policy_details']['rata_premimum'] * (18/100)),2,'.',''));
                         $is_match_found = true;
                         break;
@@ -1055,13 +1167,13 @@ if (!function_exists('premium_calculation_manager'))
 
 
             default:
-            $this->myLogger->logme('error',($emp_data['emp_code'].'-'.$emp_data['name'].' - grid type not found'));
+            $myLogger->logme('error',($emp_data['emp_code'].'-'.$emp_data['name'].' - grid type not found'));
             }
         if(!$is_match_found)
         {
             $age = calculate_days_bw_dates(from_date: $emp_data['dob'])->y;
             $log_message = '[ client_policy_id : ' .$emp_data['policy_details']['client_policy_id'].' - '. $emp_data['emp_code'].' - '.$emp_data['name'] .' - '. $emp_data['policy_details']['basic_cover_si'] . ', Age : '. $age.' ]';
-            if($slab_details['slab_rates'][0]['premium_type'] == 1)
+            if($temp_slab_rates[0]['premium_type'] == 1)
                 { 
                     $log_message .= ' -  skipping, calculating only self..!'; 
                     //reset emp si and others policy level data if premium only for self
@@ -1085,9 +1197,17 @@ if (!function_exists('premium_calculation_manager'))
 
 if (!function_exists('calculate_pro_rata_premimum')) 
 {
-    function calculate_pro_rata_premimum($premium,$days)
+    function calculate_pro_rata_premimum($premium,$employee_policy_coverage_days,$policy_coverage_days)
     {
-        return (float) number_format(($premium / 365) * $days,2,'.','');
+        return (float) number_format(($premium / ($policy_coverage_days) ) * $employee_policy_coverage_days,2,'.','');
+    }
+}
+
+if (!function_exists('no_of_days_in_current_fin_year')) 
+{
+    function no_of_days_in_current_fin_year()
+    {
+        return true;
     }
 }
 
@@ -1226,7 +1346,7 @@ if(!function_exists('get_premium_for_si'))
     {
         foreach ($slab_details['slab_rates'] as $skey => $slab_value) 
         {
-            if($slab_value['si'] == $si_amount && $slab_value['grade'] == $band)
+            if($slab_value['si'] == $si_amount && $slab_value['grade'] == $band && $slab_value['max_si'] == 0)
             {
                 return $slab_value['premium'];
             }
@@ -1297,4 +1417,47 @@ if(!function_exists('check_dup_mobileno'))
         }
         return array('status' => true);
     }
+}
+
+if(!function_exists('generate_family_relationship_array'))
+{
+    function generate_family_relationship_array($family_structure_from_policy_terms) {
+    $family_relationships = [];
+
+    // Add self and spouse
+    if ($family_structure_from_policy_terms['self'] > 0) {
+        $family_relationships[] = 'self';
+    }
+    if ($family_structure_from_policy_terms['spouse'] > 0) {
+        $family_relationships[] = 'spouse';
+    }
+
+    // Add children
+    if ($family_structure_from_policy_terms['childrens'] > 0) {
+        $family_relationships[] = 'son';
+        $family_relationships[] = 'daughter';
+    }
+
+    // Add parents
+    if ($family_structure_from_policy_terms['parents'] > 0) {
+        $family_relationships[] = 'father';
+        $family_relationships[] = 'mother';
+    }
+
+    // Add parents-in-law
+    if ($family_structure_from_policy_terms['parents-in-law'] > 0) {
+        $family_relationships[] = 'father-in-law';
+        $family_relationships[] = 'mother-in-law';
+    }
+
+    // Add either parents or parents-in-law
+    if ($family_structure_from_policy_terms['either-parents-pil'] > 0) {
+        $family_relationships[] = 'father';
+        $family_relationships[] = 'mother';
+        $family_relationships[] = 'father-in-law';
+        $family_relationships[] = 'mother-in-law';
+    }
+
+    return $family_relationships;
+}
 }
\ No newline at end of file
diff --git a/app/Models/InsurerModel.php b/app/Models/InsurerModel.php
index acda3845..6c5d3617 100644
--- a/app/Models/InsurerModel.php
+++ b/app/Models/InsurerModel.php
@@ -18,6 +18,7 @@ class InsurerModel extends Model
         "created_by",
         "updated_by",
         "is_active",
+        "addition_add_day"
     ];
 
 
diff --git a/app/Models/PolicesModel.php b/app/Models/PolicesModel.php
index a56af6bc..8fd138a1 100644
--- a/app/Models/PolicesModel.php
+++ b/app/Models/PolicesModel.php
@@ -39,7 +39,9 @@ class PolicesModel extends Model
     {
 
             $premium_slab_data = null;
+            $additional_premium_slab_data = null;
             $grid_type = null;
+            $additional_grid_type = null;
        
             $policyPremium1Model = new PolicyPremium1Model();
             $premium_slab_data = $policyPremium1Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1])->findAll();
@@ -48,7 +50,12 @@ class PolicesModel extends Model
             {
                 // echo '2';
                 $policyPremium2Model = new PolicyPremium2Model();
-                $premium_slab_data = $policyPremium2Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1])->findAll();
+                $premium_slab_data = $policyPremium2Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1,'rack_rate_type' => 0])->findAll();
+
+                 //check any additional rack rate configured
+                $additional_premium_slab_data = $policyPremium2Model->where(['client_id' => $client_id, 'client_policy_id' => $policy_id, 'is_active' => 1,'rack_rate_type' => 1])->findAll();
+                
+
             }
 
             if(isset($premium_slab_data[0]['policy_grid_id']))
@@ -57,7 +64,14 @@ class PolicesModel extends Model
                 $policyGridModel = new PolicyGridModel();
                 $grid_type = $policyGridModel->find($grid_id);    
             }
-            
-            return ['slab_rates' => $premium_slab_data,'grid_master' => $grid_type];
+            if(isset($additional_premium_slab_data[0]['policy_grid_id']))
+            {
+                $additional_grid_id = $additional_premium_slab_data[0]['policy_grid_id'];
+                $policyGridModel = new PolicyGridModel();
+                $additional_grid_type = $policyGridModel->find($additional_grid_id);    
+            }
+
+
+            return ['slab_rates' => $premium_slab_data,'grid_master' => $grid_type,'additional_slab_info' => ['slab_rates' => $additional_premium_slab_data,'grid_master' => $additional_grid_type]];
     }
 }
diff --git a/tests/unit/PremiumCalculationTest.php b/tests/unit/PremiumCalculationTest.php
new file mode 100644
index 00000000..108358df
--- /dev/null
+++ b/tests/unit/PremiumCalculationTest.php
@@ -0,0 +1,154 @@
+<?php
+
+
+namespace App\Tests;
+
+use CodeIgniter\Test\CIUnitTestCase;
+use Config\App;
+use Config\Services;
+use Tests\Support\Libraries\ConfigReader;
+
+// use App\Helpers\excel_util_helper;
+use Kint\Kint;
+
+class PremiumCalculationTest extends CIUnitTestCase
+{
+    public function testPremiumCalculationWithPrimaryRackRateAndAdditionalRackRate($MY_PARAM = 'TATATATATA')
+    {
+         helper('excel_util_helper');
+          $param = getenv('MY_PARAM');
+         echo isset($param) && $param != NULL ? $param : $MY_PARAM;
+         $additional_relationship = '{"self":0,"spouse":0,"childrens":1,"parents":0,"parents-in-law":0,"either-parents-pil":0}';
+         $primary_grid_id = 11;
+         $additional_grid_id = 10;
+         $primary_grid_type = 2;
+         $addtional_grid_type = 2;
+
+         $primary_max_si = 35000000;
+
+         $slab_details = [ 'slab_rates' =>[ 
+                                         [ 'id' => 322, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 0, 'age_to' => 18, 'grade' => 'A', 'si' => 5000000, 'premium' => 500, 'max_si' => $primary_max_si,'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 323, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 19, 'age_to' => 25, 'grade' => 'B', 'si' => 5000000, 'premium' => 1500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 26, 'age_to' => 35, 'grade' => 'C', 'si' => 5000000, 'premium' => 2000, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 36, 'age_to' => 45, 'grade' => 'D', 'si' => 5000000, 'premium' => 2500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 46, 'age_to' => 55, 'grade' => 'E', 'si' => 5000000, 'premium' => 3000, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 56, 'age_to' => 75, 'grade' => 'F', 'si' => 5000000, 'premium' => 3500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 76, 'age_to' => 85, 'grade' => 'G', 'si' => 5000000, 'premium' => 4000, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 5000000, 'premium' => 4500, 'max_si' => $primary_max_si, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => $primary_max_si, 'premium' => 15000, 'max_si' => 0, 'premium_type' => $primary_grid_type, 'relationship' => null],
+                                          [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $primary_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 30000000, 'premium' => 30000, 'max_si' => 0, 'premium_type' => $primary_grid_type, 'relationship' => null]
+                                      ],
+                            
+                         'grid_master' => ['id' => 4,'policy_type' => 'GMC','ui_type' => $primary_grid_id,'policy_grid_type' => 'Employees + Relationship + max count','is_dependent_allowed' => 1,'max_dependent_age' => 0,'max_dependent_count' => 1,'basicpay' => 0,'emp_band' => 0],
+
+                         'additional_slab_info' => [
+
+                         'slab_rates' =>[ 
+                                         [ 'id' => 322, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 0, 'age_to' => 18, 'grade' => 'A', 'si' => 5000000, 'premium' => 500, 'max_si' => 2500000,'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship ],
+                                         [ 'id' => 323, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 19, 'age_to' => 25, 'grade' => 'B', 'si' => 5000000, 'premium' => 1500, 'max_si' => 2000000, 'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 26, 'age_to' => 35, 'grade' => 'C', 'si' => 5000000, 'premium' => 2000, 'max_si' => 1800000, 'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 36, 'age_to' => 45, 'grade' => 'D', 'si' => 5000000, 'premium' => 2500, 'max_si' => 150000, 'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 46, 'age_to' => 55, 'grade' => 'E', 'si' => 5000000, 'premium' => 3000, 'max_si' => 130000, 'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 56, 'age_to' => 75, 'grade' => 'F', 'si' => 5000000, 'premium' => 3500, 'max_si' => 10, 'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 76, 'age_to' => 85, 'grade' => 'G', 'si' => 5000000, 'premium' => 4000, 'max_si' => 5, 'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship],
+                                         [ 'id' => 324, 'client_id' => 61, 'client_policy_id' => 63, 'policy_grid_id' => $additional_grid_id, 'age_from' => 86, 'age_to' => 100, 'grade' => 'G', 'si' => 5000000, 'premium' => 4500, 'max_si' => 5, 'premium_type' => $addtional_grid_type, 'relationship' => null,'additional_relationship' => $additional_relationship]],
+
+                            'grid_master' => ['id' => 4,'policy_type' => 'GMC','ui_type' => $additional_grid_id,'policy_grid_type' => 'Employees + Relationship + max count','is_dependent_allowed' => 1,'max_dependent_age' => 0,'max_dependent_count' => 1,'basicpay' => 0,'emp_band' => 0]]
+                            ];
+        // Sample family data
+       $family_details = [ 'TEST001' => 
+                            [2,'TEST001','John Doe', '01-Jan-1988', 'M', 'Self', '5000000', NULL, '', '', 'G', '', '', '', '', '', '',''],
+                            [1,'TEST001','Jane Doe', '01-Jan-1985', 'F', 'Spouse', 5000000, '01-Jan-2024', '01-Jan-2020', 50000, 'A', 'Manager', '1234567890', 'john.doe@example.com', '0', '', '', ''],
+                            
+                            [3,'TEST001','Peter Doe', '01-Jan-1955', 'M', 'Father', '', NULL, '', '', '', '', '', '', '', '', '',''],
+                             [4,'TEST001','Mary Doe', '01-Jan-1953', 'F', 'Mother', '', NULL, '', '', '', '', '', '', '', '', '',''],
+                            [5,'TEST001','Grace Doe', '01-Jan-1954', 'F', 'Mother in law', '', NULL, '', '', '', '', '', '', '', '', '',''],
+                            [6,'TEST001','George Doe', '01-Jan-1948', 'M', 'Father in law', '', NULL, '', '', '', '', '', '', '', '', '',''],
+                            [7,'TEST001','Alice Doe', '01-Jan-1990', 'F', 'Daughter', 5000000, '01-Jan-2024', '01-Jan-2024', 40000, 'B', 'Supervisor', '9876543210', '', '', '', '',''],
+                             [6,'TEST001','Bob Doe', '01-Jan-1993', 'M', 'son', '50000', NULL, '', '', '', '', '', '', '', '', '',''],
+                         ];
+
+        // Sample policy terms
+        $policy_terms = [
+            'family_floater' => true,
+            'family_floaters' => [
+                'self' => 1,
+                'childrens' => 2,
+                'spouse' => 1,
+                'either-parents-pil' => 0,
+                'parents' => 2,
+                'parents-in-law' => 2,
+            ],
+        ];
+
+        $policy_details = ['base_policy' => null,"policy_start_date" => "2023-02-02","policy_end_date" => "2024-02-02","policy_terms" => json_encode($policy_terms)];
+       $file = ['id' => null,'client_id' => 10,'policy_id' => 10,'action' => 'inception'];
+       $data = calculate_premimum($family_details,$policy_details,$slab_details,$file);
+       $policy_created_count = 0;
+       echo "\n";
+       $result_to_display = [];
+       foreach ($data as $key => $value) 
+       {
+                  $result_to_display[$key]['emp_code'] = $value['emp_code'];
+                  $result_to_display[$key]['name'] = $value['name'].'('.calculate_days_bw_dates($value['dob'])->y.')';
+                  $result_to_display[$key]['relation'] = $value['relationship'];
+                  $temp_grid = substr($value['temp']['grid_type'],0,1);
+                  $temp_grid_type = ($temp_grid == 'p' ? $primary_grid_type : $addtional_grid_type);
+                  $temp_grid_type = ($temp_grid_type == 1 ? 'S' : 'I');
+                  $result_to_display[$key]['premium_type'] = $temp_grid.'#'.$value['temp']['grid_id'].'#'.
+                  ($value['temp']['additional_rack_rate_acting_self'] == true ? 'Y' : 'N' ) .'#'. ($temp_grid_type) ;
+                  $result_to_display[$key]['si'] = $value['policy_details']['basic_cover_si'];
+                  $result_to_display[$key]['premium'] = $value['policy_details']['premium'];
+                  $result_to_display[$key]['policy days'] = calculate_days_bw_dates($policy_details['policy_start_date'],$policy_details['policy_end_date'])->days;
+                  $result_to_display[$key]['no of days'] = $value['policy_details']['days'];
+                  $result_to_display[$key]['rata_premimum'] = $value['policy_details']['rata_premimum'];
+                  $result_to_display[$key]['gst'] = $value['policy_details']['gst'];
+
+           if(!empty($value['policy_details']['premium'])){ $policy_created_count = $policy_created_count + 1; }
+       }
+     
+        TableDisplay::displayTable($result_to_display);
+        $this->assertTrue(($policy_created_count = 1 || $policy_created_count = 0));
+    }
+
+}
+
+
+class TableDisplay
+{
+    public static function displayTable(array $data)
+    {
+        if (empty($data)) {
+            echo "No data to display.\n";
+            return;
+        }
+
+        // Calculate column widths
+        $columns = array_keys($data[0]);
+        $widths = array_map(function ($col) use ($data) {
+            $maxWidth = strlen($col);
+            foreach ($data as $row) {
+                $maxWidth = max($maxWidth, strlen($row[$col]));
+            }
+            return $maxWidth;
+        }, $columns);
+
+        // Print header
+        echo str_repeat('-', array_sum($widths) + count($columns) * 3) . PHP_EOL;
+        foreach ($columns as $i => $col) {
+            echo str_pad($col, $widths[$i]) . " | ";
+        }
+        echo PHP_EOL;
+        echo str_repeat('-', array_sum($widths) + count($columns) * 3) . PHP_EOL;
+
+        // Print rows
+        foreach ($data as $row) {
+            foreach ($columns as $i => $col) {
+                echo str_pad($row[$col], $widths[$i]) . " | ";
+            }
+
+            echo PHP_EOL;
+        }
+        echo str_repeat('-', array_sum($widths) + count($columns) * 3) . PHP_EOL;
+    }
+}

From 00dd88a6eb3f16c8ba476a152e37f9e2eb94aa76 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Mon, 3 Jun 2024 13:56:47 +0530
Subject: [PATCH 3/7] CHANGE_DATE_DAYS_ISSUE&ADDTION_ENDORSEMENT

---
 app/Controllers/EmployeeRestController.php    |  2 +-
 app/Controllers/EmployeeServiceController.php | 20 ++++++++++++++++++-
 app/Helpers/excel_util_helper.php             |  9 +++++++--
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index c31cabe7..b6fbcf86 100644
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -1372,7 +1372,7 @@ public function getAddOnPolicy()
 
         if(count($clientPolicy))
         {
-        $band =   $addOnEmployeeData = $this->employeeModel->where('is_active', 1 )->where('emp_code',$this->request->getGet('emp_code'))->where('client_id',$this->request->getGet('client_id'))->where('client_branch_id',$this->request->getGet('client_branch_id'))->where('family_floater_key','self')->get()->getRow()->band;
+        $band = $this->employeeModel->where('is_active', 1 )->where('emp_code',$this->request->getGet('emp_code'))->where('client_id',$this->request->getGet('client_id'))->where('client_branch_id',$this->request->getGet('client_branch_id'))->where('family_floater_key','self')->get()->getRow()->band;
         $PolicyData = [];
         foreach ($clientPolicy as $key => $array) {
         $responce = [];
diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index cb6705f4..d1286daa 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -956,7 +956,19 @@ class EmployeeServiceController extends AdminController
 
                     $this->employeePolicyModel->save($policy_data);
                     $emp_policy_id = $this->employeePolicyModel->getInsertID();
-                    if($emp_policy_id != 0){  $log_message .= ' with PK  ' . $emp_policy_id; }
+                    if($emp_policy_id != 0)//emp policy inserted
+                    {  
+                        $log_message .= ' with PK  ' . $emp_policy_id; 
+
+                        //make endorsement entry if action is addition OR Dependt addition
+                        if(($file['action'] == 'dependent_addition' || $file['action'] == 'addition') && $value['temp']['source'] == 'excel')
+                        {
+                            $actions = ($file['action'] == 'dependent_addition' ? 'da' : ($file['action'] == 'addition' ? 'a' : NULL));
+                            $addition_endorse_data = ['pk' => $emp_policy_id,'group_key' => rand(100000, 999999),'emp_cdoe' => $value['emp_code'],'table_name' => 'employee_polices','actions' => $actions,'field_name' => 'basic_cover_si','old_value' => NULL,'new_value' => $policy_data['basic_cover_si'],'remarks' => 'addition endorsement','file_id' => $file['id'],'created_by' => $file['created_by']];
+                            $this->employeeEndorsementforAddtionAndDependentAddition($addition_endorse_data);
+                        }
+
+                    }
                     else{ $emp_policy_id = $employee_policy[0]['id']; }
                     
                     $this->myLogger->logme('error',$log_message);
@@ -965,6 +977,12 @@ class EmployeeServiceController extends AdminController
             }// for end   
     }//function end
 
+
+    public function employeeEndorsementforAddtionAndDependentAddition($employee)
+    {
+         $this->empEndorsementModel->save($employee);
+    }
+
     // $employee -> holds existing emp model obj and $policy_data holds new policy changes as array
     public function employeesSIEnhanceProcessWhileOnbboard(array $employee,array $policy_data,array $file)
     {
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index f48669a8..07794f45 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -7,14 +7,19 @@ use Kint\Kint;
 
 if(!function_exists('calculate_days_bw_dates'))
 {
-    function calculate_days_bw_dates(string $from_date = "", string $to_date ="")
+    function calculate_days_bw_dates(string $from_date = "", string $to_date ="",bool $include_start_date = true)
     {
                     if($to_date == ""){ $currentDateTime = new DateTime(); }
                     else{ $currentDateTime = new DateTime($to_date); }    
                     if($from_date == ""){ $passedDateTime = new DateTime(); }
                     else{ $passedDateTime = new DateTime($from_date); }
                     
-                    return $interval = $currentDateTime->diff($passedDateTime);
+                    $interval = $currentDateTime->diff($passedDateTime);
+                    if ($include_start_date) {
+                            $interval->days += 1;
+                     }
+
+                     return $interval;
     }
 }
 

From 90965f055125e44b94e59a7efe582be69c60d77b Mon Sep 17 00:00:00 2001
From: "venkatesh.r" <venkatesh.r@venbainfotech.com>
Date: Mon, 3 Jun 2024 15:20:15 +0530
Subject: [PATCH 4/7] FIX_INCEPTION_WRONG_FILE_UPLOADED :RV

---
 app/Controllers/EmpDataServiceController.php | 580 ++++++++++++++++++-
 app/Controllers/EmployeeController.php       |   8 +-
 app/Views/batch_list.php                     |   7 +-
 app/Views/employee_data_list.php             | 192 +++---
 4 files changed, 679 insertions(+), 108 deletions(-)

diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 6325255f..f5ade0fb 100644
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -274,6 +274,7 @@ class EmpDataServiceController extends BaseController
 
         $count = count($objects);
         $export_data['count'] = $count;
+        $export_data['status'] = 'success';
         $this->myLogger->logme('error', 'Correction export data count : {data}', ['data' => $count]);
 
         if ($count == 0) {
@@ -533,6 +534,90 @@ class EmpDataServiceController extends BaseController
 
 
 
+    public function generateExcelForAdditionAndDependentAddition($export_data)
+    {
+        $ids = [];
+
+        $objects = $this->employeePolicyModel->getCorrectionEmployeesDataForExportExcel($export_data);
+
+        foreach ($objects as $obj) {
+            $ids[] = $obj->id;
+        }
+
+        $count = count($objects);
+        $export_data['count'] = $count;
+        $export_data['status'] = 'success';
+        $this->myLogger->logme('error', 'Addition And Dependent Addition export data count : {data}', ['data' => $count]);
+
+        if ($count == 0) {
+            $this->myLogger->logme('error', 'No Record found. Endorsement ID Alread Updated.  Correction export data count : {data}', ['data' => $count]);
+            return false;  
+        }
+
+        $this->removeOldExportInfoFromBatchFile($export_data);
+
+
+        $this->myLogger->logme('error', 'Addition And Dependent Addition export file name : {data}', ['data' => $export_data['file_name']]);
+
+        $correction_data = transform_objects_to_array_for_correction($objects);
+
+        $headers = [
+            'Emp Code',
+            'RISK ID',
+            'NAME OF EMP/DEP',
+            'EMP/DEP TYPE',
+            'RELATION',
+            'DOB',
+            'GENDER',
+            'Wrong Data',
+            'Correct Data',
+            'Remarks',
+            'Endorsement_Id'
+        ];
+
+        // Create a temporary file in memory
+        $tempFile = tmpfile();
+
+        // Generate Excel file with the temporary file
+        $value = generate_excel($headers, $correction_data, $tempFile);
+
+        if ($value) {
+
+
+
+            $return = $this->batchFilesAndBatchListEntry($export_data, $objects);
+
+            if ($return) {
+
+                foreach ($ids as $key => $id) {
+                    $group_key = $this->empEndorsementModel->select('group_key')->where('id', $id)->first();
+                    if ($group_key) {
+                        $this->empEndorsementModel->where('group_key', $group_key)->set('status', 'inprogress')->update();
+                    }
+                }
+
+                // Set the appropriate headers for Excel file download
+                header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+                header('Content-Disposition: attachment;filename="' . $export_data['file_name'] . '"');
+                header('Cache-Control: max-age=0');
+
+                // Rewind the temporary file pointer
+                rewind($tempFile);
+
+                // Output the contents of the temporary file to the browser
+                fpassthru($tempFile);
+
+                // Close and remove the temporary file
+                fclose($tempFile);
+
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+
+
     /**
      * The below functions are Imports data from an Excel file for :
      *              - Inception
@@ -583,9 +668,29 @@ class EmpDataServiceController extends BaseController
 
         $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
         $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        $excel_header = $excel_data[0];
         unset($excel_data[0]);
         array_pop($excel_data);
 
+        $inceptionHeader = ['S.No', 'NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATION','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','DATE OF COVERAGE','AGE','RELATIONSHIP','REMARKS','POLICY END DATE','NO OF DAYS','TPA ID','UHID','PREMIUM','PR0 RATA PREMIUM','GST','TOTAL'];
+
+        foreach ($inceptionHeader as $key => $value) {
+            if($excel_header[$key] != $value){
+                $data = [
+                    'status' => 'failed-5',
+                ];
+
+                $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+                $file_data = $this->getDataByFileId($file_id, 'failure');
+                $this->setPullNotification($file_data);
+
+                $this->myLogger->logme('error', 'Inception File Validation --  Upload the worng excel file');
+                return ['status' => 'error', 'message' => 'Upload the worng excel file'];
+            }
+        }
+
+
         $emp_count = count($excel_data);
 
         $employee_data = $this->employeePolicyModel
@@ -1116,7 +1221,6 @@ class EmpDataServiceController extends BaseController
 
 
     //Endorsement Correction
-
     public function importCorrectionValidation($params)
     {
 
@@ -1143,8 +1247,29 @@ class EmpDataServiceController extends BaseController
         }
 
         $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        $excel_header = $excel_data[0];
         unset($excel_data[0]);
 
+        $headers = ['Emp Code','RISK ID','NAME OF EMP/DEP','EMP/DEP TYPE','RELATION','DOB','GENDER','Wrong Data','Correct Data','Remarks','Endorsement_Id'];
+
+
+        foreach ($headers as $key => $value) {
+            if($excel_header[$key] != $value){
+                $data = [
+                    'status' => 'failed-5',
+                ];
+
+                $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+                $file_data = $this->getDataByFileId($file_id, 'failure');
+                $this->setPullNotification($file_data);
+
+                $this->myLogger->logme('error', 'Correction File Validation --  Upload the worng excel file');
+                return ['status' => 'error', 'message' => 'Upload the worng excel file'];
+            }
+        }
+
+
 
         $endorsement_data = $this->empEndorsementModel
             ->select("
@@ -1477,7 +1602,7 @@ class EmpDataServiceController extends BaseController
             if (isset($result['id']) && $result['id'] !== null) {
 
                 // return $result;
-                $emp_details[] = array('id' => $result['emp_id'], 'group_key' => $result['group_key'], $result['field_name'] => $value[8]);
+                $emp_details[] = array('id' => $result['emp_id'], $result['field_name'] => $value[8]);
                 $endorsement_details[] = array('group_key' => $result['group_key'], 'id' => $result['id'], 'endorsement_id' => $value[10], 'status' => 'complete');
             }
 
@@ -1486,7 +1611,7 @@ class EmpDataServiceController extends BaseController
         // return [$emp_details, $endorsement_details];
 
        $this->empEndorsementModel->updateBatch($endorsement_details, 'group_key');
-       $this->employeeModel->updateBatch($emp_details);
+       $this->employeePolicyModel->bulkUpdateForCorrection($emp_details);
 
         // Update batch file status and amount
         $this->batchFileModel->update($file_id, [
@@ -1531,9 +1656,30 @@ class EmpDataServiceController extends BaseController
         }
 
         $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        $excel_header = $excel_data[0];
         unset($excel_data[0]);
 
 
+        $headers = ['S.No','NAME OF EMP/DEP','EMP ID','EMP/DEP TYPE','RELATION','DOB','GENDER','PRE EXISTING AILMENTS','BASIC COVER SI','Old Sum Insured','Date of Coverage','Policy End Date','No Of Days','Old SI Premium','New SI premium','Difference premium','Pro Rata Premium','GST','Total','ENDORSEMENT_ID'];
+
+
+        foreach ($headers as $key => $value) {
+            if($excel_header[$key] != $value){
+                $data = [
+                    'status' => 'failed-5',
+                ];
+
+                $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+                $file_data = $this->getDataByFileId($file_id, 'failure');
+                $this->setPullNotification($file_data);
+
+                $this->myLogger->logme('error', 'SI Enhancement File Validation --  Upload the worng excel file');
+                return ['status' => 'error', 'message' => 'Upload the worng excel file'];
+            }
+        }
+
+
             $db = \Config\Database::connect();
 
             // Raw SQL query
@@ -2113,9 +2259,28 @@ class EmpDataServiceController extends BaseController
         }
 
         $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        $excel_header = $excel_data[0];
         unset($excel_data[0]);
         array_pop($excel_data);
 
+        $headers = ['S.No','EMP ID','EMP NAME','DOB','GENDER','RELATIONSHIP','SUM INSURED','Date of Leaving','Policy End Date','No Of Days','Premium','Pro Rata Premium','GST','Total','Claim Status','ENDORSEMENT_ID'];
+
+
+        foreach ($headers as $key => $value) {
+            if($excel_header[$key] != $value){
+                $data = [
+                    'status' => 'failed-5',
+                ];
+
+                $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+                $file_data = $this->getDataByFileId($file_id, 'failure');
+                $this->setPullNotification($file_data);
+
+                $this->myLogger->logme('error', 'Deletion File Validation --  Upload the worng excel file');
+                return ['status' => 'error', 'message' => 'Upload the worng excel file'];
+            }
+        }
 
         $db = \Config\Database::connect();
 
@@ -2524,17 +2689,17 @@ class EmpDataServiceController extends BaseController
 
         // Check if $employees_table_data is null or empty
         if (empty($employees_table_data)) {
-            return ['error' => true, 'message' => 'Employees table data is empty or null.'];
+            return ['status' => 'error', 'message' => 'Employees table data is empty or null.'];
         }
 
         // Check if $employee_policy_table_data is null or empty
         if (empty($employee_policy_table_data)) {
-            return ['error' => true, 'message' => 'Employee policy table data is empty or null.'];
+            return ['status' => 'error', 'message' => 'Employee policy table data is empty or null.'];
         }
 
         // Check if $emp_endorsement_table_data is null or empty
         if (empty($emp_endorsement_table_data)) {
-            return ['error' => true, 'message' => 'Employee endorsement table data is empty or null.'];
+            return ['status' => 'error', 'message' => 'Employee endorsement table data is empty or null.'];
         }
 
         $this->employeeModel->updateBatch($employees_table_data, 'id');
@@ -2576,6 +2741,403 @@ class EmpDataServiceController extends BaseController
     }
 
 
+
+
+
+    //Endorsement Addition and Dependent Addition
+
+
+    public function AdditionAndDependentAddition($params)
+    {
+
+        $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation --   Function called');
+
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->where('id', $file_id)->first();
+
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
+
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
+
+        if (!file_exists($file_name_with_path)) {
+
+            $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation --   The Physical file not found');
+            $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation --   File Name : {data}', ['data' => $file['file_name']]);
+            $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation --   File Path : {data}', ['data' => $file_name_with_path]);
+
+            return 'The Physical file not found';
+        }
+
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]);
+
+
+        $endorsement_data = $this->empEndorsementModel
+            ->select("
+                                emp_endorsement.id, 
+                                emp_endorsement.pk, 
+                                emp_endorsement.emp_code, 
+                                emp_endorsement.endorsement_id, 
+                                emp_endorsement.old_value, 
+                                emp_endorsement.new_value, 
+                                emp_endorsement.field_name, 
+                                emp_endorsement.remarks, 
+                                emp_endorsement.actions, 
+                                employees.id AS primaryKey, 
+                                employees.name AS emp_name, 
+                                employees.dob AS emp_dob, 
+                                employees.gender AS emp_gender, 
+                                employees.client_id AS emp_client_id, 
+                                'Has Define' AS emp_type,
+                                employee_polices.uhid,
+                                employees.relationship_code
+                            ")
+            ->join("employees", "employees.id = emp_endorsement.pk", "left")
+            ->join("employee_polices", "employees.id = employee_polices.employee_id", "left")
+            ->where("employees.client_id", $client_id)
+            ->where("employee_polices.client_policy_id", $client_policy_id)
+            ->where("employees.client_branch_id", $client_branch_id)
+            ->where("employees.is_active", 1)
+            ->where("employees.emp_status", "active")
+            ->where("emp_endorsement.actions", "c")
+            ->where("(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = '')")
+            ->findAll();
+
+
+
+        // dd($endorsement_data, $excel_data);
+
+
+        if ($endorsement_data == null || empty($endorsement_data)) {
+
+            $data = [
+                'status' => 'failed-1',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'correctionFileValidation ENDORSEMENT ID already updated');
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The list of employees provided has already been updated with the ENDORSEMENT ID, or this is not the correct file';
+
+            $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation ENDORSEMENT ID already updated or the uploadedfile is not correct');
+        }
+
+        $excel_data_count = count($excel_data);
+        $endorsement_data_count = count($endorsement_data);
+
+        $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation excel file count : {data}', ['data' => $excel_data_count]);
+        $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation database count : {data}', ['data' => $endorsement_data_count]);
+
+
+        $difference = $endorsement_data_count - $excel_data_count;
+
+        $status = 'in-progress';
+        if ($excel_data_count < $endorsement_data_count) {
+
+            $status = 'in-progress-partially';
+            $partially_updated_data = 'Expected : ' . $endorsement_data_count . ',  ' . 'Updated : ' . $excel_data_count . ',  ' . 'difference : ' . $difference;
+            $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation excel file count partially : {data}', ['data' => $partially_updated_data]);
+        }
+
+
+
+        if ($endorsement_data_count < $excel_data_count) {
+
+            $data = [
+                'status' => 'failed-3',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'Addition And Dependent Addition File Validation excel file count ( {excel} ) exceeds db count ( {db} )', ['db' => $endorsement_data_count, 'excel' => $excel_data_count]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The Excel record count exceeds the DB record count. excel file count : ' .  $excel_data_count . 'db count : ' .  $endorsement_data_count;
+        }
+
+
+        $errors = []; // Initialize an array to store errors
+        $missing_id = [];
+        $batch_list_id = [];
+
+        foreach ($endorsement_data as $key => $endorsement_value) {
+
+            $key = $key + 1;
+
+            if (!isset($excel_data[$key])) {
+                break;
+            }
+
+
+            if ($excel_data[$key][10] === null) {
+                $missing_id[$key][] = [
+                    'row' => $key,
+                    'column' => 10,
+                ];
+            }
+
+
+            if ($endorsement_value['emp_name'] != $excel_data[$key][2]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 2,
+                    'db_data' => $endorsement_value['emp_name'],
+                    'excel_data' => $excel_data[$key][2]
+                ];
+            }
+
+            if ($endorsement_value['emp_code'] != $excel_data[$key][0]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 0,
+                    'db_data' => $endorsement_value['emp_code'],
+                    'excel_data' => $excel_data[$key][0]
+                ];
+            }
+
+            if ($endorsement_value['emp_dob'] != $excel_data[$key][5]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 5,
+                    'db_data' => $endorsement_value['emp_dob'],
+                    'excel_data' => $excel_data[$key][5]
+                ];
+            }
+
+            if ($endorsement_value['emp_gender'] != $excel_data[$key][6]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 6,
+                    'db_data' => $endorsement_value['emp_gender'],
+                    'excel_data' => $excel_data[$key][6]
+                ];
+            }
+
+            if ($endorsement_value['old_value'] != $excel_data[$key][7]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 7,
+                    'db_data' => $endorsement_value['old_value'],
+                    'excel_data' => $excel_data[$key][7]
+                ];
+            }
+
+            if ($endorsement_value['new_value'] != $excel_data[$key][8]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 8,
+                    'db_data' => $endorsement_value['new_value'],
+                    'excel_data' => $excel_data[$key][8]
+                ];
+            }
+
+
+
+            if ($endorsement_value['uhid'] != $excel_data[$key][1]) {
+                $errors[$key][] = [
+                    'row' => $key,
+                    'column' => 1,
+                    'db_data' => $endorsement_value['uhid'],
+                    'excel_data' => $excel_data[$key][1]
+                ];
+            }
+
+            $batch_list_id[] = $endorsement_value['primaryKey'];
+        }
+
+
+        $error_count = count($errors);
+        $json_errors = json_encode($errors);
+
+
+        $missing_id_count = count($missing_id);
+        $json_missing_id = json_encode($missing_id);
+
+        // dd($error_count, $missing_id_count, $json_errors, $json_missing_id, $batch_list_id);
+
+
+        if ($missing_id_count > 0) {
+
+            $data = [
+
+                'count' => $endorsement_data_count,
+                'error_data' => $json_missing_id,
+                'status' => 'failed',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'The ENDORSEMENT ID column is either partially or entirely empty.';
+           
+        }
+
+
+        if ($error_count > 0) {
+
+            $data = [
+
+                'count' => $endorsement_data_count,
+                'error_data' => $json_errors,
+                'status' => 'failed',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            return 'Correction Validation Failed';
+
+        } else {
+
+            $data = [
+                'count' => $endorsement_data_count,
+                'status' => $status,
+                'error_data' => $partially_updated_data ?? null,
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+
+
+            foreach ($batch_list_id as $key => $value) {
+
+                $data = [
+                    'emp_policy_id' => $value,
+                    'batch_code' => $batch_code,
+                    'created_by' => $user_id,
+                ];
+
+                $insert = $this->batchListModel->insert($data);
+            }
+
+
+            $job_details  = new Jobs();                             
+            $r = Jobs::addJob(['job_name' => 'importAdditionAndDependentAdditionUpdateEndorsementID','payload' => ['file_id' => $file_id]]);
+
+            // $this->importAdditionAndDependentAdditionUpdateEndorsementID(['file_id' => $file_id]);
+
+            return 'Correction Validation Success';
+        }
+    }
+
+
+    public function importAdditionAndDependentAdditionUpdateEndorsementID($params){
+
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID called');
+
+        $file_id = $params['file_id'];
+        $file = $this->batchFileModel->find($file_id);
+        if (!$file) {
+
+            $data = [
+                'status' => 'failed-4',
+            ];
+
+            $this->batchFileModel->where('id', $file_id)->set($data)->update();
+            $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID the Physical file not found - file id : {data}', ['data' => $file_id]);
+
+            $file_data = $this->getDataByFileId($file_id, 'failure');
+            $this->setPullNotification($file_data);
+
+            return 'importCorrectionUpdateEndorsementID the Physical file not found'; // Return error code if file not found
+        }
+
+        $client_id = $file['client_id'];
+        $client_policy_id = $file['client_policy_id'];
+        $client_branch_id = $file['client_branch_id'];
+        $insurer_or_tpa = $file['insurer_or_tpa'];
+        $status = $file['status'];
+        $batch_code = $file['batch_code'];
+        $user_id = $file['created_by'];
+
+
+        $status_val = 'success';
+        if ($status == 'in-progress-partially') {
+
+            $status_val = 'partially success';
+        }
+
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID  file name : {data}', ['data'=> $file['file_name']]);
+
+        $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name'];
+        $excel_data = $this->readExcelFileToArray($file_name_with_path);
+        unset($excel_data[0]); 
+
+        $emp_ids = [];
+        $emp_details = [];
+        $endorsement_id = [];
+        $endorsement_details = [];
+
+        $emp_count = count($excel_data);
+        $db = \Config\Database::connect();
+
+
+        foreach ($excel_data as $key => $value) {
+
+            $emp_code = $value[0];
+            $old_value = $value[7];
+            $endorsement_id[] = $value[10];
+            $uhid = $value[1];
+
+
+            $result =  $this->empEndorsementModel
+            ->select('emp_endorsement.*, employees.id as emp_id')
+            ->join('employees', 'employees.id = emp_endorsement.pk')
+            ->join('employee_polices', 'employee_polices.employee_id = employees.id')
+            ->where('employees.emp_code', $emp_code)
+            ->where('employees.client_id', $client_id)
+            ->where('employees.client_branch_id', $client_branch_id)
+            ->where('employee_polices.client_policy_id', $client_policy_id)
+            ->where('employee_polices.uhid', $uhid)
+            ->where('emp_endorsement.old_value', $old_value)
+            
+            ->where('employee_polices.is_active', 1)
+            ->where('employee_polices.status', 'active')
+            ->where('employees.is_active', 1)
+            ->where('employees.emp_status', 'active')
+            ->first();
+
+            if (isset($result['id']) && $result['id'] !== null) {
+
+                // return $result;
+                $emp_details[] = array('id' => $result['emp_id'], $result['field_name'] => $value[8]);
+                $endorsement_details[] = array('group_key' => $result['group_key'], 'id' => $result['id'], 'endorsement_id' => $value[10], 'status' => 'complete');
+            }
+
+        }
+
+        // return [$emp_details, $endorsement_details];
+
+       $this->empEndorsementModel->updateBatch($endorsement_details, 'group_key');
+       $this->employeePolicyModel->bulkUpdateForCorrection($emp_details);
+
+        // Update batch file status and amount
+        $this->batchFileModel->update($file_id, [
+            'count' => $emp_count,
+            'status' =>  $status_val,
+        ]);
+
+
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID  employee count : {data}', ['data'=> $emp_count]);
+        $this->myLogger->logme('error', 'importCorrectionUpdateEndorsementID  batch file status : {data}', ['data'=> $status_val]);
+
+
+        $file_data = $this->getDataByFileId($file_id, 'success');
+        $this->setPullNotification($file_data);
+
+
+        return 'Import Correction Updated '. $status_val . '- Updated Count : ' . $emp_count;
+
+    }
+
+
     /**
      * The below functions are Calculates and records cash deposits for employee policies at inception.
      * 
@@ -2601,7 +3163,7 @@ class EmpDataServiceController extends BaseController
                 ")->getRow();
 
             $insurer_id = $this->clientPolicyModel->where('id', $arrayData['client_policy_id'])->first();
-            $description = 'The following amount of Rs. ' . $amount->total_sum . '/- has been debited for the ' . $arrayData['count'] . ' employees at ' . remove_underscore_capitalize_first_letter($arrayData['event']) . ' to ' . remove_underscore_capitalize_first_letter($arrayData['policy_name']) . '.';
+            $description = 'The following amount of Rs. ' . round($amount->total_sum, 2) . '/- has been debited for the ' . $arrayData['count'] . ' employees at ' . remove_underscore_capitalize_first_letter($arrayData['event']) . ' to ' . remove_underscore_capitalize_first_letter($arrayData['policy_name']) . '.';
             
             if(get_session_userid() == null){
 
@@ -2643,7 +3205,7 @@ class EmpDataServiceController extends BaseController
             ")->getRow();
 
             $insurer_id = $this->clientPolicyModel->where('id', $arrayData['client_policy_id'])->first();
-            $description = 'The following amount of ' . $amount->total_sum . ' has been credited for the ' . $arrayData['count'] . ' employees at ' . remove_underscore_capitalize_first_letter($arrayData['event']) . ' to ' . remove_underscore_capitalize_first_letter($arrayData['policy_name']) . '.';
+            $description = 'The following amount of ' . round($amount->total_sum, 2) . ' has been credited for the ' . $arrayData['count'] . ' employees at ' . remove_underscore_capitalize_first_letter($arrayData['event']) . ' to ' . remove_underscore_capitalize_first_letter($arrayData['policy_name']) . '.';
 
             $data = [
 
@@ -2683,7 +3245,7 @@ class EmpDataServiceController extends BaseController
                 ")->getRow();
 
             $insurer_id = $this->clientPolicyModel->where('id', $arrayData['client_policy_id'])->first();
-            $description = 'The following amount of ' . $amount->total_sum . ' has been credited for the ' . $arrayData['count'] . ' employees at ' . remove_underscore_capitalize_first_letter($arrayData['event']) . ' to ' . remove_underscore_capitalize_first_letter($arrayData['policy_name']) . '.';
+            $description = 'The following amount of ' . round($amount->total_sum, 2) . ' has been credited for the ' . $arrayData['count'] . ' employees at ' . remove_underscore_capitalize_first_letter($arrayData['event']) . ' to ' . remove_underscore_capitalize_first_letter($arrayData['policy_name']) . '.';
 
             $data = [
 
diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index feba609b..3fe30e10 100644
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -473,7 +473,7 @@ class EmployeeController extends AdminController
                 // $return = $empDataServiceController->importInceptionFileValidation(['file_id' => $file_id]);
 
                 if ($return == 1) {
-                    session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
+                    session()->setFlashdata('success', 'File Uploaded Successfully File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
                 } else {
                     session()->setFlashdata($return['status'], $return['message']);
@@ -491,7 +491,7 @@ class EmployeeController extends AdminController
                 // $return = $empDataServiceController->importCorrectionValidation(['file_id' => $file_id]);
 
                 if ($return == 1) {
-                    session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
+                    session()->setFlashdata('success', 'File Uploaded Successfully File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
                 } else {
                     session()->setFlashdata('error', $return);
@@ -510,7 +510,7 @@ class EmployeeController extends AdminController
                 // $return = $empDataServiceController->importSIEnhancementValidation(['file_id' => $file_id]);
 
                 if ($return == 1) {
-                    session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
+                    session()->setFlashdata('success', 'File Uploaded Successfully File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
                 } else {
                     session()->setFlashdata('error', $return);
@@ -529,7 +529,7 @@ class EmployeeController extends AdminController
 
 
                 if ($return == 1) {
-                    session()->setFlashdata('success', 'Data updated successfully. File is being validated.');
+                    session()->setFlashdata('success', 'File Uploaded Successfully File is being validated.');
                     return redirect()->to(base_url('employee/upload'));
                 } else {
                     session()->setFlashdata('error', $return);
diff --git a/app/Views/batch_list.php b/app/Views/batch_list.php
index 04b52ec6..e55bc755 100644
--- a/app/Views/batch_list.php
+++ b/app/Views/batch_list.php
@@ -79,11 +79,11 @@
                                 <?php } else if ($file['status'] == 'failed-1') { ?>
                                 failed <a class="fe-alert-circle" style="color: #000;" data-toggle="tooltip"
                                     data-placement="top"
-                                    title="The list of employees provided has already been updated with the TPA ID."></a>
+                                    title="<?= $file['event_type'] == 'inception' ? 'The list of employees provided has already been updated with the TPA ID.' : 'The list of employees provided has already been updated with the ENDORSEMENT ID.' ?> "></a>
                                 <?php } else if ($file['status'] == 'failed-2') { ?>
                                 failed <a class="fe-alert-circle" style="color: #000;" data-toggle="tooltip"
                                     data-placement="top"
-                                    title="The list of employees provided has already been updated with the UHID."></a>
+                                    title="<?= $file['event_type'] == 'inception' ? 'The list of employees provided has already been updated with the UHID.' : 'The list of employees provided has already been updated with the ENDORSEMENT ID.' ?>"></a>
                                 <?php } else if ($file['status'] == 'failed-3') { ?>
                                 failed <a class="fe-alert-circle" style="color: #000;" data-toggle="tooltip"
                                     data-placement="top"
@@ -91,6 +91,9 @@
                                 <?php } else if ($file['status'] == 'failed-4') { ?>
                                 failed <a class="fe-alert-circle" style="color: #000;" data-toggle="tooltip"
                                     data-placement="top" title="Physical File Not Found."></a>
+                                <?php } else if ($file['status'] == 'failed-5') { ?>
+                                failed <a class="fe-alert-circle" style="color: #000;" data-toggle="tooltip"
+                                    data-placement="top" title="Wrong File Uploaded"></a>
                                 <?php } else {  ?>
                                 <?php echo $file['status']; ?>
                                 <?php }   ?>
diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php
index 2e3be7b9..f1f3d935 100644
--- a/app/Views/employee_data_list.php
+++ b/app/Views/employee_data_list.php
@@ -20,6 +20,10 @@
     border-radius: .25rem;
     transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
 }
+
+.table-responsive {
+    overflow-x: auto;
+}
 </style>
 
 <div class="row" id="client_list">
@@ -32,103 +36,105 @@
                     </div>
 
                 </div>
-                <table class="table table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
-                    id="tickets-table">
-                    <thead class="bg-light">
-                        <tr>
-                            <th class="font-weight-medium">SNO</th>
-                            <!-- <th class="font-weight-medium">Employee code</th> -->
-                            <th class="font-weight-medium">Name/code</th>
-                            <th class="font-weight-medium">Policy name</th>
-                            <th class="font-weight-medium">Insurer <br> name</th>
-                            <th class="font-weight-medium">TPA ID</th>
-                            <th class="font-weight-medium">UHID</th>
-                            <th class="font-weight-medium">Policy <br> status</th>
-                            <th class="font-weight-medium">(₹)Sum Insured</th>
-                            <th class="font-weight-medium">(₹)Premium</th>
-                            <th class="font-weight-medium" id="rata_premium" data-toggle="tooltip" data-placement="top">
-                                (₹)Pro Rata <br> Premium</th>
-                            <th class="font-weight-medium" id="gst" data-toggle="tooltip" data-placement="top">(₹)GST
-                            </th>
-                            <!-- <th class="font-weight-medium">Action</th> -->
-                        </tr>
-                    </thead>
+                <div class="table-responsive">
+                    <table class="table table-hover m-0 table-centered dt-responsive nowrap w-100" cellspacing="0"
+                        id="tickets-table">
+                        <thead class="bg-light">
+                            <tr>
+                                <th class="font-weight-medium">SNO</th>
+                                <!-- <th class="font-weight-medium">Employee code</th> -->
+                                <th class="font-weight-medium">Name/code</th>
+                                <th class="font-weight-medium">Policy name</th>
+                                <th class="font-weight-medium">Insurer <br> name</th>
+                                <th class="font-weight-medium">TPA ID</th>
+                                <th class="font-weight-medium">UHID</th>
+                                <th class="font-weight-medium">Policy <br> status</th>
+                                <th class="font-weight-medium">(₹)Sum Insured</th>
+                                <th class="font-weight-medium">(₹)Premium</th>
+                                <th class="font-weight-medium" id="rata_premium" data-toggle="tooltip" data-placement="top">
+                                    (₹)Pro Rata <br> Premium</th>
+                                <th class="font-weight-medium" id="gst" data-toggle="tooltip" data-placement="top">(₹)GST
+                                </th>
+                                <!-- <th class="font-weight-medium">Action</th> -->
+                            </tr>
+                        </thead>
 
-                    <tbody class="font-12">
-                        <?php 
-                        if(isset($employees))
-                        {
-                        foreach ($employees as $key => $employee) { ?>
+                        <tbody class="font-12">
+                            <?php 
+                            if(isset($employees))
+                            {
+                            foreach ($employees as $key => $employee) { ?>
 
-                        <tr>
-                            <td><b><?php echo ($key + 1)?></b></td>
-                            <td><?php echo $employee['name']?>( <?php echo $employee['emp_code']?> -
-                                <?php echo $employee['relationship']?> )</td>
-                            <td><?php echo $employee['policy_name']?></td>
-                            <td><?php echo $employee['insurer_short_name']?></td>
-                            <td><?php echo $employee['tpa_id']?></td>
-                            <td><?php echo $employee['uhid']?></td>
-                            <td>
-                                <?php 
-                                if ($employee['status'] == 'draft') { 
-                                    echo '<span class="badge badge-secondary">' . $employee['status'] . '</span>';
-                                } elseif ($employee['status'] == 'active') {
-                                    echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
-                                } elseif ($employee['status'] == 'inactive') {
-                                    echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
-                                }elseif ($employee['status'] == 'expired') {
-                                    echo '<span class="badge badge-danger">' . $employee['status'] . '</span>';
-                                }elseif ($employee['status'] == 'enrolled') {
-                                    echo '<span class="badge2 badge2-secondary2">' . $employee['status'] . '</span>';
-                                }else{
-                                    echo $employee['status'];
-                                }
-                                ?>
-                            </td>
-                            <td class="indian-number"> <?php echo $employee['basic_cover_si']?> </td>
-                            <td class="indian-number"><?php echo $employee['premium']?></td>
-                            <td class="indian-number"><?php echo $employee['rata_premimum']?></td>
-                            <td class="indian-number"><?php echo $employee['gst']?></td>
-                            <!-- <td>
-                                <div class="btn-group dropdown">
-                                    <a href="javascript: void(0);"
-                                        class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"
-                                        aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
-                                    <div class="dropdown-menu dropdown-menu-right">
-                                        <a class="dropdown-item" href="#"><i
-                                                class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
-                                            Ticket</a>
-                                        <a class="dropdown-item" href="#"><i
-                                                class="mdi mdi-check-all mr-2 text-muted font-18 vertical-middle"></i>Close</a>
-                                        <a class="dropdown-item" href="#"><i
-                                                class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Remove</a>
-                                        <a class="dropdown-item" href="#"><i
-                                                class="mdi mdi-star mr-2 font-18 text-muted vertical-middle"></i>Mark as
-                                            Unread</a>
+                            <tr>
+                                <td><b><?php echo ($key + 1)?></b></td>
+                                <td><?php echo $employee['name']?>( <?php echo $employee['emp_code']?> -
+                                    <?php echo $employee['relationship']?> )</td>
+                                <td><?php echo $employee['policy_name']?></td>
+                                <td><?php echo $employee['insurer_short_name']?></td>
+                                <td><?php echo $employee['tpa_id']?></td>
+                                <td><?php echo $employee['uhid']?></td>
+                                <td>
+                                    <?php 
+                                    if ($employee['status'] == 'draft') { 
+                                        echo '<span class="badge badge-secondary">' . $employee['status'] . '</span>';
+                                    } elseif ($employee['status'] == 'active') {
+                                        echo '<span class="badge badge-success">' . $employee['status'] . '</span>';
+                                    } elseif ($employee['status'] == 'inactive') {
+                                        echo '<span class="badge badge-warning">' . $employee['status'] . '</span>';
+                                    }elseif ($employee['status'] == 'expired') {
+                                        echo '<span class="badge badge-danger">' . $employee['status'] . '</span>';
+                                    }elseif ($employee['status'] == 'enrolled') {
+                                        echo '<span class="badge2 badge2-secondary2">' . $employee['status'] . '</span>';
+                                    }else{
+                                        echo $employee['status'];
+                                    }
+                                    ?>
+                                </td>
+                                <td class="indian-number"> <?php echo $employee['basic_cover_si']?> </td>
+                                <td class="indian-number"><?php echo $employee['premium']?></td>
+                                <td class="indian-number"><?php echo $employee['rata_premimum']?></td>
+                                <td class="indian-number"><?php echo $employee['gst']?></td>
+                                <!-- <td>
+                                    <div class="btn-group dropdown">
+                                        <a href="javascript: void(0);"
+                                            class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"
+                                            aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                        <div class="dropdown-menu dropdown-menu-right">
+                                            <a class="dropdown-item" href="#"><i
+                                                    class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
+                                                Ticket</a>
+                                            <a class="dropdown-item" href="#"><i
+                                                    class="mdi mdi-check-all mr-2 text-muted font-18 vertical-middle"></i>Close</a>
+                                            <a class="dropdown-item" href="#"><i
+                                                    class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Remove</a>
+                                            <a class="dropdown-item" href="#"><i
+                                                    class="mdi mdi-star mr-2 font-18 text-muted vertical-middle"></i>Mark as
+                                                Unread</a>
+                                        </div>
                                     </div>
-                                </div>
-                            </td> -->
-                        </tr>
-                        <?php }}?>
+                                </td> -->
+                            </tr>
+                            <?php }}?>
 
-                    </tbody>
-                    <tfoot>
-                        <tr>
-                            <th></th>
-                            <th></th>
-                            <th></th>
-                            <th></th>
-                            <th></th>
-                            <th></th>
-                            <th></th>
-                            <th></th>
-                            <th>Total</th>
-                            <th class="indian-number"></th>
-                            <th class="indian-number"></th>
-                            <th></th>
-                        </tr>
-                    </tfoot>
-                </table>
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th></th>
+                                <th>Total</th>
+                                <th class="indian-number"></th>
+                                <th class="indian-number"></th>
+                                <th></th>
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
             </div>
         </div>
     </div><!-- end col -->

From aa58354611f603cb3da6e050fe016ccacaa5a0a8 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Tue, 4 Jun 2024 09:08:39 +0530
Subject: [PATCH 5/7] FIX_SI_ENHANCECMENT_AGESLAB

---
 app/Helpers/excel_util_helper.php | 40 ++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 07794f45..200ada56 100644
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -199,35 +199,43 @@ if(!function_exists('check_si'))
 
                     if(!$is_si_found && $slab_value['si'] == $received_si) //match si amount
                     {
+                        // echo 'found';
                         $is_si_found = true;
                     }
 
                     // check age slab 
-                    if($row[3] != null && DateTime::createFromFormat('d-M-Y', $row[3]) !== false)// dob
+                    if(in_array(strtoupper($row['current_action']), ['I','A','DA']))
                     {
-                        $dob = change_date_format($row[3],'d-M-Y','Y-m-d');
-                        // echo $row[3].' - '.$dob;echo '<br>';
-                        $currentDateTime = new DateTime();//die();
-                        $passedDateTime = new DateTime($dob);
-                        $interval = $currentDateTime->diff($passedDateTime);
-                        if(!$is_age_slab_found)
+                        if($row[3] != null && DateTime::createFromFormat('d-M-Y', $row[3]) !== false)// dob
                         {
-                            if(isset($slab_value['age_from']) && isset($slab_value['age_to']))
+                            $dob = change_date_format($row[3],'d-M-Y','Y-m-d');
+                            // echo $row[3].' - '.$dob;echo '<br>';
+                            $currentDateTime = new DateTime();//die();
+                            $passedDateTime = new DateTime($dob);
+                            $interval = $currentDateTime->diff($passedDateTime);
+                            if(!$is_age_slab_found)
                             {
-                                if($slab_value['age_from'] !== null && $slab_value['age_to'] !== null && $slab_value['age_from'] <= $interval->y &&  $slab_value['age_to'] >= $interval->y && $slab_value['si'] == $received_si)
+                                if(isset($slab_value['age_from']) && isset($slab_value['age_to']))
                                 {
-                                    $is_age_slab_found = true;// send true if age slab found
+                                    if($slab_value['age_from'] !== null && $slab_value['age_to'] !== null && $slab_value['age_from'] <= $interval->y &&  $slab_value['age_to'] >= $interval->y && $slab_value['si'] == $received_si)
+                                    {
+                                        $is_age_slab_found = true;// send true if age slab found
+                                    }
                                 }
+                                else
+                                {
+                                    $is_age_slab_found = true;// send true if age conditin is not applicable
+                                }                        
+                                
                             }
-                            else
-                            {
-                                $is_age_slab_found = true;// send true if age conditin is not applicable
-                            }                        
-                            
                         }
                         
+                    }
+                    else
+                    {
+                        $is_age_slab_found = true;// send true if age conditin is not applicable
                     }//end of check age slab 
-                }
+                }// end of for loop
 
         }
         

From 91343c736c82cb7ace4ca6a470f663e76e774df5 Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Tue, 4 Jun 2024 09:37:24 +0530
Subject: [PATCH 6/7] FIX_SI_ENHANEMENT_ISSUE_IN_DATA_VALIDATION

---
 app/Controllers/EmployeeServiceController.php | 194 +++++++++---------
 1 file changed, 99 insertions(+), 95 deletions(-)

diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index d1286daa..6b91ceb8 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -349,110 +349,114 @@ class EmployeeServiceController extends AdminController
         unset($excel_data[0]);
         $relationship = $this->general_relationships;
 
-        $employee_data_group_by_family = data_group_by_family($excel_data);
 
-         $is_self_available_in_policy_terms = false;
-        if($policy_details['policy_type_id'] == 3) // GMC parents
+        if(in_array($file['action'],['inception','addition','dependent_addition']))// the below funcitons are only for I,DA,A
         {
-            $temp = $policy_terms['family_floaters'];
-            $temp = is_array($temp) ? $temp : (is_object($temp) ? (array)$temp : []);
-            $is_self_available_in_policy_terms = isset($temp['self']) ? true : false;
-        }
-        // dd($employee_data_group_by_family);
-            foreach ($employee_data_group_by_family as $emp_id => $family) 
-            {
+                $employee_data_group_by_family = data_group_by_family($excel_data);
 
-                //if action is DA then get all familiy members,transfrom them into excel array, addd data source as db or excel
-                if($file['action'] == 'dependent_addition')
-                {
-                    $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status:['active'],client_branch_id:[ $file['client_branch_id'] ]);
-                    // dd(($existing_famility_details));
-                    //transsform familiy details from db columns to exxcel row with column indexs for checking remaining functionalitites
-                    $existing_famility_details = transform_db_data_to_excel($existing_famility_details,$file);
-                    // dd(array_keys($existing_famility_details[0]));
-                     $family = array_merge($family,$existing_famility_details);
-                     // kint::dump($family);
-                     $family = data_group_by_family($family)[ $emp_id ];// reason to call this again is bring self to first index of the array
-                }
-                // kint::dump($family);//die();
-                //check name dup within a family
-
-                if($file['action'] == 'inception' || $file['action'] == 'addition' || $file['action'] == 'dependent_addition')
-                {
-                    $res = name_dup_check_within_family($family,$file['action']);//in both file data & DB data
-                    // dd($res);
-                    if(count($res))
+                     $is_self_available_in_policy_terms = false;
+                    if($policy_details['policy_type_id'] == 3) // GMC parents
                     {
-                        foreach($res as $k => $rowid)
+                        $temp = $policy_terms['family_floaters'];
+                        $temp = is_array($temp) ? $temp : (is_object($temp) ? (array)$temp : []);
+                        $is_self_available_in_policy_terms = isset($temp['self']) ? true : false;
+                    }
+                    // dd($employee_data_group_by_family);
+                        foreach ($employee_data_group_by_family as $emp_id => $family) 
                         {
-                            array_push($result['error_summary'],7); // dup entry in excel file
-                            $result['error_data'][$rowid]['name_of_emp_dep']['error'][] = "Twofold Name found within family";
-                        }
-                    }
-                }
 
-                //check self availbale in uploaded file
-                if(($file['action'] == 'inception' || $file['action'] == 'addition') && ($policy_details['policy_type_id'] == 3 && $is_self_available_in_policy_terms)) // 3 is GMC parents dep addon)
-                {
-                    // dd('file check');
-                    $res = check_self_available_in_family($family,$file['action']);
-                    // dd($res);
-                    if(!$res['is_self_found'])
-                    {
-                            array_push($result['error_summary'],14); // Self not found
-                            $result['error_data'][ $res['row_id'] ]['sno']['error'][] = "Self not found in uploaded file";
-                    }
-                }
+                            //if action is DA then get all familiy members,transfrom them into excel array, addd data source as db or excel
+                            if($file['action'] == 'dependent_addition')
+                            {
+                                $existing_famility_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],client_policy_id: $file ['policy_id'],emp_status: ['active'],policy_status:['active'],client_branch_id:[ $file['client_branch_id'] ]);
+                                // dd(($existing_famility_details));
+                                //transsform familiy details from db columns to exxcel row with column indexs for checking remaining functionalitites
+                                $existing_famility_details = transform_db_data_to_excel($existing_famility_details,$file);
+                                // dd(array_keys($existing_famility_details[0]));
+                                 $family = array_merge($family,$existing_famility_details);
+                                 // kint::dump($family);
+                                 $family = data_group_by_family($family)[ $emp_id ];// reason to call this again is bring self to first index of the array
+                            }
+                            // kint::dump($family);//die();
+                            //check name dup within a family
 
-                //check self avaialbe  either same policy DB level(i.e.) gMC parents
-                if($file['action'] == 'dependent_addition' || ($policy_details['policy_type_id'] == 3 && !$is_self_available_in_policy_terms)) // 3 is GMC parents as base policy not as dep addon)
-                {
-                   $self_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],emp_status: ['active'],policy_status:['active'],client_branch_id:[ $file['client_branch_id'] ]);
-                   // dd($self_details);
-                    if(!count($self_details))
-                    {
-                            array_push($result['error_summary'],14); // Self not found
-                            $result['error_data'][ $family[0][0] ]['sno']['error'][] = "Self not found in System";
-                    }
-                }
-               
+                            if($file['action'] == 'inception' || $file['action'] == 'addition' || $file['action'] == 'dependent_addition')
+                            {
+                                $res = name_dup_check_within_family($family,$file['action']);//in both file data & DB data
+                                // dd($res);
+                                if(count($res))
+                                {
+                                    foreach($res as $k => $rowid)
+                                    {
+                                        array_push($result['error_summary'],7); // dup entry in excel file
+                                        $result['error_data'][$rowid]['name_of_emp_dep']['error'][] = "Twofold Name found within family";
+                                    }
+                                }
+                            }
 
-               if($file['action'] == 'dependent_addition' || $file['action'] == 'addition' || $file['action'] == 'inception')
-                {
-                    $res = check_dependent_conflict($family,$policy_terms,$file['action']);
-                    // dd($res);
-                    if(!$res['status'])
-                    {
-                        foreach($res['error_data'] as $key => $value)
-                        {
-                            array_push($result['error_summary'],$value['code']); 
-                            $result['error_data'][ $value['row_id'] ][($value['col_name'])]['error'][] = $value['msg'];
-                        }
-                    }
-                }
+                            //check self availbale in uploaded file
+                            if(($file['action'] == 'inception' || $file['action'] == 'addition') && ($policy_details['policy_type_id'] == 3 && $is_self_available_in_policy_terms)) // 3 is GMC parents dep addon)
+                            {
+                                // dd('file check');
+                                $res = check_self_available_in_family($family,$file['action']);
+                                // dd($res);
+                                if(!$res['is_self_found'])
+                                {
+                                        array_push($result['error_summary'],14); // Self not found
+                                        $result['error_data'][ $res['row_id'] ]['sno']['error'][] = "Self not found in uploaded file";
+                                }
+                            }
 
-                //check dup with empid and name with db 
-                $res = name_and_empid_check_in_db($family,$file);
-                // dd($res);
-                // echo '<br/>';
-                // print_r($res);
-                if(count($res['del']))
-                {
-                    foreach($res['del'] as $k => $rowid)
-                    {
-                        array_push($result['error_summary'],10); //record not avail for deletion
-                        $result['error_data'][$rowid]['name_of_emp_dep']['error'][] = "Record Not found ";
-                    }
-                }
-                if(count($res['i']))
-                {
-                    foreach($res['i'] as $k => $rowid)
-                    {
-                        array_push($result['error_summary'],9); //dup entry
-                        $result['error_data'][$rowid]['name_of_emp_dep']['error'][] = "Record already exists";
-                    }
-                }
-            }
+                            //check self avaialbe  either same policy DB level(i.e.) gMC parents
+                            if($file['action'] == 'dependent_addition' || ($policy_details['policy_type_id'] == 3 && !$is_self_available_in_policy_terms)) // 3 is GMC parents as base policy not as dep addon)
+                            {
+                               $self_details = $this->employeeModel->getEmpFamilybyEmpCode(emp_code: $emp_id,client_id: $file['client_id'],emp_status: ['active'],policy_status:['active'],client_branch_id:[ $file['client_branch_id'] ]);
+                               // dd($self_details);
+                                if(!count($self_details))
+                                {
+                                        array_push($result['error_summary'],14); // Self not found
+                                        $result['error_data'][ $family[0][0] ]['sno']['error'][] = "Self not found in System";
+                                }
+                            }
+                           
+
+                           if($file['action'] == 'dependent_addition' || $file['action'] == 'addition' || $file['action'] == 'inception')
+                            {
+                                $res = check_dependent_conflict($family,$policy_terms,$file['action']);
+                                // dd($res);
+                                if(!$res['status'])
+                                {
+                                    foreach($res['error_data'] as $key => $value)
+                                    {
+                                        array_push($result['error_summary'],$value['code']); 
+                                        $result['error_data'][ $value['row_id'] ][($value['col_name'])]['error'][] = $value['msg'];
+                                    }
+                                }
+                            }
+
+                            //check dup with empid and name with db 
+                            $res = name_and_empid_check_in_db($family,$file);
+                            // dd($res);
+                            // echo '<br/>';
+                            // print_r($res);
+                            if(count($res['del']))
+                            {
+                                foreach($res['del'] as $k => $rowid)
+                                {
+                                    array_push($result['error_summary'],10); //record not avail for deletion
+                                    $result['error_data'][$rowid]['name_of_emp_dep']['error'][] = "Record Not found ";
+                                }
+                            }
+                            if(count($res['i']))
+                            {
+                                foreach($res['i'] as $k => $rowid)
+                                {
+                                    array_push($result['error_summary'],9); //dup entry
+                                    $result['error_data'][$rowid]['name_of_emp_dep']['error'][] = "Record already exists";
+                                }
+                            }
+                        }// end of foreach
+        }// end of if current action I,DA,A
 
                 // s($result);
                 // die();

From 3bf97184339b023984ca81190333aca09e9b292f Mon Sep 17 00:00:00 2001
From: velz <velmurugan.s@venbainfotech.com>
Date: Tue, 4 Jun 2024 11:26:59 +0530
Subject: [PATCH 7/7] FIX_SI_ENHANCEMENT_PK_ISSUE

---
 app/Controllers/EmployeeServiceController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index 6b91ceb8..929ce04f 100644
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -861,9 +861,9 @@ class EmployeeServiceController extends AdminController
                     if($slab_value['si'] == $row[3])
                     {
                         $group_key = rand(100000, 999999);
-                        $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'basic_cover_si','old_value' => $employee_policy['basic_cover_si'],'new_value' => $row[3],'created_by' => $file['created_by'],'remarks' => 'general si enhancement','group_key' => $group_key,'file_id' => $file['id']]);
-                        $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'premium','old_value' => $employee_policy['premium'],'new_value' => $slab_value['premium'],'created_by' => $file['created_by'],'remarks' => 'general si enhancement','group_key' => $group_key,'file_id' => $file['id']]);
-                        $this->empEndorsementModel->save(['pk' => (int)$employee['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'si_enhancement_date','old_value' => null,'new_value' => change_date_format($row[4],'d-M-Y','Y-m-d'),'created_by' => $file['created_by'],'remarks' => 'general si enhancement','group_key' => $group_key,'file_id' => $file['id']]);
+                        $this->empEndorsementModel->save(['pk' => (int)$employee_policy['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'basic_cover_si','old_value' => $employee_policy['basic_cover_si'],'new_value' => $row[3],'created_by' => $file['created_by'],'remarks' => 'general si enhancement','group_key' => $group_key,'file_id' => $file['id']]);
+                        $this->empEndorsementModel->save(['pk' => (int)$employee_policy['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'premium','old_value' => $employee_policy['premium'],'new_value' => $slab_value['premium'],'created_by' => $file['created_by'],'remarks' => 'general si enhancement','group_key' => $group_key,'file_id' => $file['id']]);
+                        $this->empEndorsementModel->save(['pk' => (int)$employee_policy['id'],'emp_code' => $employee['emp_code'],'table_name' => 'employee_polices','actions' => 'si','name' => $employee['name'],'field_name' => 'si_enhancement_date','old_value' => null,'new_value' => change_date_format($row[4],'d-M-Y','Y-m-d'),'created_by' => $file['created_by'],'remarks' => 'general si enhancement','group_key' => $group_key,'file_id' => $file['id']]);
                         break;
                     }
                 }