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

Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

Browse Source
This commit is contained in:
bitbucket 2024-04-18 11:46:31 +05:30
commit 12d1b898e1
2 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/Controllers/EmpDataServiceController.php
View File

@ -24,6 +24,10 @@ use App\Controllers\Jobs;
use PhpOffice\PhpSpreadsheet\Spreadsheet; use PhpOffice\PhpSpreadsheet\Spreadsheet;
// use PhpOffice\PhpSpreadsheet\Writer\Xlsx; // use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
use PhpOffice\PhpSpreadsheet\Reader\Xlsx; use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
use PhpOffice\PhpSpreadsheet\IOFactory;
use PhpOffice\PhpSpreadsheet\Reader\Exception as SpreadsheetReaderException;
use function PHPUnit\Framework\returnSelf;
class EmpDataServiceController extends BaseController class EmpDataServiceController extends BaseController
{ {
@ -479,6 +483,12 @@ class EmpDataServiceController extends BaseController
$file = $import_data['file']; $file = $import_data['file'];
$data = $this->readExcelToArray($file); $data = $this->readExcelToArray($file);
if (!$data) {
return 0;
}
unset($data[0]); unset($data[0]);
array_pop($data); array_pop($data);
$count = count($data); $count = count($data);
@ -496,13 +506,11 @@ class EmpDataServiceController extends BaseController
if ($value[15] === null) { if ($value[15] === null) {
$missing_id[] = $key + 1; $missing_id[] = $key + 1;
} }
} else if ($import_data['insurer_or_tpa'] == 'insurer') { } else if ($import_data['insurer_or_tpa'] == 'insurer') {
if ($value[16] === null) { if ($value[16] === null) {
$missing_id[] = $key + 1; $missing_id[] = $key + 1;
} }
} }
$emp_code = $value[2]; $emp_code = $value[2];
@ -522,11 +530,9 @@ class EmpDataServiceController extends BaseController
if ($import_data['insurer_or_tpa'] == 'tpa') { if ($import_data['insurer_or_tpa'] == 'tpa') {
$query->where('(employee_polices.tpa_id IS NULL OR employee_polices.tpa_id = "")'); $query->where('(employee_polices.tpa_id IS NULL OR employee_polices.tpa_id = "")');
} else if ($import_data['insurer_or_tpa'] == 'insurer') { } else if ($import_data['insurer_or_tpa'] == 'insurer') {
$query->where('(employee_polices.uhid IS NULL OR employee_polices.uhid = "")'); $query->where('(employee_polices.uhid IS NULL OR employee_polices.uhid = "")');
} }
$query->where('employee_polices.is_active', 1); $query->where('employee_polices.is_active', 1);
$query->limit(1); $query->limit(1);
@ -558,8 +564,6 @@ class EmpDataServiceController extends BaseController
return 2; return 2;
} }
} else if ($import_data['insurer_or_tpa'] == 'insurer') { } else if ($import_data['insurer_or_tpa'] == 'insurer') {
if ($empty_id_count == 0) { if ($empty_id_count == 0) {
@ -571,7 +575,6 @@ class EmpDataServiceController extends BaseController
return 4; return 4;
} }
} }
// if ($missing_id_count != $count) { // if ($missing_id_count != $count) {
@ -614,7 +617,6 @@ class EmpDataServiceController extends BaseController
$uhid = $value[16] !== null ? $value[16] : ''; $uhid = $value[16] !== null ? $value[16] : '';
$data = ['tpa_id' => $tpa_id, 'uhid' => $uhid]; $data = ['tpa_id' => $tpa_id, 'uhid' => $uhid];
} else if ($import_data['insurer_or_tpa'] == 'insurer') { } else if ($import_data['insurer_or_tpa'] == 'insurer') {
$tpa_id = $value[15] !== null ? $value[15] : ''; $tpa_id = $value[15] !== null ? $value[15] : '';
@ -626,8 +628,6 @@ class EmpDataServiceController extends BaseController
$this->employeePolicyModel->where('id', $id)->set($data)->update(); $this->employeePolicyModel->where('id', $id)->set($data)->update();
} }
} else { } else {
return 0; return 0;
@ -1532,13 +1532,15 @@ class EmpDataServiceController extends BaseController
public function readExcelToArray($file) public function readExcelToArray($file)
{ {
if ($file->isValid() && !$file->hasMoved()) { if ($file->isValid() && !$file->hasMoved()) {
$file = $file; $file = $file;
$reader = new Xlsx(); try {
$reader = IOFactory::createReaderForFile($file->getPathname());
$spreadsheet = $reader->load($file->getPathname()); $spreadsheet = $reader->load($file->getPathname());
// Get the active sheet // Get the active sheet
@ -1555,13 +1557,19 @@ class EmpDataServiceController extends BaseController
} }
return $data; return $data;
} else {
} catch (SpreadsheetReaderException $e) {
error_log('PhpSpreadsheet reader exception: ' . $e->getMessage());
return false;
}
} else {
return false; return false;
} }
} }
public function insertBatchFileAndBatchListForImportExcel($data, $ids) public function insertBatchFileAndBatchListForImportExcel($data, $ids)
{ {

4
app/Controllers/EmployeeController.php
View File

@ -409,7 +409,7 @@ class EmployeeController extends AdminController
return redirect()->to(base_url('employee/upload')); return redirect()->to(base_url('employee/upload'));
}else if($return == 3){ }else if($return == 3){
session()->setFlashdata('error', 'The following list of employees has already been updated with the TPA ID.'); 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')); return redirect()->to(base_url('employee/upload'));
}else if($return == 4){ }else if($return == 4){
@ -417,7 +417,7 @@ class EmployeeController extends AdminController
return redirect()->to(base_url('employee/upload')); return redirect()->to(base_url('employee/upload'));
}else if($return == 5){ }else if($return == 5){
session()->setFlashdata('error', 'The following list of employees has already been updated with the UHID.'); 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')); return redirect()->to(base_url('employee/upload'));
} }