From 98cadc7f73b423d3c6354b15cae9ef7ca087d759 Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 19 Nov 2024 14:09:25 +0530 Subject: [PATCH 1/4] FIX_LIVE_ISSUES --- app/Controllers/EmployeeController.php | 30 ++++++++++++------- app/Controllers/EmployeeServiceController.php | 9 +++++- app/Models/EmployeePolicyModel.php | 11 ++++--- app/Views/employee_data_list.php | 2 +- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 810798af..dd202b3e 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -212,6 +212,7 @@ class EmployeeController extends AdminController //validate uploaded file $filename = ''; + $fileSize = ''; $validated = $this->validate([ 'emplist' => [ 'uploaded[emplist]', @@ -231,6 +232,8 @@ class EmployeeController extends AdminController $is_moved = $avatar->move(WRITEPATH . 'uploads/excel/'); if ($is_moved) { $filename = $avatar->getName(); + $fileSize = $avatar->getSize(); // File size in bytes + $fileSize = $fileSize / (1024 * 1024); // Convert to MB // Handle successful upload, e.g., log success or further processing $this->myLogger->logme("error", 'File move successful'); @@ -258,12 +261,19 @@ class EmployeeController extends AdminController $this->myLogger->logme("error", '{file_id} uploaded success', ['file_id' => $file_id]); //start validation process - - $empServiceController = new EmployeeServiceController(); - $result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]); - //endof validation process - if (isset($result['error_summary']) && count($result['error_summary'])) { - return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'file rejected with errors'], 200); + if($fileSize < 1) // if file size less than 1 + { + $empServiceController = new EmployeeServiceController(); + $result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]); + //endof validation process + if (isset($result['error_summary']) && count($result['error_summary'])) { + return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'file rejected with errors'], 200); + } + } + else //if file size greater than 1 add the file as job + { + $job_details = new Jobs(); + $r = Jobs::addJob(['job_name' => 'excelFileFormatValidation','payload' => ['file_id' => $file_id]]); } return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200); @@ -825,18 +835,18 @@ class EmployeeController extends AdminController // client_policy_id pull draft and enrolled status employees and proceed to calculatin and make entry in DB public function initiateManualEmployeesOnboardProcess($client_policy_id) { - $client_data = $this->clientPolicyModel->select('clients.client_name as client_name, policies.name as policy_name,client_branch_id') + $client_data = $this->clientPolicyModel->select('clients.client_name as client_name,client_branch_id') ->join('clients', 'clients.id = client_policy.client_id') - ->join('policies', 'policies.id = client_policy.policy_id') + // ->join('policies', 'policies.id = client_policy.policy_id') ->where('client_policy.id', $client_policy_id) ->first(); - + // dd($client_data); $empServiceController = new EmployeeServiceController(); $res = $empServiceController->employeesOnboardPreprocess(['client_policy_id' => $client_policy_id,'client_branch_id' => $client_data['client_branch_id']]); // dd($res); $count = ($res); - $message = $count . ' Employees are Initiate Onboard Process againts Client ' . $client_data['client_name'] . ' and the Policy is ' . $client_data['policy_name']; + $message = $count . ' Employees are Initiate Onboard Process againts Client ' . $client_data['client_name'] . ' and the Policy is ' .$client_policy_id; session()->setFlashdata('success1', $message); return redirect()->to(base_url('/employee/upload')); } diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index c4565c6c..506b33e8 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1444,7 +1444,14 @@ class EmployeeServiceController extends AdminController $field_value = ($field_name == 'dob' ? change_date_format($row[4],'d-M-Y','Y-m-d') : $row[4] ); - $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(); + $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']) + ->where('emp_status','active') + ->where('is_active',1) + ->first(); $existing_endorsements = $this->empEndorsementModel->where('actions','c') ->where('table_name','employees') ->where('endorsement_id is null') diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 688b8abf..07a2eb59 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -861,21 +861,24 @@ class EmployeePolicyModel extends Model public function getEmployeePolicyForFileList($client_id, $policy_id) { - $result = $this->select(['employee_polices.*','pm.name as policy_name','im.short_name as insurer_short_name','ib.branch_name as insurer_branch_name','ib.branch_code as insurer_branch_code','tpam.name as tpa_name','tpam.short_name as tpa_short_name','tpab.branch_code as tpa_branch_code','cm.client_name','cm.short_name as client_short_name','emp.relationship','emp.relationship_code','emp.change_event','emp.emp_code','emp.name','emp.email_corporate','emp.dob','emp.gender','emp.emp_status','emp.is_active as emp_is_active','emp.mobile as mobile']) + $result = $this->select(['employee_polices.*','pt.policy_type','im.short_name as insurer_short_name','ib.branch_name as insurer_branch_name','ib.branch_code as insurer_branch_code','tpam.name as tpa_name','tpam.short_name as tpa_short_name','tpab.branch_code as tpa_branch_code','cm.client_name','cm.short_name as client_short_name','emp.relationship','emp.relationship_code','emp.change_event','emp.emp_code','emp.name','emp.email_corporate','emp.dob','emp.gender','emp.emp_status','emp.is_active as emp_is_active','emp.mobile as mobile']) ->join('employees emp', 'employee_polices.employee_id = emp.id') ->join('client_policy cp', 'employee_polices.client_policy_id = cp.id') //cp - client policy - ->join('policies pm', 'cp.policy_id = pm.id') //pm - policy master + ->join('policy_type pt', 'cp.policy_type_id = pt.id') //pm - policy master ->join('insurers im', 'cp.insurer_id = im.id') //im - insurar master ->join('insurer_branch ib', 'cp.insurer_branch_id = ib.id') //ib - insurar branch ->join('tpa tpam', 'cp.tpa_id = tpam.id') //tpam - tpa master ->join('tpa_branch tpab', 'cp.tpa_branch_id = tpab.id') //tpab - tpa brach ->join('clients cm', 'cp.client_id = cm.id') //cm - client master ->where('emp.client_id',$client_id) - ->where('employee_polices.client_policy_id',$policy_id); + ->where('employee_polices.client_policy_id',$policy_id) + ->where('employee_polices.is_active',1) + ->where('emp.is_active',1); $result->whereIn('employee_polices.status', ['enrolled']); $result->whereIn('emp.emp_status', ['enrolled']); - $result = $result->findAll(); + $result = $result->findAll(); + // print_r($this->db->getLastQuery()); return ($result); } diff --git a/app/Views/employee_data_list.php b/app/Views/employee_data_list.php index 8ca32f6b..40bc5cd0 100755 --- a/app/Views/employee_data_list.php +++ b/app/Views/employee_data_list.php @@ -142,7 +142,7 @@
- Edit + Edit From 44c22310db45e16048ce0b7ff863003d056225a6 Mon Sep 17 00:00:00 2001 From: velz Date: Tue, 19 Nov 2024 14:44:35 +0530 Subject: [PATCH 2/4] FIX_LAGRE_FILE_HANDLE --- app/Controllers/EmployeeController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php index 94f40323..8deb7980 100755 --- a/app/Controllers/EmployeeController.php +++ b/app/Controllers/EmployeeController.php @@ -265,6 +265,7 @@ class EmployeeController extends AdminController { $empServiceController = new EmployeeServiceController(); $result = $empServiceController->excelFileFormatValidation(['file_id' => $file_id]); + $this->myLogger->logme("error", '{file_id} is less than 1MB, validating on the fly', ['file_id' => $file_id]); //endof validation process if (isset($result['error_summary']) && count($result['error_summary'])) { return $this->respond(['dataStatus' => false, 'code' => 404, 'message' => 'file rejected with errors'], 200); @@ -274,6 +275,7 @@ class EmployeeController extends AdminController { $job_details = new Jobs(); $r = Jobs::addJob(['job_name' => 'excelFileFormatValidation','payload' => ['file_id' => $file_id]]); + $this->myLogger->logme("error", '{file_id} is greather than 1MB, validating with job queue', ['file_id' => $file_id]); } return $this->respond(['dataStatus' => true, 'code' => 200, 'data' => 'file upload success'], 200); From f60a900dee52ad1b922ba0ac4fa4be89478570d8 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 20 Nov 2024 12:16:19 +0530 Subject: [PATCH 3/4] FIX_UNIT_HANDLED_IN_ENROLLMENT_UPLOAD_VIA_CRM --- app/Controllers/EmployeeServiceController.php | 10 ++++++++-- app/Helpers/excel_util_helper.php | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 506b33e8..70378281 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1966,7 +1966,8 @@ public function employeesEnrollmentInsert($params) $allowedHighestColumn = end($columns_to_check); $excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']); // print_r($keys);die(); - + //get existing units in the current branch + $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $file['client_id'],client_branch_id: $file['client_branch_id']); //remove header unset($excel_data[0]); // dd($excel_data); @@ -1982,6 +1983,11 @@ public function employeesEnrollmentInsert($params) // dd($key.'-'.count($excel_data)); $value = []; $policy_data = []; + $temp_unit = ''; + if(empty($row[12])) + { + $temp_unit = $existing_units[0]; + } $value['emp_code'] = $row[1]; $value['name'] = $row[2]; @@ -1993,7 +1999,7 @@ public function employeesEnrollmentInsert($params) $value['mobile'] = $row[8]; $value['band'] = $row[10]; $value['basic_pay'] = $row[11]; - $value['unit'] = $row[12]; + $value['unit'] = $temp_unit; $value['family_floater_key'] = null; $value['client_id'] = $file['client_id']; $value['client_branch_id'] = $file['client_branch_id']; diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index ab6299ac..68f348d1 100755 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -2021,6 +2021,12 @@ if(!function_exists('check_unit')) { return array('status' => true); } + else if($temp != $existing_units[0]) + { + return array('status' => false,'error' => 'wrong unit name'); + } + + } if(strtolower($row[5]) == 'self') From 5bba669daca64c50c41afdf58a3520f9237df385 Mon Sep 17 00:00:00 2001 From: velz Date: Wed, 20 Nov 2024 20:06:37 +0530 Subject: [PATCH 4/4] FIX_DELETION_FILE_IMPORT&EXPORT&TRUNCATE --- app/Controllers/EmployeeServiceController.php | 9 +++++---- app/Helpers/excel_util_helper.php | 4 ++-- app/Models/EmployeePolicyModel.php | 15 ++++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php index 70378281..2b6135aa 100755 --- a/app/Controllers/EmployeeServiceController.php +++ b/app/Controllers/EmployeeServiceController.php @@ -1320,10 +1320,10 @@ class EmployeeServiceController extends AdminController $row[4] = change_date_format($row[4],'d-M-Y','Y-m-d');// date of exit from excel // Kint::dump($row[4]); // check if insurer configured with add one day for deletion - if($insurer['deletion_add_day'] == true) - { - $row[4] = (new \DateTime($row[4]))->modify('+1 day')->format('Y-m-d'); - } + // if($insurer['deletion_add_day'] == true) + // { + // $row[4] = (new \DateTime($row[4]))->modify('+1 day')->format('Y-m-d'); + // } // dd($row[4]); //for emp table $this->empEndorsementModel->save(['pk' => (int)$data['emp_id'],'emp_code' => $data['emp_code'],'table_name' => 'employees','actions' => 'd','name' => $data['name'],'field_name' => 'emp_status','old_value' => $data['emp_status'],'new_value' => 'deactivate','created_by' => $file['created_by'],'remarks' => 'general deletion','group_key' => $group_key,'file_id' => $file['id'],'status' => 'pending']); @@ -1355,6 +1355,7 @@ class EmployeeServiceController extends AdminController ->where('emp_code',$employee['emp_code']) ->where('name',$employee['name']) ->where('field_name','emp_status') + ->where('status !=','truncated') ->findAll(); // dd($existing_endorsements); diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 68f348d1..a371ed98 100755 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -511,10 +511,10 @@ if (!function_exists('name_and_empid_check_in_db')) ->where("ep.is_active",1) ->where("ep.status",'active') // ->where("ep.client_id",$client_id) - ->where('name',$row[2])->where('emp_code',$row[1]) + ->where('name',trim($row[2]))->where('emp_code',trim($row[1])) ->findAll(); - // dd($employeeModel->getLastQuery()); + // kint::dump($employeeModel->getLastQuery()->getQuery()); if(($current_action == 'deletion' || $current_action == 'correction' || $current_action == 'si_enhancement') && !count($res)) diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 07a2eb59..a9fd7218 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -627,19 +627,19 @@ class EmployeePolicyModel extends Model 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 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 + ( SELECT a1.emp_code, a1.field_name, a1.new_value from emp_endorsement as a1 where a1.field_name = 'emp_status' and a1.status != 'truncated') 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 + ( SELECT b1.emp_code, b1.field_name, b1.new_value from emp_endorsement as b1 where b1.field_name = 'change_event' and b1.status != 'truncated') 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 + ( SELECT c1.emp_code, c1.field_name, c1.new_value from emp_endorsement as c1 where c1.field_name = 'date_of_exit' and c1.status != 'truncated') 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 + ( SELECT d1.emp_code, d1.field_name, d1.new_value from emp_endorsement as d1 where d1.field_name = 'reason_for_exit' and d1.status != 'truncated') 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 + ( SELECT e1.emp_code, e1.field_name, e1.new_value from emp_endorsement as e1 where e1.field_name = 'status' and e1.status != 'truncated') ee on aa.emp_code = ee.emp_code - ) as deletiondata on a.emp_code = deletiondata.emp_code + ) as deletiondata on a.emp_code = deletiondata.emp_code and a.status != 'truncated' LEFT JOIN ( @@ -661,6 +661,7 @@ class EmployeePolicyModel extends Model AND employees.client_branch_id = {$client_branch_id} AND (a.endorsement_id IS NULL OR a.endorsement_id = '') AND a.actions = 'd' + AND a.status != 'truncated' AND employee_polices.is_active = 1 AND employee_polices.status = 'active' AND employees.is_active = 1