Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX_LIVE_ISSUES_EXCEL_SANITIZE_AND_DELECTION_QUERY : RV

Browse Source
This commit is contained in:
VENKATESHWARAN 2025-05-08 17:42:19 +05:30
parent f2e802adf7
commit 7294f868c6
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/ClientController.php
View File

@ -4604,9 +4604,10 @@ class ClientController extends AdminController
// $employeeRestController->employeesEnrollmentInsert(['file_id' => 836]); // $employeeRestController->employeesEnrollmentInsert(['file_id' => 836]);
// $r = Jobs::addJob(['job_name' => 'employeesEnrollmentInsert','payload' => ['file_id' => 721]]); // $r = Jobs::addJob(['job_name' => 'employeesEnrollmentInsert','payload' => ['file_id' => 721]]);
$empServiceController = new EmployeeServiceController(); $empServiceController = new EmployeeServiceController();
// $res = $empServiceController->excelFileFormatValidation(['file_id' => '873']); // $res = $empServiceController->excelFileFormatValidation(['file_id' => '865']);
// $res = $empServiceController->excelFileDataValidation(['file_id' => '874']); // $res = $empServiceController->excelFileDataValidation(['file_id' => '865']);
// $res = $empServiceController->employeesSIEnhanceProcess(['file_id' => '829']); // $res = $empServiceController->employeesSIEnhanceProcess(['file_id' => '829']);
// $res = $empServiceController->employeeDisembark(['file_id' => '858']);
// dd('-----', $res); // dd('-----', $res);

14
app/Controllers/EmployeeServiceController.php
View File

@ -728,6 +728,7 @@ class EmployeeServiceController extends AdminController
$allowedHighestColumn = end($columns_to_check); $allowedHighestColumn = end($columns_to_check);
// dd($allowedHighestColumn); // dd($allowedHighestColumn);
$excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']); $excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']);
$excel_data = ExcelSanitizeHelper::sanitizeArrayData($excel_data);
// !dd(array_chunk($excel_data,20)[0]); // !dd(array_chunk($excel_data,20)[0]);
//check no of columns in excel //check no of columns in excel
@ -997,7 +998,7 @@ class EmployeeServiceController extends AdminController
$allowedHighestColumn = end($columns_to_check); $allowedHighestColumn = end($columns_to_check);
$excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']); $excel_data = $sheet->rangeToArray('A1:' . $allowedHighestColumn['col_cell_name'] . $highestRowAndColumn['row']);
// print_r($keys);die(); $excel_data = ExcelSanitizeHelper::sanitizeArrayData($excel_data);
//remove header //remove header
unset($excel_data[0]); unset($excel_data[0]);
@ -1367,7 +1368,15 @@ class EmployeeServiceController extends AdminController
break; break;
} }
// echo '<br>START- ' . $row[2]; // 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();
$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 !=','truncated')
->where('is_active', 1)
->first();
// $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->first(); // $employee = $this->employeeModel->where('emp_code', $row[1])->where('name',$row[2])->where('client_id',$file['client_id'])->first();
// dd($employee); // dd($employee);
if(is_array($employee) && count($employee)) if(is_array($employee) && count($employee))
@ -1380,6 +1389,7 @@ class EmployeeServiceController extends AdminController
->where('name',$employee['name']) ->where('name',$employee['name'])
->where('field_name','emp_status') ->where('field_name','emp_status')
->where('status !=','truncated') ->where('status !=','truncated')
->where('is_active', 1)
->findAll(); ->findAll();
// dd($existing_endorsements); // dd($existing_endorsements);