FIX_IMPORT_ERROR_LIST : RV
This commit is contained in:
parent
e8ccaefcb6
commit
7b71509977
@ -1496,7 +1496,9 @@ class EmpDataServiceController extends BaseController
|
||||
}
|
||||
|
||||
} else {
|
||||
$tpa_id_all[$current_tpa_id][] = $key;
|
||||
if($current_tpa_id != "" && $current_tpa_id != null){
|
||||
$tpa_id_all[$current_tpa_id][] = $key;
|
||||
}
|
||||
}
|
||||
|
||||
//--- TPA ID Duplicate check end ---
|
||||
|
||||
@ -1914,6 +1914,7 @@ class EmployeeController extends AdminController
|
||||
}
|
||||
|
||||
$excel_data = $empDataServiceController->readExcelFileToArray($file_name_with_path);
|
||||
// dd($excel_data);
|
||||
$excelErrorData['excel_header'] = $excel_data[0];
|
||||
unset($excel_data[0]);
|
||||
|
||||
@ -1976,7 +1977,7 @@ class EmployeeController extends AdminController
|
||||
$excelErrorData['excel_data'] = $finalArray;
|
||||
$excelErrorData['file_id'] = $file_id;
|
||||
|
||||
// dd($finalArray);
|
||||
// dd($excelErrorData);
|
||||
|
||||
echo view('export_import_error_list', $excelErrorData);
|
||||
}
|
||||
|
||||
@ -82,8 +82,9 @@ table.dataTable tbody td {
|
||||
<?php foreach ($excel_data[$i] as $data): ?>
|
||||
<td <?php if (isset($data['error'])) echo 'class="error-cell"'; ?>>
|
||||
<?php
|
||||
if (isset($data['value'])) {
|
||||
echo $data['value'];
|
||||
if (isset($data['value']) && $data['value'] != "" ) {
|
||||
// echo $data['value'];
|
||||
echo is_array($data['value']) ? "" : $data['value'];
|
||||
}
|
||||
if (isset($data['error'])) {
|
||||
echo '<span class="error-icon"> <i class="fas fa-exclamation-circle" style="color: red;"></i></span>';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user