diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index c59195a3..6e69647f 100644 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -331,7 +331,7 @@ class EmpDataServiceController extends BaseController [ 'column_index' => 0, 'column_name' => 'S.No', - 'header_name' => 'index' + 'db_column_name' => 'index' ], [ 'column_index' => 1, @@ -1549,7 +1549,6 @@ class EmpDataServiceController extends BaseController } } - $batch_list_id[] = $emp_value['emp_policy_id']; } @@ -1696,7 +1695,7 @@ class EmpDataServiceController extends BaseController $file_name_with_path = WRITEPATH . "/uploads/import_excel/" . $file['file_name']; $excel_data = $this->readExcelFileToArray($file_name_with_path); unset($excel_data[0]); // Remove header row - array_pop($excel_data); // Remove footer row + // array_pop($excel_data); $totals = 0; $emp_policy_ids = []; @@ -1707,7 +1706,6 @@ class EmpDataServiceController extends BaseController $emp_count = count($excel_data); $db = \Config\Database::connect(); - foreach ($excel_data as $key => $value) { $name = $value[1]; @@ -1716,33 +1714,37 @@ class EmpDataServiceController extends BaseController $uhid[] = $value[16]; $amount = $value[20]; - $totals = $totals + $amount; + if(!empty($name) && !empty($emp_code)){ - $query = $db->table('employee_polices'); - $query->select('employee_polices.id'); - $query->join('employees', 'employees.id = employee_polices.employee_id'); - $query->where('employee_polices.client_policy_id', $client_policy_id); - $query->where('employees.client_id', $client_id); - $query->where('employees.client_branch_id', $client_branch_id); - $query->where('employees.name', $name); - $query->where('employees.emp_code', $emp_code); - if ($file['insurer_or_tpa'] == 'tpa') { + $totals = $totals + $amount; - $query->where('(employee_polices.tpa_id IS NULL OR employee_polices.tpa_id = "")'); - } else if ($file['insurer_or_tpa'] == 'insurer') { + $query = $db->table('employee_polices'); + $query->select('employee_polices.id'); + $query->join('employees', 'employees.id = employee_polices.employee_id'); + $query->where('employee_polices.client_policy_id', $client_policy_id); + $query->where('employees.client_id', $client_id); + $query->where('employees.client_branch_id', $client_branch_id); + $query->where('employees.name', $name); + $query->where('employees.emp_code', $emp_code); + if ($file['insurer_or_tpa'] == 'tpa') { - $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); + $query->where('(employee_polices.tpa_id IS NULL OR employee_polices.tpa_id = "")'); + } else if ($file['insurer_or_tpa'] == 'insurer') { + + $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); + + $result = $query->get()->getRowArray(); + if (isset($result['id']) && $result['id'] !== null) { + $emp_policy_ids[] = $result['id']; //for cash deposite + $emp_details[] = array('id' => $result['id'], 'tpa_id' => $value[15], 'uhid' => $value[16]); + } - $result = $query->get()->getRowArray(); - if (isset($result['id']) && $result['id'] !== null) { - $emp_policy_ids[] = $result['id']; //for cash deposite - $emp_details[] = array('id' => $result['id'], 'tpa_id' => $value[15], 'uhid' => $value[16]); } } @@ -1766,18 +1768,17 @@ class EmpDataServiceController extends BaseController $this->myLogger->logme('error', 'Inception Update TPA and UHID -- set cashDepositCalculationForInception and sendMailForDownloadingECard in JOB QUEUE'); $policy_name = $this->getPolicyNameUsingClientPolicyId($client_policy_id); - $depositeData = [ - 'employeeIds' => $emp_policy_ids, - '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, - ]; - + // $depositeData = [ + // 'employeeIds' => $emp_policy_ids, + // '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, + // ]; $job_details = new Jobs(); $r = Jobs::addJob(['job_name' => 'cashDepositCalculationForInception', 'payload' => [ @@ -1813,8 +1814,6 @@ class EmpDataServiceController extends BaseController - - //Endorsement Correction public function importCorrectionValidation($params) { @@ -2229,7 +2228,6 @@ class EmpDataServiceController extends BaseController - //Endorsement SIEnhancement public function importSIEnhancementValidation($params) { @@ -2866,7 +2864,7 @@ 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); + // 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']; @@ -3276,24 +3274,25 @@ class EmpDataServiceController extends BaseController $totals = $totals + $value[13]; $endorsement_id = $value[15]; + if(!empty($emp_code) && !empty($emp_name)){ - $fetch_data = [ - 'client_policy_id' => $client_policy_id, - 'client_branch_id' => $client_branch_id, - 'client_id' => $client_id, - 'emp_name' => $emp_name, - 'emp_code' => $emp_code - ]; - $result = $this->employeePolicyModel->fetchEmpEndorsementData($fetch_data); + $fetch_data = [ + 'client_policy_id' => $client_policy_id, + 'client_branch_id' => $client_branch_id, + 'client_id' => $client_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) { - 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']); + $employees_table_data[] = array('id' => $result['employees_id'], 'emp_status' => $result['status']); + $emp_endorsement_table_data[] = array('id' => $result['emp_endorsement_primarykey'], 'group_key' => $result['group_key'], 'endorsement_id' => $value[15], 'status' => 'complete'); + } - $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']); - $employees_table_data[] = array('id' => $result['employees_id'], 'emp_status' => $result['status']); - $emp_endorsement_table_data[] = array('id' => $result['emp_endorsement_primarykey'], 'group_key' => $result['group_key'], 'endorsement_id' => $value[15], 'status' => 'complete'); } } diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 10ad95c4..c5556e9a 100644 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -463,10 +463,10 @@ class EmployeeController extends AdminController if (!$return) { if ($insurer_or_tpa == 'tpa') { - session()->setFlashdata('error', "No data was found for this action. The TPA ID has already been updated."); + session()->setFlashdata('error', "No data was found for this action."); return redirect()->to(base_url('employee/upload')); } else if ($insurer_or_tpa == 'insurer') { - session()->setFlashdata('error', "No data was found for this action. The UHID has already been updated."); + session()->setFlashdata('error', "No data was found for this action."); return redirect()->to(base_url('employee/upload')); } } else { diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php index 969f01c6..0fa4f33b 100644 --- a/app/Controllers/MasterController.php +++ b/app/Controllers/MasterController.php @@ -152,8 +152,17 @@ class MasterController extends AdminController $editData['insurer'] = $this->insurerModel->where(['id' => $id, 'is_active' => 1])->first(); - $editData['insuer_branch'] = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll(); + $editData['insuer_branch'] = $this->insurerBranchModel->where(['insurer_id' => $id, 'is_active' => 1])->findAll(); $editData['insurer_templete_count'] = $this->insurerTemplateModel->where(['insurer_id' => $id, 'is_active' => 1])->countAllResults(); + $editData['insurer_templete_list'] = $this->insurerModel->getInsurerTemplateByInsurerID($id); + + + $editData['policy_type'] = $this->policyTypeModel->whereIn('id', [1,2,6,7])->findAll(); + $editData['events'] = ['inception' => 'Inception', 'addition' => 'Addition', 'dependent_addition' => 'Dependent Addition', 'deletion' => 'Deletion', 'correction' => 'Correction', 'si_enhancement' => 'SI Enhancement', 'all' => 'All']; + $editData['action'] = ['import' => 'Import', 'export' => 'Export']; + $editData['db_column_name'] = ['Employee Name' => 'emp_name', 'Employee ID' => 'emp_code']; + + // echo "
";
@@ -377,8 +386,6 @@ class MasterController extends AdminController
         }else{
             return $this->respond(['status' => true, 'message' => 'Failed to add template',  $insurer_templete_data]);
         }
-
-
     }
     // Insurer Ends
 
@@ -386,7 +393,6 @@ class MasterController extends AdminController
 
 
     // TPA Start
-
     public function tpaList()
     {   
         $this->myLogger->logme('error','TPA list function called');
@@ -709,10 +715,11 @@ class MasterController extends AdminController
         echo json_encode($editData);
         exit();
     }
-
     //Ends TPA Models
     
 
+
+
     
     //Start KYC 
     public function kycList()
@@ -901,8 +908,9 @@ class MasterController extends AdminController
 
 
 
-    //Start Policy  
 
+
+    //Start Policy  
     public function policyTypeList()
     {   
         $this->myLogger->logme('error','Policy Type list function called');
@@ -1098,10 +1106,11 @@ class MasterController extends AdminController
             echo json_encode(array("status" => false));
         }
     }
-   
     //end policies
 
 
+
+
     //start CD Master list
     public function CDMasterList()
     {
@@ -1254,4 +1263,25 @@ class MasterController extends AdminController
         }
     }
 
+
+
+    public function createExcelTemplate()
+    {
+        $data = [
+            'insurer_id' => $this->request->getPost('insurer_id'),
+            'policy_type_id' => $this->request->getPost('policy_type'),
+            'event_name' => $this->request->getPost('event'),
+            'type_name' => $this->request->getPost('import_or_export'),
+            'jsoncolumns' => $this->request->getPost('json_data'),
+        ];
+
+        $insert = $this->insurerTemplateModel->insert($data);
+
+        if($insert){
+            return $this->respond(['status' => true, 'message' => 'Template created successfully',  $data]);
+        }else{
+            return $this->respond(['status' => true, 'message' => 'Failed to create template',  $data]);
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/app/Models/ClientModel.php b/app/Models/ClientModel.php
index b6101356..d6bac23f 100644
--- a/app/Models/ClientModel.php
+++ b/app/Models/ClientModel.php
@@ -45,14 +45,14 @@ class ClientModel extends Model
                             ->where('is_active',1)
                             ->findAll(); 
 
-            // if($role_id == 2 || $role_id == 3){
+            if($role_id == 2 || $role_id == 3){
 
-            //     $clients = $this->select($columns)
-            //             ->join('client_rm', 'client_rm.client_id = clients.id')
-            //             ->where('client_rm.user_id', $user_id)
-            //             ->where('clients.is_active',1)
-            //             ->findAll();
-            // }
+                $clients = $this->select($columns)
+                    ->join('client_rm', 'client_rm.client_id = clients.id')
+                    ->where('client_rm.user_id', $user_id)
+                    ->where('clients.is_active',1)
+                    ->findAll();
+            }
        
 
 
diff --git a/app/Models/InsurerModel.php b/app/Models/InsurerModel.php
index a731c858..75c3fe8e 100644
--- a/app/Models/InsurerModel.php
+++ b/app/Models/InsurerModel.php
@@ -35,6 +35,7 @@ class InsurerModel extends Model
         ->get()
             ->getResult();
     }
+
     public function getInsurerName($insurerId)
     {
         // Fetch the insurer name based on the insurer ID
@@ -50,6 +51,21 @@ class InsurerModel extends Model
 
         return null; // or handle accordingly if the insurer is not found
     }
+
+    public function getInsurerTemplateByInsurerID($insurer_id)
+    {
+        $insurer_data = $this->db->table('insurer_excel_export_template')
+            ->select('insurers.name as insurer_name, insurers.id, insurers.is_multi_event')
+            ->select('CASE WHEN insurers.is_multi_event = 1 THEN "multiple" ELSE insurer_excel_export_template.event_name END as event_name', false)
+            ->select('insurer_excel_export_template.type_name, insurer_excel_export_template.jsoncolumns, policy_type.policy_type')
+            ->join('insurers', 'insurers.id = insurer_excel_export_template.insurer_id')
+            ->join('policy_type', 'policy_type.id = insurer_excel_export_template.policy_type_id')
+            ->where('insurers.id', $insurer_id)
+            ->get()
+            ->getResultArray();
+
+         return $insurer_data;   
+    }
 }
 
         
\ No newline at end of file
diff --git a/app/Views/enrollment_list.php b/app/Views/enrollment_list.php
index 67d6e5bf..4052ecb5 100644
--- a/app/Views/enrollment_list.php
+++ b/app/Views/enrollment_list.php
@@ -193,7 +193,7 @@
     

         

             

-                
+                
                 
             

             

@@ -408,25 +408,25 @@
                     extend: 'copy',
                     text: '',
                     titleAttr: 'Copy',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 },
                 {
                     extend: 'print',
                     text: '',
                     titleAttr: 'Print',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 },
                 {
                     extend: 'pdf',
                     text: '',
                     titleAttr: 'PDF',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 },
                 {
                     extend: 'csv',
                     text: '',
                     titleAttr: 'CSV',
-                    filename: 'Enrollment List'
+                    filename: 'Enrolment List'
                 }
             ],
             initComplete: function() {
diff --git a/app/Views/insurer_export_templete.php b/app/Views/insurer_export_templete.php
index 3b4c049b..1c1f4ca0 100644
--- a/app/Views/insurer_export_templete.php
+++ b/app/Views/insurer_export_templete.php
@@ -9,14 +9,130 @@
             
         

 
-        

+        

             
             Copy
         

+        
+        
+
+    

+
+    

+
+    

+        
+        
+            
+                
+                    
+                    
+                    
+                    
+                    
+                
+            
+            
+                
+                     $value ){ ?>
+                        
+                            
+                            
+                            
+                            
+                            
+                                            
+                    
+                
+            
+        
S.NOPolicy TypeEvent TypeImport/ExportTemplate

     

-    
 

 
+
+
+
 
 
\ No newline at end of file