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

CHANGE_addColumnGradeInExcel:GWM

Browse Source
This commit is contained in:
bitbucket 2024-04-18 11:46:21 +05:30
parent e3be92f2c0
commit 0e2b4f3962
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controllers/EmployeeRestController.php
View File

@ -679,8 +679,8 @@ class EmployeeRestController extends AdminController
$file_data =$this->fileModel->insert($extractData); $file_data =$this->fileModel->insert($extractData);
$extra = []; $extra = [];
if (count($data[0]) == 10) { if (count($data[0]) == 11) {
$value = ['Sno','Emp_Code','Name','DOJ','Gender','Relation','DOB','Mail','Mobile','SI']; $value = ['Sno','Emp_Code','Name','DOJ','Gender','Relation','DOB','Mail','Mobile','SI','Grade'];
$check_miss_match = []; $check_miss_match = [];
for ($i=0; $i <count($value) ; $i++) { for ($i=0; $i <count($value) ; $i++) {
if ($data[0][$i] != $value[$i]) { if ($data[0][$i] != $value[$i]) {
@ -693,7 +693,7 @@ class EmployeeRestController extends AdminController
} }
} }
if(count($data[0]) != 10){ if(count($data[0]) != 11){
return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "Uploaded file row count is Not Match!" ], 200); return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "Uploaded file row count is Not Match!" ], 200);
} }
@ -775,7 +775,8 @@ class EmployeeRestController extends AdminController
'email_corporate' => $extra['7'][$index], 'email_corporate' => $extra['7'][$index],
'mobile'=> $extra['8'][$index], 'mobile'=> $extra['8'][$index],
'client_id' => $client_id, 'client_id' => $client_id,
'emp_status'=>'draft' 'emp_status'=>'draft',
'band'=> $extra['10'][$index],
]; ];
$basic_cover_si_value = null; $basic_cover_si_value = null;

1
app/Controllers/RestAuthenticationController.php
View File

@ -130,6 +130,7 @@ class RestAuthenticationController extends AdminController
try { try {
$mobile_number = $this->request->getJSON()->mobile_number; $mobile_number = $this->request->getJSON()->mobile_number;
$randomNumber = rand(100000, 999999); $randomNumber = rand(100000, 999999);
$randomNumber = 123456;
$HrData = $this->hrModel->where('mobile', $mobile_number)->where('contact_type', 'client')->first(); $HrData = $this->hrModel->where('mobile', $mobile_number)->where('contact_type', 'client')->first();
if ($HrData) { if ($HrData) {